diff --git a/pom.xml b/pom.xml index 639081728..b084ad658 100644 --- a/pom.xml +++ b/pom.xml @@ -44,16 +44,11 @@ - 34 + 35 1.0.5 5.0.0-alpha.14 org.gridsuite.modification.server - - 1.19.0 **/migration/**/* - - 1.0.14 @@ -96,24 +91,6 @@ pom import - - com.powsybl - powsybl-network-store-client - - ${powsybl-network-store.version} - - - - com.powsybl - powsybl-network-store-iidm-impl - ${powsybl-network-store.version} - - - - com.powsybl - powsybl-network-store-model - ${powsybl-network-store.version} - @@ -138,7 +115,6 @@ org.gridsuite gridsuite-filter - ${filter.version} com.powsybl 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 655949b30..2ef475ff0 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/BatteryCreation.java @@ -73,6 +73,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(battery, subReportNode, modificationInfos.getProperties(), "BatteryProperties"); } + @Override + public String getName() { + return "BatteryCreation"; + } + private void createBatteryInNodeBreaker(VoltageLevel voltageLevel, BatteryCreationInfos batteryCreationInfos, Network network, ReportNode subReportNode) { BatteryAdder batteryAdder = createBatteryAdderInNodeBreaker(voltageLevel, batteryCreationInfos); createInjectionInNodeBreaker(voltageLevel, batteryCreationInfos, network, batteryAdder, subReportNode); 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 1cc5e234e..996647886 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/BatteryModification.java @@ -76,6 +76,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyBattery(battery, modificationInfos, subReportNode); } + @Override + public String getName() { + return "BatteryModification"; + } + private void modifyBattery(Battery battery, BatteryModificationInfos modificationInfos, ReportNode subReportNode) { subReportNode.newReportNode() .withMessageTemplate("batteryModification", "Battery with id=${id} modified :") diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ByFilterDeletion.java b/src/main/java/org/gridsuite/modification/server/modifications/ByFilterDeletion.java index 92b554d64..0c460ea75 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ByFilterDeletion.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/ByFilterDeletion.java @@ -92,6 +92,11 @@ public void apply(Network network, ReportNode subReportNode) { } } + @Override + public String getName() { + return "ByFilterDeletion"; + } + private void applyFilterDeletion(Network network, ReportNode subReportNode, List identifiableAttributes) { IdentifiableType identifiableType = modificationInfos.getEquipmentType(); if (CONNECTABLE_TYPES.contains(identifiableType)) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/CompositeModification.java b/src/main/java/org/gridsuite/modification/server/modifications/CompositeModification.java index 7dd8f2645..dd5847aa3 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/CompositeModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/CompositeModification.java @@ -22,4 +22,9 @@ public CompositeModification(CompositeModificationInfos compositeModificationInf public void apply(Network network, ReportNode subReportNode) { throw new UnsupportedOperationException(); } + + @Override + public String getName() { + return "CompositeModification"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/DeleteAttachingLine.java b/src/main/java/org/gridsuite/modification/server/modifications/DeleteAttachingLine.java index 4f1bc0112..d3ee37fbe 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/DeleteAttachingLine.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/DeleteAttachingLine.java @@ -56,4 +56,9 @@ public void apply(Network network, ReportNode subReportNode) { .build(); algo.apply(network, true, subReportNode); } + + @Override + public String getName() { + return "DeleteAttachingLine"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLine.java b/src/main/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLine.java index e234f0f6e..fee082b67 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLine.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/DeleteVoltageLevelOnLine.java @@ -52,4 +52,9 @@ public void apply(Network network, ReportNode subReportNode) { .build(); algo.apply(network, true, subReportNode); } + + @Override + public String getName() { + return "DeleteVoltageLevelOnLine"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModification.java b/src/main/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModification.java index 33e5d1c54..75bb10868 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/EquipmentAttributeModification.java @@ -61,6 +61,11 @@ public void apply(Network network, ReportNode subReportNode) { } } + @Override + public String getName() { + return "EquipmentAttributeModification"; + } + private void changeSwitchAttribute(Switch aSwitch, String attributeName, Object attributeValue, ReportNode reportNode) { if (attributeName.equals("open")) { if (Boolean.TRUE.equals(aSwitch.isOpen() != (Boolean) attributeValue)) { diff --git a/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java b/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java index 290f07fef..862d1acdb 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java @@ -60,6 +60,11 @@ public void apply(Network network, ReportNode subReportNode) { .add(); } + @Override + public String getName() { + return "EquipmentDeletion"; + } + private void removeHvdcLine(Network network, ReportNode subReportNode) { HvdcLccDeletionInfos specificInfos = (HvdcLccDeletionInfos) modificationInfos.getEquipmentInfos(); List shuntCompensatorIds = List.of(); 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..b89f9e166 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GenerationDispatch.java @@ -587,6 +587,11 @@ public void apply(Network network, ReportNode subReportNode) { } } + @Override + public String getName() { + return "GenerationDispatch"; + } + private Map> getGeneratorsByRegion(Network network, Component component) { // get all connected generators that are inside the synchronous component and the substationIds associated. List connectedGenerators = network.getGeneratorStream() 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 9599abe89..9f9f05640 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorCreation.java @@ -81,6 +81,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(generator, subReportNode, modificationInfos.getProperties(), "GeneratorProperties"); } + @Override + public String getName() { + return "GeneratorCreation"; + } + private void createGeneratorInNodeBreaker(VoltageLevel voltageLevel, GeneratorCreationInfos generatorCreationInfos, Network network, ReportNode subReportNode) { GeneratorAdder generatorAdder = createGeneratorAdderInNodeBreaker(voltageLevel, generatorCreationInfos); createInjectionInNodeBreaker(voltageLevel, generatorCreationInfos, network, generatorAdder, subReportNode); 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 72b4c41d6..fd1cc6196 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorModification.java @@ -79,6 +79,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyGenerator(generator, modificationInfos, subReportNode); } + @Override + public String getName() { + return "GeneratorModification"; + } + private void modifyGenerator(Generator generator, GeneratorModificationInfos modificationInfos, ReportNode subReportNode) { subReportNode.newReportNode() .withMessageTemplate("generatorModification", "Generator with id=${id} modified :") diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorScaling.java b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorScaling.java index 1695e88b0..89dfd2384 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GeneratorScaling.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GeneratorScaling.java @@ -191,4 +191,9 @@ protected double getAsked(ScalingVariationInfos generatorScalingVariation, Atomi protected Scalable getScalable(String id) { return Scalable.onGenerator(id); } + + @Override + public String getName() { + return "GeneratorScaling"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/GroovyScript.java b/src/main/java/org/gridsuite/modification/server/modifications/GroovyScript.java index e4e0cde54..0bd25a640 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/GroovyScript.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/GroovyScript.java @@ -50,4 +50,9 @@ public void apply(Network network, ReportNode subReportNode) { .withSeverity(TypedValue.INFO_SEVERITY) .add(); } + + @Override + public String getName() { + return "GroovyScript"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevel.java b/src/main/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevel.java index def2bb544..ac38c17fb 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevel.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevel.java @@ -88,4 +88,9 @@ public void apply(Network network, ReportNode subReportNode) { algo.apply(network, true, subReportNode); } + + @Override + public String getName() { + return "LineAttachToVoltageLevel"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LineCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/LineCreation.java index 8d1970668..dda42c430 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LineCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LineCreation.java @@ -78,6 +78,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(line, subReportNode, modificationInfos.getProperties(), "LineProperties"); } + @Override + public String getName() { + return "LineCreation"; + } + private void addLine(Network network, VoltageLevel voltageLevel1, VoltageLevel voltageLevel2, LineCreationInfos lineCreationInfos, boolean withSwitch1, boolean withSwitch2, ReportNode subReportNode) { ModificationUtils.getInstance().createLineAdder(network, voltageLevel1, voltageLevel2, lineCreationInfos, withSwitch1, withSwitch2).add(); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LineModification.java b/src/main/java/org/gridsuite/modification/server/modifications/LineModification.java index 5f8d6363e..c5fb6f7d6 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LineModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LineModification.java @@ -42,6 +42,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyLine(line, modificationInfos, subReportNode); } + @Override + public String getName() { + return "LineModification"; + } + private void modifyLine(Line line, BranchModificationInfos lineModificationInfos, ReportNode subReportNode) { modifyBranch(line, lineModificationInfos, subReportNode, "lineModification", "Line with id=${id} modified :"); PropertiesUtils.applyProperties(line, subReportNode, modificationInfos.getProperties(), "LineProperties"); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevel.java b/src/main/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevel.java index e7959e4e8..b4ec7be07 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevel.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevel.java @@ -63,4 +63,9 @@ public void apply(Network network, ReportNode subReportNode) { algo.apply(network, true, subReportNode); } + + @Override + public String getName() { + return "LineSplitWithVoltageLevel"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLines.java b/src/main/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLines.java index d7563fd2b..18cbdd754 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLines.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLines.java @@ -65,4 +65,9 @@ public void apply(Network network, ReportNode subReportNode) { .build(); algo.apply(network, true, subReportNode); } + + @Override + public String getName() { + return "LinesAttachToSplitLines"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LoadCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/LoadCreation.java index db0e67219..9a4da5fea 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LoadCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LoadCreation.java @@ -58,6 +58,11 @@ public void apply(Network network, ReportNode subReporter) { PropertiesUtils.applyProperties(load, subReporter, modificationInfos.getProperties(), "LoadProperties"); } + @Override + public String getName() { + return "LoadCreation"; + } + private void reportElementaryCreations(ReportNode subReportNode) { if (modificationInfos.getEquipmentName() != null) { ModificationUtils.getInstance() diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java b/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java index 3bbbb68c8..79862d6de 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LoadModification.java @@ -45,6 +45,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyLoad(load, subReportNode); } + @Override + public String getName() { + return "LoadModification"; + } + private void modifyLoad(Load load, ReportNode subReportNode) { subReportNode.newReportNode() .withMessageTemplate("loadModification", "Load with id=${id} modified :") diff --git a/src/main/java/org/gridsuite/modification/server/modifications/LoadScaling.java b/src/main/java/org/gridsuite/modification/server/modifications/LoadScaling.java index 128077124..f5c71e700 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/LoadScaling.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/LoadScaling.java @@ -148,4 +148,9 @@ private void reportScaling(ReportNode subReportNode, VariationMode variationMode .withSeverity(TypedValue.INFO_SEVERITY) .add(); } + + @Override + public String getName() { + return "LoadScaling"; + } } 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 88554b19f..769b1e546 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/OperatingStatusModification.java @@ -75,6 +75,11 @@ public void apply(Network network, ReportNode subReportNode) { } } + @Override + public String getName() { + return "OperatingStatusModification"; + } + private void applyLockoutEquipment(ReportNode subReportNode, Identifiable equipment, String equipmentType) { if (disconnectAllTerminals(equipment)) { equipment.newExtension(OperatingStatusAdder.class).withStatus(OperatingStatus.Status.PLANNED_OUTAGE).add(); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreation.java index 4c219d4ea..a6b222892 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorCreation.java @@ -75,6 +75,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(shuntCompensator, subReportNode, modificationInfos.getProperties(), "ShuntCompensatorProperties"); } + @Override + public String getName() { + return "ShuntCompensatorCreation"; + } + private ShuntCompensatorAdder createShuntAdderInNodeBreaker(VoltageLevel voltageLevel, ShuntCompensatorCreationInfos shuntCompensatorInfos) { // creating the shunt compensator ShuntCompensatorAdder shuntAdder = voltageLevel.newShuntCompensator() 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 c98d9dbd9..63bef95d4 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/ShuntCompensatorModification.java @@ -82,6 +82,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(shuntCompensator, subReportNode, modificationInfos.getProperties(), "ShuntCompensatorProperties"); } + @Override + public String getName() { + return "ShuntCompensatorModification"; + } + public static void modifyMaximumSectionCount(AttributeModification maximumSectionCountModif, AttributeModification maxSusceptance, AttributeModification maxQAtNominalV, diff --git a/src/main/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java index 3916fd326..23bef4bc7 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/StaticVarCompensatorCreation.java @@ -75,6 +75,11 @@ public void apply(Network network, ReportNode subReportNode) { .add(); } + @Override + public String getName() { + return "StaticVarCompensatorCreation"; + } + private void createStaticVarCompensatorInNodeBreaker(VoltageLevel voltageLevel, StaticVarCompensatorCreationInfos staticVarCompensatorCreationInfos, Network network, ReportNode subReportNode) { StaticVarCompensatorAdder staticVarCompensatorAdder = createStaticVarCompensatorAdderInNodeBreaker(voltageLevel, staticVarCompensatorCreationInfos); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/SubstationCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/SubstationCreation.java index 2387ecb44..7dfc8bcab 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/SubstationCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/SubstationCreation.java @@ -40,4 +40,9 @@ public void apply(Network network, ReportNode subReportNode) { // properties PropertiesUtils.applyProperties(substation, subReportNode, modificationInfos.getProperties(), "SubstationProperties"); } + + @Override + public String getName() { + return "SubstationCreation"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/SubstationModification.java b/src/main/java/org/gridsuite/modification/server/modifications/SubstationModification.java index e38db3a7f..686b9ebc6 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/SubstationModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/SubstationModification.java @@ -51,4 +51,9 @@ public void apply(Network network, ReportNode subReportNode) { // properties PropertiesUtils.applyProperties(station, subReportNode, modificationInfos.getProperties(), "SubstationProperties"); } + + @Override + public String getName() { + return "SubstationModification"; + } } 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..a21feb641 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TabularCreation.java @@ -85,4 +85,9 @@ public void apply(Network network, ReportNode subReportNode) { .add(); } } + + @Override + public String getName() { + return "TabularCreation"; + } } 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..83ceb5ed0 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java @@ -98,6 +98,11 @@ public void apply(Network network, ReportNode subReportNode) { } } + @Override + public String getName() { + return "TabularModification"; + } + public void checkShuntCompensatorModification( Network network, ShuntCompensatorModificationInfos shuntCompensatorModificationInfos, diff --git a/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreation.java index 89c478cb2..6ce46a91e 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerCreation.java @@ -63,6 +63,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(twoWindingsTransformer, subReportNode, modificationInfos.getProperties(), "TwoWindingsTransformerProperties"); } + @Override + public String getName() { + return "TwoWindingsTransformerCreation"; + } + private TwoWindingsTransformer create2WTInNodeBreaker(Network network, VoltageLevel voltageLevel1, VoltageLevel voltageLevel2, ReportNode subReportNode) { var twoWindingsTransformerAdder = createTwoWindingsTransformerAdder(voltageLevel1, voltageLevel2, modificationInfos, false, false); 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 e1ab603d6..f3fdca27e 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModification.java @@ -47,6 +47,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyTwoWindingsTransformer(twoWindingsTransformer, modificationInfos, subReportNode, network); } + @Override + public String getName() { + return "TwoWindingsTransformerModification"; + } + private void modifyTwoWindingsTransformer(TwoWindingsTransformer twoWindingsTransformer, BranchModificationInfos twoWindingsTransformerModificationInfos, ReportNode subReportNode, Network network) { modifyBranch(twoWindingsTransformer, twoWindingsTransformerModificationInfos, subReportNode, "twoWindingsTransformerModification", "TwoWindingsTransformer with id=${id} modified :"); addTapChangersToTwoWindingsTransformer(network, (TwoWindingsTransformerModificationInfos) modificationInfos, twoWindingsTransformer, subReportNode); 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..c7c14fbe8 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageInitModification.java @@ -75,6 +75,11 @@ public void apply(Network network, ReportNode subReportNode) { applyBusModification(network, subReportNode); } + @Override + public String getName() { + return "VoltageInitModification"; + } + private void applyBusModification(Network network, ReportNode subReportNode) { int modificationsCount = 0; List reports = new ArrayList<>(); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelCreation.java index 84993e890..1cf63ae4d 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelCreation.java @@ -35,4 +35,9 @@ public void apply(Network network, ReportNode subReportNode) { VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getEquipmentId()); PropertiesUtils.applyProperties(voltageLevel, subReportNode, modificationInfos.getProperties(), "VlProperties"); } + + @Override + public String getName() { + return "VoltageLevelCreation"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java index 0fb9eebc3..928759d46 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java @@ -94,6 +94,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(voltageLevel, subReportNode, modificationInfos.getProperties(), "VlProperties"); } + @Override + public String getName() { + return "VoltageLevelModification"; + } + public static void modifyHighVoltageLimit(VoltageLevel voltageLevel, AttributeModification highVoltageLimit, ReportNode subReportNode) { ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setHighVoltageLimit, voltageLevel::getHighVoltageLimit, highVoltageLimit, subReportNode, "High voltage limit"); } 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..587e07737 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java @@ -137,6 +137,11 @@ public void apply(Network network, ReportNode subReportNode) { PropertiesUtils.applyProperties(hvdcLine, subReportNode, modificationInfos.getProperties(), "VscProperties"); } + @Override + public String getName() { + return "VscCreation"; + } + private boolean shouldCreateDroopActivePowerControlExtension() { return VscModification.shouldCreateDroopActivePowerControlExtension( modificationInfos.getAngleDroopActivePowerControl() != null, modificationInfos.getDroop() != null, modificationInfos.getP0() != null); 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..e06658bfc 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VscModification.java @@ -97,6 +97,11 @@ public void apply(Network network, ReportNode subReportNode) { modifyVsc(network, hvdcLine, modificationInfos, subReportNode); } + @Override + public String getName() { + return "VscModification"; + } + private void modifyVsc(@Nonnull Network network, @Nonnull HvdcLine hvdcLine, VscModificationInfos modificationInfos, ReportNode subReportNode) { subReportNode.newReportNode() .withMessageTemplate("VscModification", "Vsc with id=${id} modified :") 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..0884af43b 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 @@ -108,4 +108,9 @@ private Double applyOperation(Operator operator, @Nonnull Double value1, @Nonnul case PERCENTAGE -> (value1 / 100) * value2; }; } + + @Override + public String getName() { + return "ByFormulaModification"; + } } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ModificationByAssignment.java b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ModificationByAssignment.java index 421e6656f..d7de3e7ff 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ModificationByAssignment.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/byfilter/ModificationByAssignment.java @@ -104,4 +104,9 @@ protected String applyValue(Identifiable equipment, AbstractAssignmentInfos a return super.applyValue(equipment, abstractAssignmentInfos); } } + + @Override + public String getName() { + return "ModificationByAssignment"; + } }