refactor constants

src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java

@@ -24,15 +24,15 @@
 import java.util.stream.Collectors;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_MODIFICATION_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.DURATION;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.NAME;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode;
 
 /**
  * @author Florent MILLOT <florent.millot at rte-france.com>
  */
 public abstract class AbstractBranchModification extends AbstractModification {
 
-    private static final String DURATION = "duration";
-    private static final String NAME = "name";
     protected final BranchModificationInfos modificationInfos;
 
     protected AbstractBranchModification(BranchModificationInfos modificationInfos) {

src/main/java/org/gridsuite/modification/server/modifications/AbstractModification.java

@@ -18,9 +18,6 @@
  */
 public abstract class AbstractModification extends AbstractNetworkModification {
 
-    public static final String CHARACTERISTICS = "Characteristics";
-    public static final String SETPOINTS = "Setpoints";
-
     @Override
     public void apply(Network network, NamingStrategy namingStrategy, boolean throwException, ComputationManager computationManager, ReportNode reportNode) {
         apply(network, reportNode);

src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java

@@ -18,6 +18,8 @@
 import java.util.List;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BATTERY_ALREADY_EXISTS;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.ACTIVE_LIMITS;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.LIMITS;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.*;
 
 /**
@@ -26,8 +28,6 @@
 public class BatteryCreation extends AbstractModification {
 
     private final BatteryCreationInfos modificationInfos;
-    private static final String LIMITS = "Limits";
-    private static final String ACTIVE_LIMITS = "Active limits";
 
     public BatteryCreation(BatteryCreationInfos modificationInfos) {
         this.modificationInfos = modificationInfos;

src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java

@@ -26,6 +26,7 @@
 import java.util.List;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_BATTERY_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.*;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode;
 
 /**
@@ -35,10 +36,6 @@ public class BatteryModification extends AbstractModification {
 
     private final BatteryModificationInfos modificationInfos;
 
-    private static final String LIMITS = "Limits";
-    private static final String ACTIVE_LIMITS = "Active limits";
-    private static final String SETPOINTS = "Setpoints";
-
     public BatteryModification(BatteryModificationInfos modificationInfos) {
         this.modificationInfos = modificationInfos;
     }

src/main/java/org/gridsuite/modification/server/modifications/ConstantUtil.java

@@ -0,0 +1,104 @@
+package org.gridsuite.modification.server.modifications;
+
+/**
+ * @author Etienne Lesot <etienne.lesot at rte-france.com>
+ */
+public final class ConstantUtil {
+
+    private ConstantUtil() {
+
+    }
+
+    public static final String ACTIVE_LIMITS = "Active limits";
+    public static final String ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG = "Angle droop active power control, Droop and P0 must be all provided or none";
+    public static final String ANGLE_DROOP_ACTIVE_POWER_CONTROL_FIELD = "AngleDroopActivePowerControl";
+    public static final String APPLIED = "Applied";
+    public static final String BREAKER = "breaker_";
+    public static final String BUS_BAR_SECTION_ID = "busbarSectionId";
+    public static final String CHARACTERISTICS = "Characteristics";
+    public static final String CONNECTION_DIRECTION_FIELD_NAME = "Connection direction";
+    public static final String CONNECTION_NAME_FIELD_NAME = "Connection name";
+    public static final String CONNECTION_POSITION_FIELD_NAME = "Connection position";
+    public static final String CONNECTIVITY = "Connectivity";
+    public static final String COUNT = "count";
+    public static final String DISCONNECTOR = "disconnector_";
+    public static final String DOES_NOT_EXIST_IN_NETWORK = " does not exist in network";
+    public static final String DROOP_FIELD = "Droop";
+    public static final String DURATION = "duration";
+    public static final String EQUIPMENT_DISCONNECTED = "equipmentDisconnected";
+    public static final String GENERATOR = "generator";
+    public static final String GENERATORS_WITH_FIXED_SUPPLY = "generatorsWithFixedSupply";
+    public static final String GENERATORS_WITHOUT_OUTAGE = "generatorsWithoutOutage";
+    public static final String GENERATORS_FREQUENCY_RESERVE = "generatorsFrequencyReserve";
+    public static final String GENERATORS_KEY = "GeneratorsModifications";
+    public static final String GENERATORS_NAME = "Generators";
+    public static final String IS_PLURAL = "isPlural";
+    public static final String LIMITS = "Limits";
+    public static final String MAGNETIZING_CONDUCTANCE_FIELD_NAME = "Magnetizing conductance";
+    public static final String MAX_REACTIVE_POWER_FIELDNAME = "Maximum reactive power";
+    public static final String MIN_REACTIVE_POWER_FIELDNAME = "Minimum reactive power";
+    public static final String NAME = "name";
+    public static final String NO_VALUE = "No value";
+    public static final String NOT_EXIST_IN_NETWORK = " does not exist in network";
+    public static final String P0_FIELD = "P0";
+    public static final String PHASE_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE = "Phase tap changer";
+    public static final String POWER_TO_DISPATCH = "PowerToDispatch";
+    public static final String PROPERTIES = "Properties";
+    public static final String RATIO_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE = "Ratio tap changer";
+    public static final String REACTIVE_LIMITS = "Reactive limits";
+    public static final String REACTIVE_POWER_SET_POINT = "Reactive power set point";
+    public static final String REGION_CVG = "regionCvg";
+    public static final String REPORT_KEY_RATIO_TAP_CHANGER_EQUIPMENT_MODIFIED_ERROR = "ratioTapChangerEquipmentModifiedError";
+    public static final String REPORT_KEY_PHASE_TAP_CHANGER_EQUIPMENT_MODIFIED_ERROR = "phaseTapChangerEquipmentModifiedError";
+    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR = "equipmentModifiedError";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SOME = "byFilterModificationSome";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_FAILED = "byFilterModificationFailed";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SUCCESS = "byFilterModificationSuccess";
+    public static final String REPORT_KEY_NUMBER_OF_VALID_EQUIPMENT = "numberOfValidEquipment";
+    public static final String REPORT_KEY_NOT_EDITED_EQUIPMENTS_FILTER = "notEditedEquipmentsFilter";
+    public static final String REPORT_KEY_EDITED_FIELD_FILTER = "editedFieldFilter";
+    public static final String REPORT_KEY_FILTER_EQUIPMENTS_NOT_FOUND = "filterEquipmentsNotFound";
+    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_REPORT = "equipmentModifiedReport";
+    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_REPORT_EXCEPTION = "equipmentModifiedReportException";
+    public static final String REPORT_KEY_APPLIED_BY_FILTER_MODIFICATIONS = "appliedByFilterModifications";
+    public static final String REPORT_KEY_APPLIED_ASSIGNMENT = "appliedAssignment";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_ALL = "byFilterModificationAll";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_NONE = "byFilterModificationNone";
+    public static final String REPORT_KEY_BY_FILTER_MODIFICATION_NOT_FOUND = "byFilterModificationNotFound";
+    public static final String RESULT = "Result";
+    public static final String SECTION_COUNT = "Section count";
+    public static final String SETPOINTS = "Setpoints";
+    public static final String SHUNT_COMPENSATORS_KEY = "ShuntCompensatorsModifications";
+    public static final String SHUNT_COMPENSATORS_NAME = "Shunt compensators";
+    public static final String STACKING = "Stacking";
+    public static final String STATIC_VAR_COMPENSATORS_KEY = "StaticVarCompensatorsModifications";
+    public static final String STATIC_VAR_COMPENSATORS_NAME = "Static var compensators";
+    public static final String SUBSTATION = "substation";
+    public static final String SWITCHED_ON_Q_AT_NOMINALV_LOG_MESSAGE = "Switched-on Q at nominal voltage";
+    public static final String SYNCHRONOUS_COMPONENT = "SC";
+    public static final String TABULAR_MODIFICATION_REPORT_KEY_PREFIX = "tabular";
+    public static final String THREE_WINDINGS_TRANSFORMERS_KEY = "3WindingsTransformersModifications";
+    public static final String THREE_WINDINGS_TRANSFORMERS_NAME = "3 windings transformers";
+    public static final String TWO_WINDINGS_TRANSFORMERS_KEY = "2WindingsTransformersModifications";
+    public static final String TWO_WINDINGS_TRANSFORMERS_NAME = "2 windings transformers";
+    public static final String VALUE_KEY_FILTER_NAME = "filterName";
+    public static final String VALUE_KEY_FIELD_NAME = "fieldName";
+    public static final String VALUE_KEY_EQUIPMENT_NAME = "equipmentName";
+    public static final String VALUE_KEY_EQUIPMENT_TYPE = "equipmentType";
+    public static final String VALUE_KEY_EQUIPMENT_COUNT = "equipmentCount";
+    public static final String VALUE_KEY_EQUIPMENT_IDS = "equipmentIds";
+    public static final String VALUE_KEY_NB_CHANGED = "nbChanged";
+    public static final String VALUE_KEY_NB_UNCHANGED = "nbUnchanged";
+    public static final String VALUE_KEY_OLD_VALUE = "oldValue";
+    public static final String VALUE_KEY_NEW_VALUE = "newValue";
+    public static final String VALUE_KEY_MODIFICATION_TYPE_LABEL = "modificationTypeLabel";
+    public static final String VALUE_KEY_FILTERS_EACH_ASSIGNMENT = "filtersEachAssignment";
+    public static final String VALUE_KEY_ERROR_MESSAGE = "errorMessage";
+    public static final String VOLTAGE_SET_POINT = "Voltage set point";
+    public static final String VOLTAGE_MAGNITUDE = "Voltage magnitude";
+    public static final String VOLTAGE_ANGLE = "Voltage angle";
+    public static final String VSC_CONVERTER_STATIONS_KEY = "VscConverterStationsModifications";
+    public static final String VSC_CONVERTER_STATIONS_NAME = "Vsc converter stations";
+    public static final String VSC_SETPOINTS = "vscSetPoints";
+    public static final String VSC_CHARACTERISTICS = "vscCharacteristics";
+}

src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java

@@ -33,24 +33,14 @@
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toCollection;
 import static org.gridsuite.modification.server.NetworkModificationException.Type.GENERATION_DISPATCH_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.*;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
 public class GenerationDispatch extends AbstractModification {
-    private static final String SYNCHRONOUS_COMPONENT = "SC";
-    private static final String POWER_TO_DISPATCH = "PowerToDispatch";
-    private static final String STACKING = "Stacking";
-    private static final String RESULT = "Result";
-    private static final String GENERATOR = "generator";
-    private static final String SUBSTATION = "substation";
-    private static final String REGION_CVG = "regionCvg";
-    private static final String IS_PLURAL = "isPlural";
-    private static final double EPSILON = 0.001;
-    private static final String GENERATORS_WITH_FIXED_SUPPLY = "generatorsWithFixedSupply";
-    private static final String GENERATORS_WITHOUT_OUTAGE = "generatorsWithoutOutage";
-    private static final String GENERATORS_FREQUENCY_RESERVE = "generatorsFrequencyReserve";
 
+    public static final double EPSILON = 0.001;
     private final GenerationDispatchInfos generationDispatchInfos;
 
     protected FilterService filterService;

src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java

@@ -21,6 +21,8 @@
 import java.util.List;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.GENERATOR_ALREADY_EXISTS;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.ACTIVE_LIMITS;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.LIMITS;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.*;
 
 /**
@@ -29,8 +31,6 @@
 public class GeneratorCreation extends AbstractModification {
 
     private final GeneratorCreationInfos modificationInfos;
-    private static final String LIMITS = "Limits";
-    private static final String ACTIVE_LIMITS = "Active limits";
 
     public GeneratorCreation(GeneratorCreationInfos modificationInfos) {
         this.modificationInfos = modificationInfos;

src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java

@@ -19,17 +19,14 @@
 import java.util.List;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.*;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode;
 
 /**
  * @author Ayoub Labidi <ayoub.labidi at rte-france.com>
  */
 public class GeneratorModification extends AbstractModification {
 
-    private static final String LIMITS = "Limits";
-    private static final String ACTIVE_LIMITS = "Active limits";
-    private static final String SETPOINTS = "Setpoints";
-
     private final GeneratorModificationInfos modificationInfos;
 
     public GeneratorModification(GeneratorModificationInfos modificationInfos) {

src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java

@@ -32,6 +32,7 @@
 import java.util.stream.Stream;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.*;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.*;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
@@ -40,24 +41,6 @@
 // TODO remove public qualifier for all methods
 public final class ModificationUtils {
 
-    public static final String DISCONNECTOR = "disconnector_";
-    public static final String BREAKER = "breaker_";
-    public static final String BUS_BAR_SECTION_ID = "busbarSectionId";
-
-    public static final String DOES_NOT_EXIST_IN_NETWORK = " does not exist in network";
-    public static final String EQUIPMENT_DISCONNECTED = "equipmentDisconnected";
-    public static final String NO_VALUE = "No value";
-    public static final String LIMITS = "Limits";
-    public static final String REACTIVE_LIMITS = "Reactive limits";
-    private static final String SETPOINTS = "Setpoints";
-    private static final String MIN_REACTIVE_POWER_FIELDNAME = "Minimum reactive power";
-    private static final String MAX_REACTIVE_POWER_FIELDNAME = "Maximum reactive power";
-    private static final String CONNECTIVITY = "Connectivity";
-    public static final String CONNECTION_NAME_FIELD_NAME = "Connection name";
-    public static final String CONNECTION_DIRECTION_FIELD_NAME = "Connection direction";
-    public static final String CONNECTION_POSITION_FIELD_NAME = "Connection position";
-    public static final String NOT_EXIST_IN_NETWORK = " does not exist in network";
-
     public enum FeederSide {
         INJECTION_SINGLE_SIDE,
         BRANCH_SIDE_ONE,

src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java

@@ -28,6 +28,7 @@
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.EQUIPMENT_NOT_FOUND;
 import static org.gridsuite.modification.server.NetworkModificationException.Type.OPERATING_STATUS_MODIFICATION_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.APPLIED;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.distinctByKey;
 
 /**
@@ -38,8 +39,6 @@ public class OperatingStatusModification extends AbstractModification {
     private final OperatingStatusModificationInfos modificationInfos;
     private static final Logger LOGGER = LoggerFactory.getLogger(OperatingStatusModification.class);
 
-    private static final String APPLIED = "Applied";
-
     public OperatingStatusModification(OperatingStatusModificationInfos modificationInfos) {
         this.modificationInfos = modificationInfos;
     }

src/main/java/org/gridsuite/modification/server/modifications/PropertiesUtils.java

@@ -7,8 +7,9 @@
 
 import java.util.*;
 
+import static org.gridsuite.modification.server.modifications.ConstantUtil.PROPERTIES;
+
 public final class PropertiesUtils {
-    public static final String PROPERTIES = "Properties";
 
     private PropertiesUtils() {
         // Should not be instantiated

src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java

@@ -22,14 +22,14 @@
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_SHUNT_COMPENSATOR_ERROR;
 import static org.gridsuite.modification.server.NetworkModificationException.Type.SHUNT_COMPENSATOR_NOT_FOUND;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.SWITCHED_ON_Q_AT_NOMINALV_LOG_MESSAGE;
 import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode;
 
 /**
  * @author Seddik Yengui <Seddik.yengui at rte-france.com>
  */
 
 public class ShuntCompensatorModification extends AbstractModification {
-    private static final String SWITCHED_ON_Q_AT_NOMINALV_LOG_MESSAGE = "Switched-on Q at nominal voltage";
 
     private final ShuntCompensatorModificationInfos modificationInfos;
 

src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java

@@ -16,6 +16,7 @@
 import org.slf4j.LoggerFactory;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.TABULAR_CREATION_ERROR;
+import static org.gridsuite.modification.server.modifications.ConstantUtil.TABULAR_MODIFICATION_REPORT_KEY_PREFIX;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -24,8 +25,6 @@ public class TabularCreation extends AbstractModification {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TabularCreation.class);
 
-    private static final String TABULAR_CREATION_REPORT_KEY_PREFIX = "tabular";
-
     private final TabularCreationInfos creationInfos;
 
     public TabularCreation(TabularCreationInfos creationInfos) {
@@ -64,21 +63,21 @@ public void apply(Network network, ReportNode subReportNode) {
 
         if (creationInfos.getCreations().size() == applicationFailuresCount) {
             subReportNode.newReportNode()
-                    .withMessageTemplate(TABULAR_CREATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name() + "Error", "Tabular creation: No ${defaultMessage}")
+                    .withMessageTemplate(TABULAR_MODIFICATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name() + "Error", "Tabular creation: No ${defaultMessage}")
                     .withUntypedValue("defaultMessage", defaultMessage)
                     .withSeverity(TypedValue.ERROR_SEVERITY)
                     .add();
         } else if (applicationFailuresCount > 0) {
             subReportNode.newReportNode()
-                    .withMessageTemplate(TABULAR_CREATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name() + "Warning", "Tabular creation: ${creationsCount} ${defaultMessage} and ${failuresCount} have not been created")
+                    .withMessageTemplate(TABULAR_MODIFICATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name() + "Warning", "Tabular creation: ${creationsCount} ${defaultMessage} and ${failuresCount} have not been created")
                     .withUntypedValue("creationsCount", creationInfos.getCreations().size() - applicationFailuresCount)
                     .withUntypedValue("failuresCount", applicationFailuresCount)
                     .withUntypedValue("defaultMessage", defaultMessage)
                     .withSeverity(TypedValue.WARN_SEVERITY)
                     .add();
         } else {
             subReportNode.newReportNode()
-                    .withMessageTemplate(TABULAR_CREATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name(), "Tabular creation: ${creationsCount} ${defaultMessage}")
+                    .withMessageTemplate(TABULAR_MODIFICATION_REPORT_KEY_PREFIX + creationInfos.getCreationType().name(), "Tabular creation: ${creationsCount} ${defaultMessage}")
                     .withUntypedValue("creationsCount", creationInfos.getCreations().size())
                     .withUntypedValue("defaultMessage", defaultMessage)
                     .withSeverity(TypedValue.INFO_SEVERITY)