Add category name to dynamic and event builders 2

Signed-off-by: lisrte <[email protected]>

dynawaltz/src/main/java/com/powsybl/dynawaltz/builders/ModelConfigLoaderImpl.java

@@ -36,31 +36,30 @@ public final class ModelConfigLoaderImpl implements ModelConfigLoader {
     private static final String MODEL_CONFIG_FILENAME = "models.json";
 
     private static final Stream<BuilderConfig> BUILDER_CONFIGS = Stream.of(
-            new BuilderConfig(DynamicOverloadManagementSystemBuilder::of, DynamicOverloadManagementSystemBuilder::getSupportedLibs),
-            new BuilderConfig(DynamicTwoLevelsOverloadManagementSystemBuilder::of, DynamicTwoLevelsOverloadManagementSystemBuilder::getSupportedLibs),
-            new BuilderConfig(TapChangerAutomationSystemBuilder::of, TapChangerAutomationSystemBuilder::getSupportedLibs),
-            new BuilderConfig(TapChangerBlockingAutomationSystemBuilder::of, TapChangerBlockingAutomationSystemBuilder::getSupportedLibs),
-            new BuilderConfig(UnderVoltageAutomationSystemBuilder::of, UnderVoltageAutomationSystemBuilder::getSupportedLibs),
-            new BuilderConfig(PhaseShifterPAutomationSystemBuilder::of, PhaseShifterPAutomationSystemBuilder::getSupportedLibs),
-            new BuilderConfig(PhaseShifterIAutomationSystemBuilder::of, PhaseShifterIAutomationSystemBuilder::getSupportedLibs),
-            new BuilderConfig(StandardBusBuilder::of, StandardBusBuilder::getSupportedLibs),
-            new BuilderConfig(InfiniteBusBuilder::of, InfiniteBusBuilder::getSupportedLibs),
-            new BuilderConfig(TransformerFixedRatioBuilder::of, TransformerFixedRatioBuilder::getSupportedLibs),
-            new BuilderConfig(LineBuilder::of, LineBuilder::getSupportedLibs),
-            new BuilderConfig(HvdcVscBuilder::of, HvdcVscBuilder::getSupportedLibs),
-            new BuilderConfig(HvdcPBuilder::of, HvdcPBuilder::getSupportedLibs),
-            new BuilderConfig(BaseLoadBuilder::of, BaseLoadBuilder::getSupportedLibs),
-            new BuilderConfig(LoadOneTransformerBuilder::of, LoadOneTransformerBuilder::getSupportedLibs),
-            new BuilderConfig(LoadOneTransformerTapChangerBuilder::of, LoadOneTransformerTapChangerBuilder::getSupportedLibs),
-            new BuilderConfig(LoadTwoTransformersBuilder::of, LoadTwoTransformersBuilder::getSupportedLibs),
-            new BuilderConfig(LoadTwoTransformersTapChangersBuilder::of, LoadTwoTransformersTapChangersBuilder::getSupportedLibs),
-            new BuilderConfig(BaseStaticVarCompensatorBuilder::of, BaseStaticVarCompensatorBuilder::getSupportedLibs),
-            new BuilderConfig(GeneratorFictitiousBuilder::of, GeneratorFictitiousBuilder::getSupportedLibs),
-            new BuilderConfig(SynchronizedGeneratorBuilder::of, SynchronizedGeneratorBuilder::getSupportedLibs),
-            new BuilderConfig(SynchronousGeneratorBuilder::of, SynchronousGeneratorBuilder::getSupportedLibs),
-            new BuilderConfig(WeccBuilder::of, WeccBuilder::getSupportedLibs),
-            new BuilderConfig(GridFormingConverterBuilder::of, GridFormingConverterBuilder::getSupportedLibs),
-            new BuilderConfig(GeneratorFictitiousBuilder::of, GeneratorFictitiousBuilder::getSupportedLibs));
+            new BuilderConfig(DynamicOverloadManagementSystemBuilder.CATEGORY, DynamicOverloadManagementSystemBuilder::of, DynamicOverloadManagementSystemBuilder::getSupportedLibs),
+            new BuilderConfig(DynamicTwoLevelsOverloadManagementSystemBuilder.CATEGORY, DynamicTwoLevelsOverloadManagementSystemBuilder::of, DynamicTwoLevelsOverloadManagementSystemBuilder::getSupportedLibs),
+            new BuilderConfig(TapChangerAutomationSystemBuilder.CATEGORY, TapChangerAutomationSystemBuilder::of, TapChangerAutomationSystemBuilder::getSupportedLibs),
+            new BuilderConfig(TapChangerBlockingAutomationSystemBuilder.CATEGORY, TapChangerBlockingAutomationSystemBuilder::of, TapChangerBlockingAutomationSystemBuilder::getSupportedLibs),
+            new BuilderConfig(UnderVoltageAutomationSystemBuilder.CATEGORY, UnderVoltageAutomationSystemBuilder::of, UnderVoltageAutomationSystemBuilder::getSupportedLibs),
+            new BuilderConfig(PhaseShifterPAutomationSystemBuilder.CATEGORY, PhaseShifterPAutomationSystemBuilder::of, PhaseShifterPAutomationSystemBuilder::getSupportedLibs),
+            new BuilderConfig(PhaseShifterIAutomationSystemBuilder.CATEGORY, PhaseShifterIAutomationSystemBuilder::of, PhaseShifterIAutomationSystemBuilder::getSupportedLibs),
+            new BuilderConfig(StandardBusBuilder.CATEGORY, StandardBusBuilder::of, StandardBusBuilder::getSupportedLibs),
+            new BuilderConfig(InfiniteBusBuilder.CATEGORY, InfiniteBusBuilder::of, InfiniteBusBuilder::getSupportedLibs),
+            new BuilderConfig(TransformerFixedRatioBuilder.CATEGORY, TransformerFixedRatioBuilder::of, TransformerFixedRatioBuilder::getSupportedLibs),
+            new BuilderConfig(LineBuilder.CATEGORY, LineBuilder::of, LineBuilder::getSupportedLibs),
+            new BuilderConfig(HvdcVscBuilder.CATEGORY, HvdcVscBuilder::of, HvdcVscBuilder::getSupportedLibs),
+            new BuilderConfig(HvdcPBuilder.CATEGORY, HvdcPBuilder::of, HvdcPBuilder::getSupportedLibs),
+            new BuilderConfig(BaseLoadBuilder.CATEGORY, BaseLoadBuilder::of, BaseLoadBuilder::getSupportedLibs),
+            new BuilderConfig(LoadOneTransformerBuilder.CATEGORY, LoadOneTransformerBuilder::of, LoadOneTransformerBuilder::getSupportedLibs),
+            new BuilderConfig(LoadOneTransformerTapChangerBuilder.CATEGORY, LoadOneTransformerTapChangerBuilder::of, LoadOneTransformerTapChangerBuilder::getSupportedLibs),
+            new BuilderConfig(LoadTwoTransformersBuilder.CATEGORY, LoadTwoTransformersBuilder::of, LoadTwoTransformersBuilder::getSupportedLibs),
+            new BuilderConfig(LoadTwoTransformersTapChangersBuilder.CATEGORY, LoadTwoTransformersTapChangersBuilder::of, LoadTwoTransformersTapChangersBuilder::getSupportedLibs),
+            new BuilderConfig(BaseStaticVarCompensatorBuilder.CATEGORY, BaseStaticVarCompensatorBuilder::of, BaseStaticVarCompensatorBuilder::getSupportedLibs),
+            new BuilderConfig(GeneratorFictitiousBuilder.CATEGORY, GeneratorFictitiousBuilder::of, GeneratorFictitiousBuilder::getSupportedLibs),
+            new BuilderConfig(SynchronizedGeneratorBuilder.CATEGORY, SynchronizedGeneratorBuilder::of, SynchronizedGeneratorBuilder::getSupportedLibs),
+            new BuilderConfig(SynchronousGeneratorBuilder.CATEGORY, SynchronousGeneratorBuilder::of, SynchronousGeneratorBuilder::getSupportedLibs),
+            new BuilderConfig(WeccBuilder.CATEGORY, WeccBuilder::of, WeccBuilder::getSupportedLibs),
+            new BuilderConfig(GridFormingConverterBuilder.CATEGORY, GridFormingConverterBuilder::of, GridFormingConverterBuilder::getSupportedLibs));
 
     @Override
     public String getModelConfigFileName() {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerAutomationSystemBuilder.java

@@ -21,7 +21,7 @@
  */
 public class TapChangerAutomationSystemBuilder extends AbstractAutomationSystemModelBuilder<TapChangerAutomationSystemBuilder> {
 
-    private static final String CATEGORY = "tapChangers";
+    public static final String CATEGORY = "TAP_CHANGER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     protected final BuilderEquipment<Load> load;

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/TapChangerBlockingAutomationSystemBuilder.java

@@ -20,7 +20,7 @@
  */
 public class TapChangerBlockingAutomationSystemBuilder extends AbstractAutomationSystemModelBuilder<TapChangerBlockingAutomationSystemBuilder> {
 
-    private static final String CATEGORY = "tcbs";
+    public static final String CATEGORY = "TAP_CHANGER_BLOCKING";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
     private static final String TAP_CHANGER_TYPE = IdentifiableType.TWO_WINDINGS_TRANSFORMER + "/" + IdentifiableType.LOAD;
     private static final String U_MEASUREMENTS_FIELD = "uMeasurements";

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/UnderVoltageAutomationSystemBuilder.java

@@ -24,7 +24,7 @@
  */
 public class UnderVoltageAutomationSystemBuilder extends AbstractAutomationSystemModelBuilder<UnderVoltageAutomationSystemBuilder> {
 
-    private static final String CATEGORY = "underVoltages";
+    public static final String CATEGORY = "UNDER_VOLTAGE";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     protected final BuilderEquipment<Generator> generator;

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicOverloadManagementSystemBuilder.java

@@ -23,7 +23,7 @@
  */
 public class DynamicOverloadManagementSystemBuilder extends AbstractOverloadManagementSystemBuilder<DynamicOverloadManagementSystemBuilder> {
 
-    private static final String CATEGORY = "overloadManagements";
+    public static final String CATEGORY = "OVERLOAD_MANAGEMENT";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static DynamicOverloadManagementSystemBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/overloadmanagments/DynamicTwoLevelsOverloadManagementSystemBuilder.java

@@ -24,7 +24,7 @@
  */
 public class DynamicTwoLevelsOverloadManagementSystemBuilder extends AbstractOverloadManagementSystemBuilder<DynamicTwoLevelsOverloadManagementSystemBuilder> {
 
-    private static final String CATEGORY = "twoLevelsOverloadManagements";
+    public static final String CATEGORY = "TWO_LEVEL_OVERLOAD_MANAGEMENT";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     protected final BuilderEquipment<Branch<?>> iMeasurement2;

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterIAutomationSystemBuilder.java

@@ -21,7 +21,7 @@
  */
 public class PhaseShifterIAutomationSystemBuilder extends AbstractPhaseShifterModelBuilder<PhaseShifterIAutomationSystemBuilder> {
 
-    private static final String CATEGORY = "phaseShiftersI";
+    public static final String CATEGORY = "PHASE_SHIFTER_I";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static PhaseShifterIAutomationSystemBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/automationsystems/phaseshifters/PhaseShifterPAutomationSystemBuilder.java

@@ -21,7 +21,7 @@
  */
 public class PhaseShifterPAutomationSystemBuilder extends AbstractPhaseShifterModelBuilder<PhaseShifterPAutomationSystemBuilder> {
 
-    private static final String CATEGORY = "phaseShiftersP";
+    public static final String CATEGORY = "PHASE_SHIFTER_P";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static PhaseShifterPAutomationSystemBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/InfiniteBusBuilder.java

@@ -21,7 +21,7 @@
  */
 public class InfiniteBusBuilder extends AbstractBusBuilder<InfiniteBusBuilder> {
 
-    private static final String CATEGORY = "infiniteBuses";
+    public static final String CATEGORY = "INFINITE_BUS";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static InfiniteBusBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/StandardBusBuilder.java

@@ -21,7 +21,7 @@
  */
 public class StandardBusBuilder extends AbstractBusBuilder<StandardBusBuilder> {
 
-    private static final String CATEGORY = "baseBuses";
+    public static final String CATEGORY = "INFINITE_BUS";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static StandardBusBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GeneratorFictitiousBuilder.java

@@ -21,7 +21,7 @@
  */
 public class GeneratorFictitiousBuilder extends AbstractGeneratorBuilder<GeneratorFictitiousBuilder> {
 
-    private static final String CATEGORY = "baseGenerators";
+    public static final String CATEGORY = "BASE_GENERATOR";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static GeneratorFictitiousBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/GridFormingConverterBuilder.java

@@ -21,7 +21,7 @@
  */
 public class GridFormingConverterBuilder extends AbstractGeneratorBuilder<GridFormingConverterBuilder> {
 
-    private static final String CATEGORY = "gridFormingConverters";
+    public static final String CATEGORY = "GRID_FORMING_CONVERTER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static GridFormingConverterBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronizedGeneratorBuilder.java

@@ -21,7 +21,7 @@
  */
 public class SynchronizedGeneratorBuilder extends AbstractGeneratorBuilder<SynchronizedGeneratorBuilder> {
 
-    private static final String CATEGORY = "synchronizedGenerators";
+    public static final String CATEGORY = "SYNCHRONIZED_GENERATOR";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static SynchronizedGeneratorBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/SynchronousGeneratorBuilder.java

@@ -22,7 +22,7 @@
  */
 public class SynchronousGeneratorBuilder extends AbstractGeneratorBuilder<SynchronousGeneratorBuilder> {
 
-    private static final String CATEGORY = "synchronousGenerators";
+    public static final String CATEGORY = "SYNCHRONOUS_GENERATOR";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static SynchronousGeneratorBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/generators/WeccBuilder.java

@@ -21,7 +21,7 @@
  */
 public class WeccBuilder extends AbstractGeneratorBuilder<WeccBuilder> {
 
-    private static final String CATEGORY = "wecc";
+    public static final String CATEGORY = "WECC";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static WeccBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcPBuilder.java

@@ -23,7 +23,7 @@
  */
 public class HvdcPBuilder extends AbstractHvdcBuilder<HvdcPBuilder> {
 
-    private static final String CATEGORY = "hvdcP";
+    public static final String CATEGORY = "HVDC_P";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static HvdcPBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/hvdc/HvdcVscBuilder.java

@@ -24,7 +24,7 @@
  */
 public class HvdcVscBuilder extends AbstractHvdcBuilder<HvdcVscBuilder> {
 
-    private static final String CATEGORY = "hvdcVsc";
+    public static final String CATEGORY = "HVDC_VSC";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static HvdcVscBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/lines/LineBuilder.java

@@ -24,7 +24,7 @@
  */
 public class LineBuilder extends AbstractEquipmentModelBuilder<Line, LineBuilder> {
 
-    private static final String CATEGORY = "baseLines";
+    public static final String CATEGORY = "BASE_LINE";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static LineBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/BaseLoadBuilder.java

@@ -21,7 +21,7 @@
  */
 public class BaseLoadBuilder extends AbstractLoadModelBuilder<BaseLoadBuilder> {
 
-    private static final String CATEGORY = "baseLoads";
+    public static final String CATEGORY = "BASE_LOAD";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static BaseLoadBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerBuilder.java

@@ -21,7 +21,7 @@
  */
 public class LoadOneTransformerBuilder extends AbstractLoadModelBuilder<LoadOneTransformerBuilder> {
 
-    private static final String CATEGORY = "loadsOneTransformer";
+    public static final String CATEGORY = "LOAD_ONE_TRANSFORMER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static LoadOneTransformerBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadOneTransformerTapChangerBuilder.java

@@ -21,7 +21,7 @@
  */
 public class LoadOneTransformerTapChangerBuilder extends AbstractLoadModelBuilder<LoadOneTransformerTapChangerBuilder> {
 
-    private static final String CATEGORY = "loadsOneTransformerTapChanger";
+    public static final String CATEGORY = "LOAD_ONE_TRANSFORMER_TAP_CHANGER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static LoadOneTransformerTapChangerBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersBuilder.java

@@ -21,7 +21,7 @@
  */
 public class LoadTwoTransformersBuilder extends AbstractLoadModelBuilder<LoadTwoTransformersBuilder> {
 
-    private static final String CATEGORY = "loadsTwoTransformers";
+    public static final String CATEGORY = "LOAD_TWO_TRANSFORMERS";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static LoadTwoTransformersBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/loads/LoadTwoTransformersTapChangersBuilder.java

@@ -21,7 +21,7 @@
  */
 public class LoadTwoTransformersTapChangersBuilder extends AbstractLoadModelBuilder<LoadTwoTransformersTapChangersBuilder> {
 
-    private static final String CATEGORY = "loadsTwoTransformersTapChanger";
+    public static final String CATEGORY = "LOAD_TWO_TRANSFORMERS_TAP_CHANGER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static LoadTwoTransformersTapChangersBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/svarcs/BaseStaticVarCompensatorBuilder.java

@@ -24,7 +24,7 @@
  */
 public class BaseStaticVarCompensatorBuilder extends AbstractEquipmentModelBuilder<StaticVarCompensator, BaseStaticVarCompensatorBuilder> {
 
-    private static final String CATEGORY = "staticVarCompensators";
+    public static final String CATEGORY = "BASE_STATIC_VAR_COMPENSATOR";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static BaseStaticVarCompensatorBuilder of(Network network) {

dynawaltz/src/main/java/com/powsybl/dynawaltz/models/transformers/TransformerFixedRatioBuilder.java

@@ -24,7 +24,7 @@
  */
 public class TransformerFixedRatioBuilder extends AbstractEquipmentModelBuilder<TwoWindingsTransformer, TransformerFixedRatioBuilder> {
 
-    private static final String CATEGORY = "transformers";
+    public static final String CATEGORY = "TRANSFORMER";
     private static final ModelConfigs MODEL_CONFIGS = ModelConfigsHandler.getInstance().getModelConfigs(CATEGORY);
 
     public static TransformerFixedRatioBuilder of(Network network) {