Migrate to PowSyBl 2023.2.1 (#269)

Signed-off-by: Slimane AMAR <[email protected]>

Author: SlimaneAmar

pom.xml

@@ -44,7 +44,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>24</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>25</gridsuite-dependencies.version>
         <db-util.version>1.0.5</db-util.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <log4j2-mock-version>0.0.2</log4j2-mock-version>

src/main/java/org/gridsuite/modification/server/modifications/BranchStatusModification.java

@@ -21,6 +21,7 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_NOT_FOUND;
 import static org.gridsuite.modification.server.NetworkModificationException.Type.BRANCH_ACTION_ERROR;
@@ -144,15 +145,15 @@ private void applyEnergiseBranchEnd(Reporter subReporter, Branch<?> branch, Stri
     }
 
     private boolean disconnectAllTerminals(Branch<?> branch) {
-        return branch.getTerminals().stream().allMatch(this::disconnectOneTerminal);
+        return Stream.of(branch.getTerminal1(), branch.getTerminal2()).allMatch(this::disconnectOneTerminal);
     }
 
     private boolean disconnectOneTerminal(Terminal terminal) {
         return !terminal.isConnected() || terminal.disconnect();
     }
 
     private boolean connectAllTerminals(Branch<?> branch) {
-        return branch.getTerminals().stream().allMatch(this::connectOneTerminal);
+        return Stream.of(branch.getTerminal1(), branch.getTerminal2()).allMatch(this::connectOneTerminal);
     }
 
     private boolean connectOneTerminal(Terminal terminal) {

src/test/java/org/gridsuite/modification/server/modifications/LinesAttachToSplitLinesTest.java

@@ -43,7 +43,7 @@ protected ModificationInfos buildModification() {
                 .lineToAttachTo2Id("l2")
                 .attachedLineId("l3")
                 .voltageLevelId("v4")
-                .bbsBusId("bbs2")
+                .bbsBusId("bbs4")
                 .replacingLine1Id("nl1")
                 .replacingLine1Name("NewLine1")
                 .replacingLine2Id("nl2")