Merge pull request #86 from com-pas/develop

Dennis Labordus · web-flow · commit c5e27e7efd02 · 2022-05-02T08:49:15.000+02:00
New release
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -38,7 +38,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v3.2.0
         with:
           distribution: 'zulu'
           java-version: '11'
diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -42,7 +42,7 @@ jobs:
         # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v3.2.0
         with:
           distribution: 'zulu'
           java-version: '11'
diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v3.0.0
+        uses: actions/setup-java@v3.2.0
         with:
           distribution: 'zulu'
           java-version: '11'
diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java
@@ -13,7 +13,9 @@
  * Create Beans from other dependencies that are used in the application.
  */
 @RegisterForReflection(targets = {com.powsybl.sld.library.Components.class,
-        com.powsybl.sld.library.Component.class})
+        com.powsybl.sld.library.Component.class,
+        org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
+        org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class})
 public class CompasSclAutoAlignmentConfiguration {
     @Produces
     @ApplicationScoped
diff --git a/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java b/app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java
@@ -44,7 +44,7 @@ public SclAutoAlignmentResource(SclAutoAlignmentService compasCimMappingService)
     @POST
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    public SclAutoAlignResponse updateSCL(@Valid SclAutoAlignRequest request) {
+    public SclAutoAlignResponse alignment(@Valid SclAutoAlignRequest request) {
         String who = jsonWebToken.getClaim(userInfoProperties.who());
         LOGGER.trace("Username used for Who {}", who);
 
@@ -57,7 +57,7 @@ public SclAutoAlignResponse updateSCL(@Valid SclAutoAlignRequest request) {
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_SVG_XML)
     @Path("/svg")
-    public String getSVG(@Valid SclAutoAlignSVGRequest request) {
+    public String svg(@Valid SclAutoAlignSVGRequest request) {
         return sclAutoAlignmentService.getSVG(request.getSclData(), request.getSubstationName());
     }
 }
diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties
@@ -5,7 +5,7 @@
 compas.userinfo.who.claimname     = ${USERINFO_WHO_CLAIMNAME:name}
 
 quarkus.http.cors                 = false
-quarkus.http.root-path            = /compas-scl-auto-alignment/
+quarkus.http.root-path            = /compas-scl-auto-alignment
 quarkus.http.limits.max-body-size = 150M
 
 quarkus.log.level = INFO
diff --git a/pom.xml b/pom.xml
@@ -21,14 +21,14 @@ SPDX-License-Identifier: Apache-2.0
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <compiler-plugin.version>3.10.1</compiler-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M6</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
         <compas.core.version>0.8.0</compas.core.version>
 
-        <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
+        <quarkus.platform.version>2.8.2.Final</quarkus.platform.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <powsybl.sld.version>2.9.1</powsybl.sld.version>
+        <powsybl.sld.version>2.10.0</powsybl.sld.version>
         <gson.version>2.9.0</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
@@ -162,7 +162,7 @@ SPDX-License-Identifier: Apache-2.0
                 <sonar.language>java</sonar.language>
 
                 <!-- JaCoCo Properties -->
-                <jacoco.version>0.8.7</jacoco.version>
+                <jacoco.version>0.8.8</jacoco.version>
                 <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                 <sonar.coverage.jacoco.xmlReportPaths>
                     target/site/jacoco/jacoco.xml,
@@ -230,7 +230,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>3.3.2</version>
+                            <version>3.4.0</version>
                             <executions>
                                 <execution>
                                     <id>attach-javadocs</id>
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/AbstractGraphBuilder.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/AbstractGraphBuilder.java
@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.builder;
 
-import com.powsybl.sld.model.BaseGraph;
-import com.powsybl.sld.model.Node;
+
+import com.powsybl.sld.model.graphs.BaseGraph;
+import com.powsybl.sld.model.nodes.Node;
 
 import java.util.Map;
 
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java
@@ -3,7 +3,11 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.builder;
 
-import com.powsybl.sld.model.*;
+import com.powsybl.sld.model.graphs.NodeFactory;
+import com.powsybl.sld.model.graphs.SubstationGraph;
+import com.powsybl.sld.model.nodes.Feeder2WTLegNode;
+import com.powsybl.sld.model.nodes.Feeder3WTLegNode;
+import com.powsybl.sld.model.nodes.Node;
 import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException;
 import org.lfenergy.compas.scl.auto.alignment.model.*;
 
@@ -38,7 +42,7 @@ private void createSubstation() {
     }
 
     private void createVoltageLevelGraph(GenericVoltageLevel voltageLevel) {
-        var voltageLevelBuilder = new VoltageLevelGraphBuilder(voltageLevel, substation, getPath2Node());
+        var voltageLevelBuilder = new VoltageLevelGraphBuilder(voltageLevel, substation, getPath2Node(), getGraph());
         getGraph().addVoltageLevel(voltageLevelBuilder.getGraph());
         voltageLevelGraphBuilderMap.put(voltageLevel.getFullName(), voltageLevelBuilder);
     }
@@ -63,9 +67,9 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
         if (powerTransformer.isFeeder2WT()) {
             var tws = powerTransformer.getTransformerWindings();
             getGraph().addMultiTermNode(
-                    Middle2WTNode.create(powerTransformer.getFullName(),
+                    NodeFactory.createMiddle2WTNode(getGraph(),
+                            powerTransformer.getFullName(),
                             powerTransformer.getFullName(),
-                            getGraph(),
                             getFeeder2WTLegNode(tws.get(0)),
                             getFeeder2WTLegNode(tws.get(1)),
                             getVoltageLevelBuilder(tws.get(0)).getGraph().getVoltageLevelInfos(),
@@ -74,16 +78,12 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
         } else if (powerTransformer.isFeeder3WT()) {
             var tws = powerTransformer.getTransformerWindings();
             getGraph().addMultiTermNode(
-                    Middle3WTNode.create(powerTransformer.getFullName(),
+                    NodeFactory.createMiddle3WTNode(getGraph(),
+                            powerTransformer.getFullName(),
                             powerTransformer.getFullName(),
-                            getGraph(),
                             getFeeder3WTLegNode(tws.get(0)),
                             getFeeder3WTLegNode(tws.get(1)),
-                            getFeeder3WTLegNode(tws.get(2)),
-                            getVoltageLevelBuilder(tws.get(0)).getGraph().getVoltageLevelInfos(),
-                            getVoltageLevelBuilder(tws.get(1)).getGraph().getVoltageLevelInfos(),
-                            getVoltageLevelBuilder(tws.get(2)).getGraph().getVoltageLevelInfos(),
-                            false));
+                            getFeeder3WTLegNode(tws.get(2))));
         }
     }
 
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/VoltageLevelGraphBuilder.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/VoltageLevelGraphBuilder.java
@@ -3,10 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.builder;
 
-import com.powsybl.sld.model.*;
+import com.powsybl.sld.library.ComponentTypeName;
+import com.powsybl.sld.model.coordinate.Direction;
+import com.powsybl.sld.model.graphs.BaseGraph;
+import com.powsybl.sld.model.graphs.NodeFactory;
+import com.powsybl.sld.model.graphs.VoltageLevelGraph;
+import com.powsybl.sld.model.graphs.VoltageLevelInfos;
+import com.powsybl.sld.model.nodes.*;
 import org.lfenergy.compas.scl.auto.alignment.model.*;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -15,28 +20,18 @@ public class VoltageLevelGraphBuilder extends AbstractGraphBuilder<VoltageLevelG
     private final GenericVoltageLevel voltageLevel;
     private final GenericSubstation substation;
 
-    public VoltageLevelGraphBuilder(GenericVoltageLevel voltageLevel) {
-        this(voltageLevel, null, new HashMap<>(), true);
-    }
-
     public VoltageLevelGraphBuilder(GenericVoltageLevel voltageLevel,
                                     GenericSubstation substation,
-                                    Map<String, Node> path2Node) {
-        this(voltageLevel, substation, path2Node, false);
-    }
-
-    private VoltageLevelGraphBuilder(GenericVoltageLevel voltageLevel,
-                                     GenericSubstation substation,
-                                     Map<String, Node> path2Node,
-                                     boolean forVoltageLevelDiagram) {
+                                    Map<String, Node> path2Node,
+                                    BaseGraph parentGraph) {
         super(path2Node);
         this.voltageLevel = voltageLevel;
         this.substation = substation;
 
         var voltageLevelInfos = new VoltageLevelInfos(voltageLevel.getFullName(),
                 voltageLevel.getFullName(),
                 voltageLevel.getVoltage());
-        setGraph(VoltageLevelGraph.create(voltageLevelInfos, forVoltageLevelDiagram));
+        setGraph(new VoltageLevelGraph(voltageLevelInfos, parentGraph));
 
         createVoltageLevel();
     }
@@ -57,14 +52,14 @@ private void createVoltageLevel() {
     private void processBusbarNode(GenericBay busbar,
                                    AtomicInteger busbarIndex) {
         busbar.getConnectivityNodes()
-                .forEach(connectivityNode ->
+                .stream().findFirst()
+                .ifPresent(connectivityNode ->
                         addNode(connectivityNode.getPathName(),
                                 createBusbarNode(busbar.getFullName(), busbarIndex.getAndIncrement(), 1)));
     }
 
     public BusNode createBusbarNode(String id, int busbarIndex, int sectionIndex) {
-        BusNode busNode = BusNode.create(getGraph(), id, id);
-        getGraph().addNode(busNode);
+        BusNode busNode = NodeFactory.createBusNode(getGraph(), id, id);
         busNode.setBusBarIndexSectionIndex(busbarIndex, sectionIndex);
         return busNode;
     }
@@ -104,16 +99,18 @@ private void processConductingEquipment(GenericConductingEquipment conductingEqu
         var fullName = conductingEquipment.getFullName();
         var node = createSwitchNode(fullName);
 
-        Node node1 = terminalToNode(terminals.get(0));
-        Node node2 = null;
-        var termNb = terminals.size();
-        if (termNb == 1) {
-            node2 = createLoad(fullName + "/Grounded");
-        } else if (termNb == 2) {
-            node2 = terminalToNode(terminals.get(1));
+        if (!terminals.isEmpty()) {
+            Node node1 = terminalToNode(terminals.get(0));
+            Node node2 = null;
+            var termNb = terminals.size();
+            if (termNb == 1) {
+                node2 = createLoad(fullName + "/Grounded");
+            } else if (termNb == 2) {
+                node2 = terminalToNode(terminals.get(1));
+            }
+            connectNode(node, node1);
+            connectNode(node, node2);
         }
-        connectNode(node, node1);
-        connectNode(node, node2);
     }
 
     private Node terminalToNode(GenericTerminal terminal) {
@@ -125,45 +122,40 @@ private Node terminalToNode(GenericTerminal terminal) {
     }
 
     private SwitchNode createSwitchNode(String id) {
-        SwitchNode sw = new SwitchNode(id, id, SwitchNode.SwitchKind.BREAKER.name(), false,
-                getGraph(), SwitchNode.SwitchKind.BREAKER, false);
-        getGraph().addNode(sw);
-        return sw;
+        return NodeFactory.createSwitchNode(getGraph(), id, id, SwitchNode.SwitchKind.BREAKER.name(),
+                false, SwitchNode.SwitchKind.BREAKER, false);
     }
 
     private void connectNode(Node node1, Node node2) {
         getGraph().addEdge(node1, node2);
     }
 
     private FictitiousNode createFictitiousNode(String id) {
-        InternalNode fictitiousNode = new InternalNode(id, getGraph());
-        getGraph().addNode(fictitiousNode);
-        return fictitiousNode;
+        return NodeFactory.createFictitiousNode(getGraph(), id, id, id, ComponentTypeName.LINE);
     }
 
     private FeederNode createLoad(String id) {
-        FeederInjectionNode fn = FeederInjectionNode.createLoad(getGraph(), id, id);
+        FeederNode fn = NodeFactory.createLoad(getGraph(), id, id);
         commonFeederSetting(fn, id, 0, null);
         return fn;
     }
 
     public Feeder2WTLegNode createFeeder2WTLegNode(String id, FeederWithSideNode.Side side, int order,
-                                                   BusCell.Direction direction) {
-        Feeder2WTLegNode f2WTe = Feeder2WTLegNode.create(getGraph(), id + "_" + side, id, id, side);
+                                                   Direction direction) {
+        Feeder2WTLegNode f2WTe = NodeFactory.createFeeder2WTLegNode(getGraph(), id + "_" + side, id, id, side);
         commonFeederSetting(f2WTe, id, order, direction);
         return f2WTe;
     }
 
     public Feeder3WTLegNode createFeeder3WTLegNode(String id, FeederWithSideNode.Side side, int order,
-                                                   BusCell.Direction direction) {
-        Feeder3WTLegNode f3WTe = Feeder3WTLegNode.createForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
+                                                   Direction direction) {
+        Feeder3WTLegNode f3WTe = NodeFactory.createFeeder3WTLegNodeForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
         commonFeederSetting(f3WTe, id + side.getIntValue(), order, direction);
         return f3WTe;
     }
 
-    private void commonFeederSetting(FeederNode node, String id, int order, BusCell.Direction direction) {
+    private void commonFeederSetting(FeederNode node, String id, int order, Direction direction) {
         node.setLabel(id);
-        getGraph().addNode(node);
 
         if (direction != null) {
             node.setOrder(order);
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformer.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformer.java
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.model;
 
-import com.powsybl.sld.model.FeederWithSideNode;
+import com.powsybl.sld.model.nodes.FeederWithSideNode;
 import org.w3c.dom.Element;
 
 import java.util.Collection;
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java
@@ -4,9 +4,10 @@
 package org.lfenergy.compas.scl.auto.alignment.service;
 
 import com.powsybl.sld.library.ComponentTypeName;
-import com.powsybl.sld.model.FeederNode;
-import com.powsybl.sld.model.Node;
-import com.powsybl.sld.model.SubstationGraph;
+import com.powsybl.sld.model.coordinate.Direction;
+import com.powsybl.sld.model.graphs.SubstationGraph;
+import com.powsybl.sld.model.nodes.FeederNode;
+import com.powsybl.sld.model.nodes.Node;
 import com.powsybl.sld.svg.DiagramLabelProvider;
 import com.powsybl.sld.svg.FeederInfo;
 import com.powsybl.sld.svg.LabelPosition;
@@ -33,17 +34,17 @@ private void addNode(Node node) {
 
     @Override
     public List<FeederInfo> getFeederInfos(FeederNode node) {
-        return Arrays.asList(new FeederInfo(ComponentTypeName.ARROW_ACTIVE, Direction.OUT, "", "", null),
-                new FeederInfo(ComponentTypeName.ARROW_REACTIVE, Direction.IN, "", "", null));
+        return Arrays.asList(new FeederInfo(ComponentTypeName.ARROW_ACTIVE, LabelDirection.OUT, "", "", null),
+                new FeederInfo(ComponentTypeName.ARROW_REACTIVE, LabelDirection.IN, "", "", null));
     }
 
     @Override
-    public List<NodeLabel> getNodeLabels(com.powsybl.sld.model.Node node) {
+    public List<NodeLabel> getNodeLabels(Node node, Direction direction) {
         return busLabels.get(node);
     }
 
     @Override
-    public List<NodeDecorator> getNodeDecorators(com.powsybl.sld.model.Node node) {
+    public List<NodeDecorator> getNodeDecorators(Node node, Direction direction) {
         return new ArrayList<>();
     }
 
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java
@@ -7,7 +7,7 @@
 import com.powsybl.sld.layout.LayoutParameters;
 import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory;
 import com.powsybl.sld.library.ConvergenceComponentLibrary;
-import com.powsybl.sld.model.SubstationGraph;
+import com.powsybl.sld.model.graphs.SubstationGraph;
 import com.powsybl.sld.svg.BasicStyleProvider;
 import com.powsybl.sld.svg.DefaultSVGWriter;
 import org.lfenergy.compas.core.commons.ElementConverter;
diff --git a/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformerTest.java b/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformerTest.java
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.model;
 
-import com.powsybl.sld.model.FeederWithSideNode;
+import com.powsybl.sld.model.nodes.FeederWithSideNode;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
