Upgrade to powsybl-dependencies v2025.0.1

pom.xml

@@ -42,7 +42,8 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>37.0.0</gridsuite-dependencies.version>
+        <powsybl-ws-dependencies.version>2.21.0</powsybl-ws-dependencies.version>
+        <gridsuite-filter.version>1.4.0</gridsuite-filter.version>
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification</sonar.projectKey>
     </properties>
@@ -66,11 +67,10 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- imports -->
             <dependency>
-                <groupId>org.gridsuite</groupId>
-                <artifactId>gridsuite-dependencies</artifactId>
-                <version>${gridsuite-dependencies.version}</version>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-ws-dependencies</artifactId>
+                <version>${powsybl-ws-dependencies.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -82,6 +82,7 @@
         <dependency>
             <groupId>org.gridsuite</groupId>
             <artifactId>gridsuite-filter</artifactId>
+            <version>${gridsuite-filter.version}</version>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>

src/main/java/org/gridsuite/modification/dto/BatteryCreationInfos.java

@@ -14,7 +14,6 @@
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.modifications.AbstractModification;
 import org.gridsuite.modification.modifications.BatteryCreation;
@@ -72,6 +71,6 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.BATTERY_CREATION.name(), "Battery creation ${batteryId}").withUntypedValue("batteryId", this.getEquipmentId()).add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.batteryCreation").withUntypedValue("batteryId", this.getEquipmentId()).add();
     }
 }

src/main/java/org/gridsuite/modification/dto/BatteryModificationInfos.java

@@ -70,6 +70,9 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(getType().name(), "Battery modification ${batteryId}").withUntypedValue("batteryId", this.getEquipmentId()).add();
+        return reportNode.newReportNode()
+                .withMessageTemplate("network.modification.battery.modification")
+                .withUntypedValue("batteryId", this.getEquipmentId())
+                .add();
     }
 }

src/main/java/org/gridsuite/modification/dto/ByFilterDeletionInfos.java

@@ -50,7 +50,7 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(getType().name(), "By filter deletion").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.byFilter.deletion").add();
     }
 
     @Override

src/main/java/org/gridsuite/modification/dto/ByFormulaModificationInfos.java

@@ -17,7 +17,6 @@
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.dto.byfilter.formula.FormulaInfos;
 import org.gridsuite.modification.modifications.byfilter.ByFormulaModification;
@@ -51,6 +50,6 @@ public ByFormulaModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.BY_FORMULA_MODIFICATION.name(), "Modification by formula").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.byFormulaModification").add();
     }
 }

src/main/java/org/gridsuite/modification/dto/DeleteAttachingLineInfos.java

@@ -58,7 +58,7 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(getType().name(), "Delete attaching line").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.deleteAttachingLine").add();
     }
 
     @Override

src/main/java/org/gridsuite/modification/dto/DeleteVoltageLevelOnLineInfos.java

@@ -52,7 +52,7 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(getType().name(), "Delete voltage level on line").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.deleteVoltageLevelOnLine").add();
     }
 
     @Override

src/main/java/org/gridsuite/modification/dto/EquipmentAttributeModificationInfos.java

@@ -8,7 +8,6 @@
 
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.powsybl.commons.report.ReportNode;
-import com.powsybl.commons.report.TypedValue;
 import com.powsybl.iidm.network.IdentifiableType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
@@ -59,9 +58,9 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "${EquipmentType} '${EquipmentId}' change")
-                .withTypedValue("EquipmentType", equipmentType.name(), TypedValue.UNTYPED)
-                .withTypedValue("EquipmentId", getEquipmentId(), TypedValue.UNTYPED)
+                .withMessageTemplate("network.modification.equipmentAttributeModification")
+                .withUntypedValue("EquipmentType", equipmentType.name())
+                .withUntypedValue("EquipmentId", getEquipmentId())
                 .add();
     }
 

src/main/java/org/gridsuite/modification/dto/EquipmentDeletionInfos.java

@@ -48,7 +48,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Equipment deletion ${equipmentId}")
+                .withMessageTemplate("network.modification.equipmentDeletion")
                 .withUntypedValue("equipmentId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/GenerationDispatchInfos.java

@@ -57,7 +57,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Generation dispatch")
+                .withMessageTemplate("network.modification.generationDispatch")
                 .add();
     }
 }

src/main/java/org/gridsuite/modification/dto/GeneratorCreationInfos.java

@@ -119,7 +119,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Generator creation ${generatorId}")
+                .withMessageTemplate("network.modification.generator.creation")
                 .withUntypedValue("generatorId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/GeneratorModificationInfos.java

@@ -121,7 +121,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Generator modification ${generatorId}")
+                .withMessageTemplate("network.modification.generator.modification")
                 .withUntypedValue("generatorId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/GeneratorScalingInfos.java

@@ -39,7 +39,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Generator scaling")
+                .withMessageTemplate("network.modification.generatorScaling")
                 .add();
     }
 }

src/main/java/org/gridsuite/modification/dto/GroovyScriptInfos.java

@@ -41,7 +41,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Apply groovy script")
+                .withMessageTemplate("network.modification.groovyScript")
                 .add();
     }
 }

src/main/java/org/gridsuite/modification/dto/LccCreationInfos.java

@@ -62,7 +62,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Lcc creation ${lccId}")
+                .withMessageTemplate("network.modification.lcc.creation")
                 .withUntypedValue("lccId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java

@@ -73,7 +73,7 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(getType().name(), "Line attach to voltage level").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.lineAttachToVoltageLevel").add();
     }
 
     @Override

src/main/java/org/gridsuite/modification/dto/LineCreationInfos.java

@@ -53,7 +53,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Creation of line ${lineId}")
+                .withMessageTemplate("network.modification.lineCreation")
                 .withUntypedValue("lineId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/LineModificationInfos.java

@@ -53,7 +53,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Line modification ${lineId}")
+                .withMessageTemplate("network.modification.line.modification")
                 .withUntypedValue("lineId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/LineSplitWithVoltageLevelInfos.java

@@ -67,7 +67,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Line split with voltage level")
+                .withMessageTemplate("network.modification.lineSplitWithVoltageLevel")
                 .add();
     }
 

src/main/java/org/gridsuite/modification/dto/LinesAttachToSplitLinesInfos.java

@@ -66,7 +66,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Lines attach to split lines")
+                .withMessageTemplate("network.modification.linesAttachToSplitLines")
                 .add();
     }
 

src/main/java/org/gridsuite/modification/dto/LoadCreationInfos.java

@@ -49,7 +49,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Load creation ${loadId}")
+                .withMessageTemplate("network.modification.load.creation")
                 .withUntypedValue("loadId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/LoadModificationInfos.java

@@ -48,7 +48,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Load modification ${loadId}")
+                .withMessageTemplate("network.modification.load.modification")
                 .withUntypedValue("loadId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/LoadScalingInfos.java

@@ -39,7 +39,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Load Scaling")
+                .withMessageTemplate("network.modification.loadScaling")
                 .add();
     }
 }

src/main/java/org/gridsuite/modification/dto/ModificationByAssignmentInfos.java

@@ -16,7 +16,6 @@
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
-import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.dto.byfilter.assignment.AssignmentInfos;
 import org.gridsuite.modification.modifications.byfilter.ModificationByAssignment;
@@ -48,6 +47,6 @@ public ModificationByAssignment toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.MODIFICATION_BY_ASSIGNMENT.name(), "Modification by filter").add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.modificationByAssignment").add();
     }
 }

src/main/java/org/gridsuite/modification/dto/OperatingStatusModificationInfos.java

@@ -56,13 +56,17 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        String defaultName = switch (action) {
-            case LOCKOUT -> "Lockout ${equipmentId}";
-            case TRIP -> "Trip ${equipmentId}";
-            case ENERGISE_END_ONE, ENERGISE_END_TWO -> "Energise ${equipmentId}";
-            case SWITCH_ON -> "Switch on ${equipmentId}";
+        String messageKey = switch (action) {
+            case LOCKOUT -> "network.modification.OPERATING_STATUS_MODIFICATION_LOCKOUT";
+            case TRIP -> "network.modification.OPERATING_STATUS_MODIFICATION_TRIP";
+            case ENERGISE_END_ONE -> "network.modification.OPERATING_STATUS_MODIFICATION_ENERGISE_END_ONE";
+            case ENERGISE_END_TWO -> "network.modification.OPERATING_STATUS_MODIFICATION_ENERGISE_END_TWO";
+            case SWITCH_ON -> "network.modification.OPERATING_STATUS_MODIFICATION_SWITCH_ON";
         };
-        return reportNode.newReportNode().withMessageTemplate(getType().name() + "_" + action, defaultName).withUntypedValue("equipmentId", this.getEquipmentId()).add();
+        return reportNode.newReportNode()
+                .withMessageTemplate(messageKey)
+                .withUntypedValue("equipmentId", this.getEquipmentId())
+                .add();
     }
 
     @Override

src/main/java/org/gridsuite/modification/dto/ShuntCompensatorCreationInfos.java

@@ -55,7 +55,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Shunt compensator creation ${shuntCompensatorId}")
+                .withMessageTemplate("network.modification.shuntCompensatorCreation")
                 .withUntypedValue("shuntCompensatorId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/ShuntCompensatorModificationInfos.java

@@ -57,7 +57,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Shunt compensator modification ${shuntCompensatorId}")
+                .withMessageTemplate("network.modification.shuntCompensatorModification.modification")
                 .withUntypedValue("shuntCompensatorId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/StaticVarCompensatorCreationInfos.java

@@ -16,7 +16,6 @@
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
-import org.gridsuite.modification.ModificationType;
 import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName;
 import org.gridsuite.modification.modifications.AbstractModification;
 import org.gridsuite.modification.modifications.StaticVarCompensatorCreation;
@@ -98,7 +97,6 @@ public AbstractModification toModification() {
 
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
-        return reportNode.newReportNode().withMessageTemplate(ModificationType.STATIC_VAR_COMPENSATOR_CREATION.name(),
-                "Static var compensator creation ${id}").withUntypedValue("id", this.getEquipmentId()).add();
+        return reportNode.newReportNode().withMessageTemplate("network.modification.staticVarCompensatorCreation").withUntypedValue("id", this.getEquipmentId()).add();
     }
 }

src/main/java/org/gridsuite/modification/dto/SubstationCreationInfos.java

@@ -45,7 +45,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Substation creation ${substationId}")
+                .withMessageTemplate("network.modification.substation.creation")
                 .withUntypedValue("substationId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/SubstationModificationInfos.java

@@ -45,7 +45,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Substation modification ${substationId}")
+                .withMessageTemplate("network.modification.substation.modification")
                 .withUntypedValue("substationId", this.getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/TabularCreationInfos.java

@@ -52,7 +52,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(ModificationType.TABULAR_CREATION.name(), "Tabular creation")
+                .withMessageTemplate("network.modification.tabularCreation")
                 .add();
     }
 

src/main/java/org/gridsuite/modification/dto/TabularModificationInfos.java

@@ -50,7 +50,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(ModificationType.TABULAR_CREATION.name(), "Tabular modification")
+                .withMessageTemplate("network.modification.tabularModification")
                 .add();
     }
 

src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerCreationInfos.java

@@ -62,7 +62,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Two windings transformer creation ${twoWindingsTransformerId}")
+                .withMessageTemplate("network.modification.twoWindingsTransformerCreation")
                 .withUntypedValue("twoWindingsTransformerId", getEquipmentId())
                 .add();
     }

src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerModificationInfos.java

@@ -66,7 +66,7 @@ public AbstractModification toModification() {
     @Override
     public ReportNode createSubReportNode(ReportNode reportNode) {
         return reportNode.newReportNode()
-                .withMessageTemplate(getType().name(), "Two windings transformer modification ${twoWindingsTransformerId}")
+                .withMessageTemplate("network.modification.twoWindingsTransformerModification.modification")
                 .withUntypedValue("twoWindingsTransformerId", getEquipmentId())
                 .add();
     }