terminal adder take voltagelevel topology into account to give the correct error message

Signed-off-by: Giovanni Ferrari <giovanni.ferrari@soft.it>

Author: quinarygio

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractAcDcConverterAdder.java

@@ -90,6 +90,7 @@ public T setConnectableBus1(String connectableBus1) {
 
     protected TerminalExt checkAndGetTerminal1() {
         return new TerminalBuilder(voltageLevel.getNetworkRef(), this, null, TerminalNumber.ONE)
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node1)
                 .setBus(bus1)
                 .setConnectableBus(connectableBus1)
@@ -114,6 +115,7 @@ public T setConnectableBus2(String connectableBus2) {
     protected Optional<TerminalExt> checkAndGetTerminal2() {
         if (hasTwoAcTerminals()) {
             return Optional.of(new TerminalBuilder(voltageLevel.getNetworkRef(), this, null, TerminalNumber.TWO)
+                    .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                     .setNode(node2)
                     .setBus(bus2)
                     .setConnectableBus(connectableBus2)

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractBranchAdder.java

@@ -55,6 +55,7 @@ public T setVoltageLevel1(String voltageLevelId1) {
     protected TerminalExt checkAndGetTerminal1() {
         VoltageLevelExt voltageLevel = checkAndGetVoltageLevel1();
         return new TerminalBuilder(voltageLevel.getNetworkRef(), this, ThreeSides.ONE, null)
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node1)
                 .setBus(bus1)
                 .setConnectableBus(connectableBus1)
@@ -100,6 +101,7 @@ public T setVoltageLevel2(String voltageLevelId2) {
     protected TerminalExt checkAndGetTerminal2() {
         VoltageLevelExt voltageLevel = checkAndGetVoltageLevel2();
         return new TerminalBuilder(voltageLevel.getNetworkRef(), this, ThreeSides.TWO, null)
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node2)
                 .setBus(bus2)
                 .setConnectableBus(connectableBus2)

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractConnectable.java

@@ -148,6 +148,7 @@ protected void move(TerminalExt oldTerminal, int node, String voltageLevelId) {
 
         // create the new terminal and attach it to the given voltage level and to the connectable
         TerminalExt terminalExt = new TerminalBuilder(voltageLevel.getNetworkRef(), this, oldTerminal.getSide(), oldTerminal.getTerminalNumber())
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node)
                 .build();
 
@@ -170,6 +171,7 @@ protected void move(TerminalExt oldTerminal, String busId, boolean connected) {
 
         // create the new terminal and attach it to the voltage level of the given bus and links it to the connectable
         TerminalExt terminalExt = new TerminalBuilder(((VoltageLevelExt) bus.getVoltageLevel()).getNetworkRef(), this, oldTerminal.getSide(), oldTerminal.getTerminalNumber())
+                .setVoltageLevelTopology(((VoltageLevelExt) bus.getVoltageLevel()).getTopologyKind())
                 .setBus(connected ? bus.getId() : null)
                 .setConnectableBus(bus.getId())
                 .build();

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/AbstractInjectionAdder.java

@@ -49,6 +49,7 @@ protected Ref<NetworkImpl> getNetworkRef() {
 
     protected TerminalExt checkAndGetTerminal() {
         return new TerminalBuilder(getNetworkRef(), this, null, null)
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node)
                 .setBus(bus)
                 .setConnectableBus(connectableBus)

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/TerminalBuilder.java

@@ -12,6 +12,7 @@
 import com.powsybl.commons.ref.Ref;
 import com.powsybl.iidm.network.Validable;
 import com.powsybl.iidm.network.ValidationException;
+import com.powsybl.iidm.network.TopologyKind;
 
 import java.util.Objects;
 
@@ -29,6 +30,8 @@ class TerminalBuilder {
 
     private final TerminalNumber terminalNumber;
 
+    private TopologyKind topologyKind;
+
     private Integer node;
 
     private String bus;
@@ -42,6 +45,11 @@ class TerminalBuilder {
         this.terminalNumber = terminalNumber;
     }
 
+    TerminalBuilder setVoltageLevelTopology(TopologyKind topologyKind) {
+        this.topologyKind = topologyKind;
+        return this;
+    }
+
     TerminalBuilder setBus(String bus) {
         this.bus = bus;
         return this;
@@ -65,14 +73,14 @@ TerminalExt build() {
         }
 
         if (node == null) {
+            if (topologyKind == TopologyKind.NODE_BREAKER) {
+                throw new ValidationException(validable, "node is not set");
+            }
             if (connectionBus == null) {
                 throw new ValidationException(validable, "connectable bus is not set");
             }
-
-            return new BusTerminal(network, side, terminalNumber, connectionBus, bus != null);
-        } else {
-            return new NodeTerminal(network, side, terminalNumber, node);
         }
+        return new NodeTerminal(network, side, terminalNumber, node);
     }
 
     private String getConnectionBus() {

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/ThreeWindingsTransformerAdderImpl.java

@@ -122,6 +122,7 @@ protected void checkParams() {
         protected TerminalExt checkAndGetTerminal() {
             VoltageLevelExt voltageLevel = checkAndGetVoltageLevel();
             return new TerminalBuilder(voltageLevel.getNetworkRef(), this, side, null)
+                .setVoltageLevelTopology(voltageLevel.getTopologyKind())
                 .setNode(node)
                 .setBus(bus)
                 .setConnectableBus(connectableBus)

iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/VoltageLevelImpl.java

@@ -706,6 +706,7 @@ record TopologyModelInfos(TerminalExt terminal, String connectableBusId, boolean
 
             // create the new terminal with new type
             TerminalExt newTerminalExt = new TerminalBuilder(networkRef, this, oldTerminalExt.getSide(), oldTerminalExt.getTerminalNumber())
+                    .setVoltageLevelTopology(getTopologyKind())
                     .setBus(infos.connected ? infos.connectableBusId() : null)
                     .setConnectableBus(infos.connectableBusId())
                     .build();