Merge pull request #136 from com-pas/develop

New release
com-pas · Sep 20, 2022 · 5dc30eb · 5dc30eb
2 parents 7949e21 + 36c7995
commit 5dc30eb
Show file tree

Hide file tree

Showing 23 changed files with 197 additions and 129 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -12,31 +12,17 @@ jobs:
 
     if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
     steps:
-      - name: add-new-issues-to-repository-based-project-column
-        uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-        if: github.event_name == 'issues' && github.event.action == 'opened'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
-          GITHUB_PROJECT_COLUMN_NAME: To do
-      - name: add-new-pull-request-to-repository-based-project-column
-        uses: docker://takanabe/github-actions-automate-projects:v0.0.1
-        if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
-          GITHUB_PROJECT_COLUMN_NAME: To do
       - name: add-new-issues-to-organization-based-project-column
-        uses: docker://takanabe/github-actions-automate-projects:v0.0.1
         if: github.event_name == 'issues' && github.event.action == 'opened'
-        env:
-          GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
-          GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/1
-          GITHUB_PROJECT_COLUMN_NAME: To do
+        uses: alex-page/github-project-automation-plus@v0.8.1
+        with:
+          project: CoMPAS Issues Overview Board
+          column: To do
+          repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
       - name: add-new-pull-request-to-organization-based-project-column
-        uses: docker://takanabe/github-actions-automate-projects:v0.0.1
         if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
-        env:
-          GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
-          GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/2
-          GITHUB_PROJECT_COLUMN_NAME: To do
+        uses: alex-page/github-project-automation-plus@v0.8.1
+        with:
+          project: CoMPAS Pull Request Overview Board
+          column: To do
+          repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -22,9 +22,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
+
       - name: Cache Docker Register
         uses: actions/cache@v3
         with:
@@ -37,8 +35,11 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -16,14 +16,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
       - name: Cache Docker Register
         uses: actions/cache@v3
         with:
@@ -39,13 +32,22 @@ jobs:
       - name: Extract tag name
         id: extract_tagname
         shell: bash
-        # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
+        # Extract the tag name from 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 17
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.5.0
         with:
           distribution: 'zulu'
           java-version: '17'
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20

diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -30,11 +30,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3.4.1
-        with:
-          distribution: 'zulu'
-          java-version: '17'
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
@@ -48,20 +43,43 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3.5.0
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+
+      - name: Set Common Sonar Variables
+        id: sonar_env
+        run: |
+          echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \
+            -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
+            -Dsonar.organization=com-pas )"
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20
         with:
           output_file: custom_maven_settings.xml
           servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
-      - name: Build and analyze
+      - name: Build and analyze (Pull Request)
+        if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          ./mvnw -B -s custom_maven_settings.xml -Psonar \
+            ${{ steps.sonar_env.outputs.sonar_opts }} \
+            -Dsonar.pullrequest.branch=${{ github.ref_name }} \
+            -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
+            -Dsonar.pullrequest.base=${{ github.base_ref }} \
+            -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
+            clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+      - name: Build and analyze (Push)
+        if: ${{ github.event_name == 'push' }}
         env:
-          GITHUB_USERNAME: "OWNER"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          ./mvnw -s custom_maven_settings.xml -B -Psonar \
-          -Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
-          -Dsonar.organization=com-pas \
-          -Dsonar.host.url=https://sonarcloud.io \
-          -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
-          clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+          ./mvnw -B -s custom_maven_settings.xml -Psonar \
+            ${{ steps.sonar_env.outputs.sonar_opts }} \
+            -Dsonar.branch.name=${{ github.ref_name }} \
+            clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,11 @@ SPDX-License-Identifier: Apache-2.0
         <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
-        <compas.core.version>0.9.1</compas.core.version>
+        <compas.core.version>0.9.3</compas.core.version>
 
-        <quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
-        <slf4j.version>1.7.36</slf4j.version>
-        <powsybl.sld.version>2.12.0</powsybl.sld.version>
+        <quarkus.platform.version>2.12.2.Final</quarkus.platform.version>
+        <slf4j.version>2.0.1</slf4j.version>
+        <powsybl.sld.version>2.13.0</powsybl.sld.version>
         <gson.version>2.9.1</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
@@ -147,7 +147,7 @@ SPDX-License-Identifier: Apache-2.0
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -229,7 +229,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>3.4.0</version>
+                            <version>3.4.1</version>
                             <executions>
                                 <execution>
                                     <id>attach-javadocs</id>

diff --git a/.../src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java b/.../src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java
@@ -5,8 +5,7 @@
 
 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.FeederNode;
 import com.powsybl.sld.model.nodes.Node;
 import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException;
 import org.lfenergy.compas.scl.auto.alignment.model.*;
@@ -70,8 +69,8 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
                     NodeFactory.createMiddle2WTNode(getGraph(),
                             powerTransformer.getFullName(),
                             powerTransformer.getFullName(),
-                            getFeeder2WTLegNode(tws.get(0)),
-                            getFeeder2WTLegNode(tws.get(1)),
+                            getFeederNode(tws.get(0)),
+                            getFeederNode(tws.get(1)),
                             getVoltageLevelBuilder(tws.get(0)).getGraph().getVoltageLevelInfos(),
                             getVoltageLevelBuilder(tws.get(1)).getGraph().getVoltageLevelInfos(),
                             false));
@@ -81,19 +80,14 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
                     NodeFactory.createMiddle3WTNode(getGraph(),
                             powerTransformer.getFullName(),
                             powerTransformer.getFullName(),
-                            getFeeder3WTLegNode(tws.get(0)),
-                            getFeeder3WTLegNode(tws.get(1)),
-                            getFeeder3WTLegNode(tws.get(2))));
+                            getFeederNode(tws.get(0)),
+                            getFeederNode(tws.get(1)),
+                            getFeederNode(tws.get(2))));
         }
     }
 
-    private Feeder2WTLegNode getFeeder2WTLegNode(GenericTransformerWinding transformerWinding) {
+    private FeederNode getFeederNode(GenericTransformerWinding transformerWinding) {
         var connectivityNode = transformerWinding.getTerminals().get(0).getConnectivityNode();
-        return (Feeder2WTLegNode) getNodeByPath(connectivityNode);
-    }
-
-    private Feeder3WTLegNode getFeeder3WTLegNode(GenericTransformerWinding transformerWinding) {
-        var connectivityNode = transformerWinding.getTerminals().get(0).getConnectivityNode();
-        return (Feeder3WTLegNode) getNodeByPath(connectivityNode);
+        return (FeederNode) getNodeByPath(connectivityNode);
     }
 }
diff --git a/...rc/main/java/org/lfenergy/compas/scl/auto/alignment/builder/VoltageLevelGraphBuilder.java b/...rc/main/java/org/lfenergy/compas/scl/auto/alignment/builder/VoltageLevelGraphBuilder.java
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.lfenergy.compas.scl.auto.alignment.builder;
 
-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;
@@ -85,7 +84,7 @@ private void createConnectivityNode(GenericConnectivityNode connectivityNode) {
                             }
                         }, () ->
                                 addNode(connectivityNode.getPathName(),
-                                        createFictitiousNode(connectivityNode.getPathName()))
+                                        createConnectivityNode(connectivityNode.getPathName()))
                 );
     }
 
@@ -135,8 +134,8 @@ private void connectNode(Node node1, Node node2) {
         getGraph().addEdge(node1, node2);
     }
 
-    private FictitiousNode createFictitiousNode(String id) {
-        return NodeFactory.createFictitiousNode(getGraph(), id, id, id, ComponentTypeName.LINE);
+    private ConnectivityNode createConnectivityNode(String id) {
+        return NodeFactory.createConnectivityNode(getGraph(), id);
     }
 
     private FeederNode createLoad(String id, int order) {
@@ -145,16 +144,16 @@ private FeederNode createLoad(String id, int order) {
         return fn;
     }
 
-    public Feeder2WTLegNode createFeeder2WTLegNode(String id, FeederWithSideNode.Side side, int order,
-                                                   Direction direction) {
-        Feeder2WTLegNode f2WTe = NodeFactory.createFeeder2WTLegNode(getGraph(), id + "_" + side, id, id, side);
+    public FeederNode createFeeder2WTLegNode(String id, NodeSide side, int order,
+                                             Direction direction) {
+        var 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,
-                                                   Direction direction) {
-        Feeder3WTLegNode f3WTe = NodeFactory.createFeeder3WTLegNodeForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
+    public FeederNode createFeeder3WTLegNode(String id, NodeSide side, int order,
+                                             Direction direction) {
+        var f3WTe = NodeFactory.createFeeder3WTLegNodeForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
         commonFeederSetting(f3WTe, id + side.getIntValue(), order, direction);
         return f3WTe;
     }

diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/CommonUtil.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/CommonUtil.java
@@ -6,7 +6,6 @@
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCLXY_NS_URI;
@@ -34,7 +33,7 @@ public static void cleanSXYDeclarationAndAttributes(Element element) {
                 .filter(Attr.class::isInstance)
                 .map(Attr.class::cast)
                 .filter(attr -> SCLXY_NS_URI.equals(attr.getNamespaceURI()))
-                .collect(Collectors.toList());
+                .toList();
         // Remove the attribute from the element.
         attributesToRemove.forEach(element::removeAttributeNode);
 

diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBay.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBay.java
@@ -6,7 +6,6 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class GenericBay extends AbstractGenericNameEntity<GenericVoltageLevel> {
@@ -33,7 +32,7 @@ public List<GenericConnectivityNode> getConnectivityNodes() {
         if (connectivityNodes == null) {
             connectivityNodes = getElementsStream("ConnectivityNode")
                     .map(element -> new GenericConnectivityNode(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return connectivityNodes;
     }
@@ -42,7 +41,7 @@ public List<GenericConductingEquipment> getConductingEquipments() {
         if (conductingEquipments == null) {
             conductingEquipments = getElementsStream("ConductingEquipment")
                     .map(element -> new GenericConductingEquipment(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return conductingEquipments;
     }