Merge branch 'main' into desactivate_modification

gridsuite · Sep 18, 2024 · 92fc203 · 92fc203
2 parents f5141d8 + e9fad04
commit 92fc203
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -131,19 +131,19 @@
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-client</artifactId>
             <!-- FIXME: network-store modules' version is overloaded in the dependencies section. The overloads and this property below have to be removed at next gridsuite-dependencies.version upgrade -->
-            <version>1.16.0</version>
+            <version>1.17.1</version>
         </dependency>
         <!-- FIXME: network-store modules' version is overloaded in the dependencies section. This section have to be removed at next gridsuite-dependencies.version upgrade -->
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-iidm-impl</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.1</version>
         </dependency>
         <!-- FIXME: network-store modules' version is overloaded in the dependencies section. This section have to be removed at next gridsuite-dependencies.version upgrade -->
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-model</artifactId>
-            <version>1.16.0</version>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
@@ -684,8 +684,9 @@ private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
             reports.add(connectionPositionReport);
         }
 
-        // Finalize by adding the feeder
-        adder.add();
+        if (connectionNameReport != null || connectionDirectionReport != null || connectionPositionReport != null) {
+            adder.add();
+        }
     }
 
     public void modifyInjectionConnection(InjectionModificationInfos modificationInfos, Injection<?> injection, List<ReportNode> subReportNode) {

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java b/src/main/java/org/gridsuite/modification/server/modifications/VscCreation.java
@@ -175,16 +175,15 @@ private VscConverterStation createConverterStation(Network network,
                                                        ConverterStationCreationInfos converterStationCreationInfos,
                                                        ReportNode subReportNode,
                                                        String logFieldName) {
-        ReportNode converterStationReporter = subReportNode.newReportNode().withMessageTemplate("converterStationCreationContainer" + logFieldName, logFieldName).add();
+        ReportNode converterStationReporter = subReportNode.newReportNode()
+            .withMessageTemplate("converterStationCreated", "${fieldName} with id=${id} created")
+            .withUntypedValue("fieldName", logFieldName)
+            .withUntypedValue("id", converterStationCreationInfos.getEquipmentId())
+            .add();
         VoltageLevel voltageLevel = ModificationUtils.getInstance().getVoltageLevel(network, converterStationCreationInfos.getVoltageLevelId());
         VscConverterStation vscConverterStation = voltageLevel.getTopologyKind() == TopologyKind.NODE_BREAKER ?
                 createConverterStationInNodeBreaker(network, voltageLevel, converterStationCreationInfos, converterStationReporter) :
                 createConverterStationInBusBreaker(voltageLevel, converterStationCreationInfos, converterStationReporter);
-        converterStationReporter.newReportNode()
-                .withMessageTemplate("converterStationCreationLog" + logFieldName, "New converter station with id=${id} created")
-                .withUntypedValue("id", converterStationCreationInfos.getEquipmentId())
-                .withSeverity(TypedValue.INFO_SEVERITY)
-                .add();
 
         if (!converterStationCreationInfos.isTerminalConnected()) {
             vscConverterStation.getTerminal().disconnect();