Revert using specific NamingStrategy for CreateVoltageLevelSection and CreateVoltageLevelTopology (#129)

Signed-off-by: Etienne Homer <[email protected]>

Author: etiennehomer

src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelSection.java

@@ -11,8 +11,6 @@
 import com.powsybl.commons.report.TypedValue;
 import com.powsybl.iidm.modification.topology.CreateVoltageLevelSections;
 import com.powsybl.iidm.modification.topology.CreateVoltageLevelSectionsBuilder;
-import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
-import com.powsybl.iidm.modification.topology.NamingStrategy;
 import com.powsybl.iidm.network.BusbarSection;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.SwitchKind;
@@ -68,11 +66,6 @@ public void check(Network network) throws NetworkModificationException {
 
     @Override
     public void apply(Network network, ReportNode subReportNode) {
-        apply(network, new DefaultNamingStrategy(), subReportNode);
-    }
-
-    @Override
-    public void apply(Network network, NamingStrategy namingStrategy, ReportNode subReportNode) {
         VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getVoltageLevelId());
         BusbarSection busbarSection = network.getBusbarSection(modificationInfos.getBusbarSectionId());
         List<String> busBarIds = new ArrayList<>();
@@ -89,7 +82,7 @@ public void apply(Network network, NamingStrategy namingStrategy, ReportNode sub
                 .withSwitchPrefixId(voltageLevel.getId())
                 .withBusbarSectionPrefixId(voltageLevel.getId())
                 .build();
-        modification.apply(network, namingStrategy, true, subReportNode);
+        modification.apply(network, true, subReportNode);
 
         if (modificationInfos.isAllBusbars()) {
             List<BusbarSection> newBusbarSections = new ArrayList<>();

src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java

@@ -8,8 +8,6 @@
 
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.report.ReportNode;
-import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
-import com.powsybl.iidm.modification.topology.NamingStrategy;
 import com.powsybl.iidm.network.BusbarSection;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.VoltageLevel;
@@ -55,16 +53,11 @@ public void check(Network network) {
 
     @Override
     public void apply(Network network, ReportNode subReportNode) {
-        apply(network, new DefaultNamingStrategy(), subReportNode);
-    }
-
-    @Override
-    public void apply(Network network, NamingStrategy namingStrategy, ReportNode subReportNode) {
         VoltageLevel voltageLevel = network.getVoltageLevel(createVoltageLevelTopologyInfos.getVoltageLevelId());
-        createVoltageLevelBusBarSection(network, namingStrategy, subReportNode, voltageLevel);
+        createVoltageLevelBusBarSection(network, subReportNode, voltageLevel);
     }
 
-    private void createVoltageLevelBusBarSection(Network network, NamingStrategy namingStrategy, ReportNode subReportNode, VoltageLevel voltageLevel) {
+    private void createVoltageLevelBusBarSection(Network network, ReportNode subReportNode, VoltageLevel voltageLevel) {
         int lowBusOrBusbarIndex = findLowBusOrBusbarIndex(voltageLevel);
         new com.powsybl.iidm.modification.topology.CreateVoltageLevelTopologyBuilder()
             .withVoltageLevelId(createVoltageLevelTopologyInfos.getVoltageLevelId())
@@ -73,7 +66,7 @@ private void createVoltageLevelBusBarSection(Network network, NamingStrategy nam
             .withLowBusOrBusbarIndex(lowBusOrBusbarIndex)
             .withSwitchKinds(createVoltageLevelTopologyInfos.getSwitchKinds())
             .withConnectExistingConnectables(true)
-            .build().apply(network, namingStrategy, true, subReportNode);
+            .build().apply(network, true, subReportNode);
     }
 
     private int findLowBusOrBusbarIndex(VoltageLevel voltageLevel) {

src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelSectionTest.java

@@ -16,9 +16,7 @@
 import org.gridsuite.modification.dto.CreateVoltageLevelSectionInfos;
 import org.gridsuite.modification.dto.ModificationInfos;
 import org.gridsuite.modification.report.NetworkModificationReportResourceBundle;
-import org.gridsuite.modification.utils.DummyNamingStrategy;
 import org.gridsuite.modification.utils.NetworkWithTeePoint;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
@@ -144,30 +142,4 @@ void testCreateModificationWithAllBusbars() {
         assertTrue(busBarIds.containsAll(List.of("bbs1", "bbs2", "bbs3", "bbs4", "bbs1_2", "v1_0_1", "v1_1_1")));
     }
 
-    @Test
-    void testApplyWithNamingStrategy() {
-        Network network = getNetwork();
-        VoltageLevel voltageLevel = network.getVoltageLevel("v1");
-        var bbs = voltageLevel.getNodeBreakerView().newBusbarSection()
-                .setId("bbs1_2")
-                .setName("bbs1_2")
-                .setNode(1)
-                .add();
-        bbs.newExtension(BusbarSectionPositionAdder.class).withBusbarIndex(1).withSectionIndex(0).add();
-
-        ReportNode report = ReportNode.newRootReportNode()
-                .withMessageTemplate("test")
-                .build();
-        CreateVoltageLevelSectionInfos.builder()
-                .stashed(false)
-                .voltageLevelId("v1")
-                .busbarSectionId("bbs1_2")
-                .busbarIndex(2)
-                .isAfterBusbarSectionId(true)
-                .leftSwitchKind("BREAKER")
-                .rightSwitchKind("DISCONNECTOR")
-                .isAllBusbars(false)
-                .build().toModification().apply(network, new DummyNamingStrategy(), report);
-        Assertions.assertNotNull(network.getSwitch("DISCONNECTOR_1_7"));
-    }
 }

src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java

@@ -7,17 +7,14 @@
 package org.gridsuite.modification.modifications;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.powsybl.commons.report.ReportNode;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.Switch;
 import com.powsybl.iidm.network.SwitchKind;
 import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.CreateVoltageLevelTopologyInfos;
 import org.gridsuite.modification.dto.ModificationInfos;
-import org.gridsuite.modification.utils.DummyNamingStrategy;
 import org.gridsuite.modification.utils.NetworkWithTeePoint;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -83,18 +80,4 @@ protected void testCreationModificationMessage(ModificationInfos modificationInf
         assertEquals("v1", updatedValues.get("voltageLevelId"));
     }
 
-    @Test
-    void testApplyWithNamingStrategy() {
-        Network network = getNetwork();
-        ReportNode report = ReportNode.newRootReportNode()
-                .withMessageTemplate("test")
-                .build();
-        CreateVoltageLevelTopologyInfos.builder()
-                .stashed(false)
-                .voltageLevelId("v1")
-                .sectionCount(3)
-                .switchKinds(List.of(SwitchKind.BREAKER, SwitchKind.DISCONNECTOR))
-                .build().toModification().apply(network, new DummyNamingStrategy(), report);
-        Assertions.assertNotNull(network.getBusbarSection("BUSBAR_1_1"));
-    }
 }