diff --git a/src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java b/src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java index a3305ef26..a3bfe6147 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/AbstractBranchModification.java @@ -24,6 +24,8 @@ 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; /** @@ -31,8 +33,6 @@ */ 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) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/AbstractModification.java b/src/main/java/org/gridsuite/modification/server/modifications/AbstractModification.java index 4e63f65d0..0f103e724 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/AbstractModification.java +++ b/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); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java index 10345a8e2..2dcfd2fad 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java +++ b/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; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java b/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java index 15d9bd3ad..f8a0dad07 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java +++ b/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; } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ConstantUtil.java b/src/main/java/org/gridsuite/modification/server/modifications/ConstantUtil.java new file mode 100644 index 000000000..dbc64d23e --- /dev/null +++ b/src/main/java/org/gridsuite/modification/server/modifications/ConstantUtil.java @@ -0,0 +1,104 @@ +package org.gridsuite.modification.server.modifications; + +/** + * @author Etienne Lesot + */ +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"; +} diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java b/src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java index 7520d95a0..8bdf298de 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java +++ b/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 */ 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; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java index 8931f4a3d..e2b487bb3 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java +++ b/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; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java index 71a4508b9..eaf46dc67 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java @@ -19,6 +19,7 @@ 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; /** @@ -26,10 +27,6 @@ */ 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) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java index ed69f35ae..5093ef210 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java +++ b/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 @@ -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, diff --git a/src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java b/src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java index 0f5729430..31d8be9f0 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java +++ b/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; } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/PropertiesUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/PropertiesUtils.java index e517ffe31..1cbfd6874 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/PropertiesUtils.java +++ b/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 diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java b/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java index 899ace841..f95fe652d 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java @@ -22,6 +22,7 @@ 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; /** @@ -29,7 +30,6 @@ */ 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; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java index f4c9dd9c3..61277a42e 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java +++ b/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 @@ -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,13 +63,13 @@ 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) @@ -78,7 +77,7 @@ public void apply(Network network, ReportNode subReportNode) { .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) diff --git a/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java b/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java index e97a421ea..2dc79de61 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java @@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory; import static org.gridsuite.modification.server.NetworkModificationException.Type.TABULAR_MODIFICATION_ERROR; +import static org.gridsuite.modification.server.modifications.ConstantUtil.TABULAR_MODIFICATION_REPORT_KEY_PREFIX; /** * @author Etienne Homer @@ -26,8 +27,6 @@ public class TabularModification extends AbstractModification { private static final Logger LOGGER = LoggerFactory.getLogger(TabularModification.class); - private static final String TABULAR_MODIFICATION_REPORT_KEY_PREFIX = "tabular"; - private final TabularModificationInfos modificationInfos; public TabularModification(TabularModificationInfos modificationInfos) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java b/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java index 5fee968aa..7a63080e2 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java @@ -17,6 +17,7 @@ import java.util.List; import static org.gridsuite.modification.server.NetworkModificationException.Type.TWO_WINDINGS_TRANSFORMER_NOT_FOUND; +import static org.gridsuite.modification.server.modifications.ConstantUtil.*; import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode; /** @@ -24,10 +25,6 @@ */ public class TwoWindingsTransformerModification extends AbstractBranchModification { - private static final String RATIO_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE = "Ratio tap changer"; - private static final String PHASE_TAP_CHANGER_SUBREPORTER_DEFAULT_MESSAGE = "Phase tap changer"; - public static final String MAGNETIZING_CONDUCTANCE_FIELD_NAME = "Magnetizing conductance"; - public TwoWindingsTransformerModification(TwoWindingsTransformerModificationInfos modificationInfos) { super(modificationInfos); } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java index 395d2a54a..5b029fd15 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; +import static org.gridsuite.modification.server.modifications.ConstantUtil.*; import static org.gridsuite.modification.server.modifications.ModificationUtils.insertReportNode; /** @@ -27,26 +28,6 @@ public class VoltageInitModification extends AbstractModification { private final VoltageInitModificationInfos voltageInitModificationInfos; - private static final String GENERATORS_KEY = "GeneratorsModifications"; - private static final String GENERATORS_NAME = "Generators"; - private static final String TWO_WINDINGS_TRANSFORMERS_KEY = "2WindingsTransformersModifications"; - private static final String TWO_WINDINGS_TRANSFORMERS_NAME = "2 windings transformers"; - private static final String THREE_WINDINGS_TRANSFORMERS_KEY = "3WindingsTransformersModifications"; - private static final String THREE_WINDINGS_TRANSFORMERS_NAME = "3 windings transformers"; - private static final String STATIC_VAR_COMPENSATORS_KEY = "StaticVarCompensatorsModifications"; - private static final String STATIC_VAR_COMPENSATORS_NAME = "Static var compensators"; - private static final String VSC_CONVERTER_STATIONS_KEY = "VscConverterStationsModifications"; - private static final String VSC_CONVERTER_STATIONS_NAME = "Vsc converter stations"; - private static final String SHUNT_COMPENSATORS_KEY = "ShuntCompensatorsModifications"; - private static final String SHUNT_COMPENSATORS_NAME = "Shunt compensators"; - - private static final String VOLTAGE_SET_POINT = "Voltage set point"; - private static final String VOLTAGE_MAGNITUDE = "Voltage magnitude"; - private static final String VOLTAGE_ANGLE = "Voltage angle"; - private static final String REACTIVE_POWER_SET_POINT = "Reactive power set point"; - private static final String SECTION_COUNT = "Section count"; - private static final String COUNT = "count"; - @Override public void check(Network network) throws NetworkModificationException { if (voltageInitModificationInfos == null) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java index 8d0e0862e..05176eff7 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java @@ -20,18 +20,15 @@ import java.util.List; import static org.gridsuite.modification.server.NetworkModificationException.Type.*; +import static org.gridsuite.modification.server.modifications.ConstantUtil.*; import static org.gridsuite.modification.server.modifications.ModificationUtils.createInjectionInNodeBreaker; import static org.gridsuite.modification.server.modifications.ModificationUtils.reportInjectionCreationConnectivity; /** * @author Seddik Yengui */ - public class VscCreation extends AbstractModification { - public static final String VSC_SETPOINTS = "vscSetPoints"; - public static final String VSC_CHARACTERISTICS = "vscCharacteristics"; - private final VscCreationInfos modificationInfos; public VscCreation(VscCreationInfos modificationInfos) { @@ -63,7 +60,7 @@ private void checkDroop() { } // at least one field is provided but not for the others => NOT OK if (isPresentAngleDroopActivePowerControl || isPresentDroop || isPresentP0) { - throw new NetworkModificationException(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL, VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); + throw new NetworkModificationException(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL, ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); } // otherwise, i.e. none of the fields is not provided => OK extension will not be created } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java index f7c360a5e..7be869d56 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java @@ -23,19 +23,13 @@ import static org.gridsuite.modification.server.NetworkModificationException.Type.MODIFY_VSC_ERROR; import static org.gridsuite.modification.server.NetworkModificationException.Type.WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL; -import static org.gridsuite.modification.server.modifications.VscCreation.VSC_CHARACTERISTICS; -import static org.gridsuite.modification.server.modifications.VscCreation.VSC_SETPOINTS; +import static org.gridsuite.modification.server.modifications.ConstantUtil.*; /** * @author jamal kheyyad */ public class VscModification extends AbstractModification { - public static final String NO_VALUE = "No value"; - public static final String ANGLE_DROOP_ACTIVE_POWER_CONTROL_FIELD = "AngleDroopActivePowerControl"; - public static final String DROOP_FIELD = "Droop"; - public static final String P0_FIELD = "P0"; - 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"; private final VscModificationInfos modificationInfos; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/AbstractModificationByAssignment.java b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/AbstractModificationByAssignment.java index 33fe17929..5927db8aa 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/AbstractModificationByAssignment.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/AbstractModificationByAssignment.java @@ -34,42 +34,14 @@ import static org.gridsuite.modification.server.dto.byfilter.equipmentfield.FieldUtils.getFieldValue; import static org.gridsuite.modification.server.dto.byfilter.equipmentfield.FieldUtils.setFieldValue; +import static org.gridsuite.modification.server.modifications.ConstantUtil.NO_VALUE; import static org.gridsuite.modification.server.modifications.ModificationUtils.*; +import static org.gridsuite.modification.server.modifications.ConstantUtil.*; /** * @author Thang PHAM */ public abstract class AbstractModificationByAssignment extends AbstractModification { - 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 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"; protected FilterService filterService; protected int equipmentNotModifiedCount; diff --git a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ByFormulaModification.java b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ByFormulaModification.java index ad35e95db..955808eb5 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ByFormulaModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ByFormulaModification.java @@ -23,6 +23,8 @@ import java.util.List; import static org.gridsuite.modification.server.NetworkModificationException.Type.BY_FORMULA_MODIFICATION_ERROR; +import static org.gridsuite.modification.server.modifications.ConstantUtil.REPORT_KEY_EQUIPMENT_MODIFIED_ERROR; +import static org.gridsuite.modification.server.modifications.ConstantUtil.VALUE_KEY_EQUIPMENT_NAME; /** * @author Thang PHAM diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java index 086e333b4..989d3896f 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VscCreationTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.gridsuite.modification.server.NetworkModificationException.Type.*; -import static org.gridsuite.modification.server.modifications.VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; +import static org.gridsuite.modification.server.modifications.ConstantUtil.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java index a3010ab14..0cbfd37d6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/VscModificationTest.java @@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.gridsuite.modification.server.NetworkModificationException.Type.WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL; -import static org.gridsuite.modification.server.modifications.VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; +import static org.gridsuite.modification.server.modifications.ConstantUtil.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java index fd73c32fd..c2618d98d 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java @@ -24,8 +24,8 @@ import java.util.Date; import java.util.List; -import static org.gridsuite.modification.server.modifications.byfilter.AbstractModificationByAssignment.REPORT_KEY_BY_FILTER_MODIFICATION_SOME; -import static org.gridsuite.modification.server.modifications.byfilter.ByFormulaModification.REPORT_KEY_EQUIPMENT_MODIFIED_ERROR; +import static org.gridsuite.modification.server.modifications.ConstantUtil.REPORT_KEY_BY_FILTER_MODIFICATION_SOME; +import static org.gridsuite.modification.server.modifications.ConstantUtil.REPORT_KEY_EQUIPMENT_MODIFIED_ERROR; import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessageWithoutRank; import static org.junit.Assert.*;