upgrade gridsuite dependencies to v35 (#558)

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>

pom.xml

@@ -44,16 +44,11 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>34</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>35</gridsuite-dependencies.version>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
         <liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
-        <!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
-        <powsybl-network-store.version>1.19.0</powsybl-network-store.version>
         <sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
-        <!-- FIXME: gridsuite-filter modules' version is overloaded in the dependencies section.
-       The overloads and this property below have to be removed at next gridsuite-dependencies.version upgrade -->
-        <filter.version>1.0.14</filter.version>
     </properties>
 
     <build>
@@ -96,24 +91,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-client</artifactId>
-                <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
-                <version>${powsybl-network-store.version}</version>
-            </dependency>
-            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-iidm-impl</artifactId>
-                <version>${powsybl-network-store.version}</version>
-            </dependency>
-            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
-            <dependency>
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-network-store-model</artifactId>
-                <version>${powsybl-network-store.version}</version>
-            </dependency>
 
             <!-- imports -->
             <dependency>
@@ -138,7 +115,6 @@
         <dependency>
             <groupId>org.gridsuite</groupId>
             <artifactId>gridsuite-filter</artifactId>
-            <version>${filter.version}</version>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>

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);

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 :")

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> identifiableAttributes) {
         IdentifiableType identifiableType = modificationInfos.getEquipmentType();
         if (CONNECTABLE_TYPES.contains(identifiableType)) {

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";
+    }
 }

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";
+    }
 }

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";
+    }
 }

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)) {

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<String> shuntCompensatorIds = List.of();

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<String, List<Generator>> getGeneratorsByRegion(Network network, Component component) {
         // get all connected generators  that are inside the synchronous component and the substationIds associated.
         List<Generator> connectedGenerators = network.getGeneratorStream()

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);

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 :")

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";
+    }
 }

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";
+    }
 }

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";
+    }
 }

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();
 

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");

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";
+    }
 }

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";
+    }
 }

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()

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 :")

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";
+    }
 }

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();

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()

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<Integer> maximumSectionCountModif,
                                                  AttributeModification<Double> maxSusceptance,
                                                  AttributeModification<Double> maxQAtNominalV,

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);

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";
+    }
 }

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";
+    }
 }

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";
+    }
 }

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,

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);
 

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);