fix bug related to adder feeder with null value

gridsuite · Oct 17, 2024 · ece8753 · ece8753
1 parent 5a802ba
commit ece8753
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
@@ -666,13 +666,11 @@ private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
                                                List<ReportNode> reports,
                                                boolean isBranch) {
         if (isBranch) {
-            ConnectablePositionAdder.FeederAdder<?> feederAdder1 = adder.newFeeder1();
-            ConnectablePositionAdder.FeederAdder<?> feederAdder2 = adder.newFeeder2();
-            addConnectablePosition(adder, feederAdder1, modificationInfos, network, reports, 1);
-            addConnectablePosition(adder, feederAdder2, modificationInfos, network, reports, 2);
+            addConnectablePosition(adder, modificationInfos, network, reports, 1);
+            addConnectablePosition(adder, modificationInfos, network, reports, 2);
         } else {
             ConnectablePositionAdder.FeederAdder<?> feederAdder = adder.newFeeder();
-            addConnectablePosition(adder, feederAdder, modificationInfos, network, reports, 0);
+            addConnectablePosition(adder, modificationInfos, network, reports, 0);
         }
     }
 
@@ -711,7 +709,6 @@ private void applyModifications(ConnectablePosition.Feeder feeder,
     }
 
     private void addConnectablePosition(ConnectablePositionAdder<?> adder,
-                                        ConnectablePositionAdder.FeederAdder<?> feeder,
                                         BasicEquipmentModificationInfos modificationInfos,
                                         Network network,
                                         List<ReportNode> reports,
@@ -726,7 +723,15 @@ private void addConnectablePosition(ConnectablePositionAdder<?> adder,
         AttributeModification<String> voltageLevelId = getVoltageLevelId(modificationInfos, feederNumber);
         AttributeModification<String> busOrBusbarSectionId = getBusOrBusbarSectionId(modificationInfos, feederNumber);
         int position = getPosition(connectionPosition, busOrBusbarSectionId, voltageLevelId, equipmentId, feederNumber, network);
-
+        ConnectablePositionAdder.FeederAdder<?> feeder;
+        switch (feederNumber) {
+            case 0 -> feeder = adder.newFeeder();
+            case 1 -> feeder = adder.newFeeder1();
+            case 2 -> feeder = adder.newFeeder2();
+            default -> {
+                return;
+            }
+        }
         ReportNode connectionNameReport = applyConnectablePositionAttribute(
                 feeder::withName, connectionName, equipmentId, reports,
                 getConnectionNameField(feederNumber), connectionDirection, connectionPosition