Skip to content

Commit 5dc30eb

Browse files
author
Dennis Labordus
authored
Merge pull request #136 from com-pas/develop
New release
2 parents 7949e21 + 36c7995 commit 5dc30eb

23 files changed

+197
-129
lines changed

‎.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

‎.github/workflows/automate-projects.yml

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

@@ -12,31 +12,17 @@ jobs:
1212

1313
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
1414
steps:
15-
- name: add-new-issues-to-repository-based-project-column
16-
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
17-
if: github.event_name == 'issues' && github.event.action == 'opened'
18-
env:
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20-
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
21-
GITHUB_PROJECT_COLUMN_NAME: To do
22-
- name: add-new-pull-request-to-repository-based-project-column
23-
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
24-
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
25-
env:
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
GITHUB_PROJECT_URL: https://github.com/com-pas/compas-scl-auto-alignment/projects/1
28-
GITHUB_PROJECT_COLUMN_NAME: To do
2915
- name: add-new-issues-to-organization-based-project-column
30-
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
3116
if: github.event_name == 'issues' && github.event.action == 'opened'
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
34-
GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/1
35-
GITHUB_PROJECT_COLUMN_NAME: To do
17+
uses: alex-page/github-project-automation-plus@v0.8.1
18+
with:
19+
project: CoMPAS Issues Overview Board
20+
column: To do
21+
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
3622
- name: add-new-pull-request-to-organization-based-project-column
37-
uses: docker://takanabe/github-actions-automate-projects:v0.0.1
3823
if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.action == 'opened'
39-
env:
40-
GITHUB_TOKEN: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}
41-
GITHUB_PROJECT_URL: https://github.com/orgs/com-pas/projects/2
42-
GITHUB_PROJECT_COLUMN_NAME: To do
24+
uses: alex-page/github-project-automation-plus@v0.8.1
25+
with:
26+
project: CoMPAS Pull Request Overview Board
27+
column: To do
28+
repo-token: ${{ secrets.ORG_GITHUB_ACTION_SECRET }}

‎.github/workflows/build-project.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

@@ -22,9 +22,7 @@ jobs:
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v3
25-
- name: Set up Docker Buildx
26-
id: buildx
27-
uses: docker/setup-buildx-action@v2
25+
2826
- name: Cache Docker Register
2927
uses: actions/cache@v3
3028
with:
@@ -37,8 +35,11 @@ jobs:
3735
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
3836
restore-keys: ${{ runner.os }}-m2
3937

38+
- name: Set up Docker Buildx
39+
id: buildx
40+
uses: docker/setup-buildx-action@v2
4041
- name: Set up JDK 17
41-
uses: actions/setup-java@v3.4.1
42+
uses: actions/setup-java@v3.5.0
4243
with:
4344
distribution: 'zulu'
4445
java-version: '17'

‎.github/workflows/release-project.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

@@ -16,14 +16,7 @@ jobs:
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v3
19-
- name: Set up Docker Buildx
20-
id: buildx
21-
uses: docker/setup-buildx-action@v2
22-
- name: Login to Docker Hub
23-
uses: docker/login-action@v2
24-
with:
25-
username: ${{ secrets.DOCKER_HUB_USERNAME }}
26-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
19+
2720
- name: Cache Docker Register
2821
uses: actions/cache@v3
2922
with:
@@ -39,13 +32,22 @@ jobs:
3932
- name: Extract tag name
4033
id: extract_tagname
4134
shell: bash
42-
# Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
35+
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
4336
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
37+
4438
- name: Set up JDK 17
45-
uses: actions/setup-java@v3.4.1
39+
uses: actions/setup-java@v3.5.0
4640
with:
4741
distribution: 'zulu'
4842
java-version: '17'
43+
- name: Set up Docker Buildx
44+
id: buildx
45+
uses: docker/setup-buildx-action@v2
46+
- name: Login to Docker Hub
47+
uses: docker/login-action@v2
48+
with:
49+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
50+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
4951

5052
- name: Create custom Maven Settings.xml
5153
uses: whelk-io/maven-settings-xml-action@v20

‎.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

‎.github/workflows/sonarcloud-analysis.yml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

@@ -30,11 +30,6 @@ jobs:
3030
with:
3131
fetch-depth: 0
3232

33-
- name: Set up JDK 17
34-
uses: actions/setup-java@v3.4.1
35-
with:
36-
distribution: 'zulu'
37-
java-version: '17'
3833
- name: Cache SonarCloud packages
3934
uses: actions/cache@v3
4035
with:
@@ -48,20 +43,43 @@ jobs:
4843
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
4944
restore-keys: ${{ runner.os }}-m2
5045

46+
- name: Set up JDK 17
47+
uses: actions/setup-java@v3.5.0
48+
with:
49+
distribution: 'zulu'
50+
java-version: '17'
51+
52+
- name: Set Common Sonar Variables
53+
id: sonar_env
54+
run: |
55+
echo "##[set-output name=sonar_opts;]$(echo -Dsonar.host.url=https://sonarcloud.io \
56+
-Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
57+
-Dsonar.organization=com-pas )"
5158
- name: Create custom Maven Settings.xml
5259
uses: whelk-io/maven-settings-xml-action@v20
5360
with:
5461
output_file: custom_maven_settings.xml
5562
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
56-
- name: Build and analyze
63+
- name: Build and analyze (Pull Request)
64+
if: ${{ github.event_name == 'pull_request' || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
65+
env:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
68+
run: |
69+
./mvnw -B -s custom_maven_settings.xml -Psonar \
70+
${{ steps.sonar_env.outputs.sonar_opts }} \
71+
-Dsonar.pullrequest.branch=${{ github.ref_name }} \
72+
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
73+
-Dsonar.pullrequest.base=${{ github.base_ref }} \
74+
-Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
75+
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
76+
- name: Build and analyze (Push)
77+
if: ${{ github.event_name == 'push' }}
5778
env:
58-
GITHUB_USERNAME: "OWNER"
5979
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6080
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6181
run: |
62-
./mvnw -s custom_maven_settings.xml -B -Psonar \
63-
-Dsonar.projectKey=com-pas_compas-scl-auto-alignment \
64-
-Dsonar.organization=com-pas \
65-
-Dsonar.host.url=https://sonarcloud.io \
66-
-Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
67-
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
82+
./mvnw -B -s custom_maven_settings.xml -Psonar \
83+
${{ steps.sonar_env.outputs.sonar_opts }} \
84+
-Dsonar.branch.name=${{ github.ref_name }} \
85+
clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar

‎pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ SPDX-License-Identifier: Apache-2.0
2323
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

26-
<compas.core.version>0.9.1</compas.core.version>
26+
<compas.core.version>0.9.3</compas.core.version>
2727

28-
<quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
29-
<slf4j.version>1.7.36</slf4j.version>
30-
<powsybl.sld.version>2.12.0</powsybl.sld.version>
28+
<quarkus.platform.version>2.12.2.Final</quarkus.platform.version>
29+
<slf4j.version>2.0.1</slf4j.version>
30+
<powsybl.sld.version>2.13.0</powsybl.sld.version>
3131
<gson.version>2.9.1</gson.version>
3232
<openpojo.version>0.9.1</openpojo.version>
3333
</properties>
@@ -147,7 +147,7 @@ SPDX-License-Identifier: Apache-2.0
147147
<plugin>
148148
<groupId>org.apache.maven.plugins</groupId>
149149
<artifactId>maven-jar-plugin</artifactId>
150-
<version>3.2.2</version>
150+
<version>3.3.0</version>
151151
</plugin>
152152
</plugins>
153153
</pluginManagement>
@@ -229,7 +229,7 @@ SPDX-License-Identifier: Apache-2.0
229229
<plugin>
230230
<groupId>org.apache.maven.plugins</groupId>
231231
<artifactId>maven-javadoc-plugin</artifactId>
232-
<version>3.4.0</version>
232+
<version>3.4.1</version>
233233
<executions>
234234
<execution>
235235
<id>attach-javadocs</id>

‎service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
import com.powsybl.sld.model.graphs.NodeFactory;
77
import com.powsybl.sld.model.graphs.SubstationGraph;
8-
import com.powsybl.sld.model.nodes.Feeder2WTLegNode;
9-
import com.powsybl.sld.model.nodes.Feeder3WTLegNode;
8+
import com.powsybl.sld.model.nodes.FeederNode;
109
import com.powsybl.sld.model.nodes.Node;
1110
import org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentException;
1211
import org.lfenergy.compas.scl.auto.alignment.model.*;
@@ -70,8 +69,8 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
7069
NodeFactory.createMiddle2WTNode(getGraph(),
7170
powerTransformer.getFullName(),
7271
powerTransformer.getFullName(),
73-
getFeeder2WTLegNode(tws.get(0)),
74-
getFeeder2WTLegNode(tws.get(1)),
72+
getFeederNode(tws.get(0)),
73+
getFeederNode(tws.get(1)),
7574
getVoltageLevelBuilder(tws.get(0)).getGraph().getVoltageLevelInfos(),
7675
getVoltageLevelBuilder(tws.get(1)).getGraph().getVoltageLevelInfos(),
7776
false));
@@ -81,19 +80,14 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
8180
NodeFactory.createMiddle3WTNode(getGraph(),
8281
powerTransformer.getFullName(),
8382
powerTransformer.getFullName(),
84-
getFeeder3WTLegNode(tws.get(0)),
85-
getFeeder3WTLegNode(tws.get(1)),
86-
getFeeder3WTLegNode(tws.get(2))));
83+
getFeederNode(tws.get(0)),
84+
getFeederNode(tws.get(1)),
85+
getFeederNode(tws.get(2))));
8786
}
8887
}
8988

90-
private Feeder2WTLegNode getFeeder2WTLegNode(GenericTransformerWinding transformerWinding) {
89+
private FeederNode getFeederNode(GenericTransformerWinding transformerWinding) {
9190
var connectivityNode = transformerWinding.getTerminals().get(0).getConnectivityNode();
92-
return (Feeder2WTLegNode) getNodeByPath(connectivityNode);
93-
}
94-
95-
private Feeder3WTLegNode getFeeder3WTLegNode(GenericTransformerWinding transformerWinding) {
96-
var connectivityNode = transformerWinding.getTerminals().get(0).getConnectivityNode();
97-
return (Feeder3WTLegNode) getNodeByPath(connectivityNode);
91+
return (FeederNode) getNodeByPath(connectivityNode);
9892
}
9993
}

‎service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/VoltageLevelGraphBuilder.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// SPDX-License-Identifier: Apache-2.0
44
package org.lfenergy.compas.scl.auto.alignment.builder;
55

6-
import com.powsybl.sld.library.ComponentTypeName;
76
import com.powsybl.sld.model.coordinate.Direction;
87
import com.powsybl.sld.model.graphs.BaseGraph;
98
import com.powsybl.sld.model.graphs.NodeFactory;
@@ -85,7 +84,7 @@ private void createConnectivityNode(GenericConnectivityNode connectivityNode) {
8584
}
8685
}, () ->
8786
addNode(connectivityNode.getPathName(),
88-
createFictitiousNode(connectivityNode.getPathName()))
87+
createConnectivityNode(connectivityNode.getPathName()))
8988
);
9089
}
9190

@@ -135,8 +134,8 @@ private void connectNode(Node node1, Node node2) {
135134
getGraph().addEdge(node1, node2);
136135
}
137136

138-
private FictitiousNode createFictitiousNode(String id) {
139-
return NodeFactory.createFictitiousNode(getGraph(), id, id, id, ComponentTypeName.LINE);
137+
private ConnectivityNode createConnectivityNode(String id) {
138+
return NodeFactory.createConnectivityNode(getGraph(), id);
140139
}
141140

142141
private FeederNode createLoad(String id, int order) {
@@ -145,16 +144,16 @@ private FeederNode createLoad(String id, int order) {
145144
return fn;
146145
}
147146

148-
public Feeder2WTLegNode createFeeder2WTLegNode(String id, FeederWithSideNode.Side side, int order,
149-
Direction direction) {
150-
Feeder2WTLegNode f2WTe = NodeFactory.createFeeder2WTLegNode(getGraph(), id + "_" + side, id, id, side);
147+
public FeederNode createFeeder2WTLegNode(String id, NodeSide side, int order,
148+
Direction direction) {
149+
var f2WTe = NodeFactory.createFeeder2WTLegNode(getGraph(), id + "_" + side, id, id, side);
151150
commonFeederSetting(f2WTe, id, order, direction);
152151
return f2WTe;
153152
}
154153

155-
public Feeder3WTLegNode createFeeder3WTLegNode(String id, FeederWithSideNode.Side side, int order,
156-
Direction direction) {
157-
Feeder3WTLegNode f3WTe = NodeFactory.createFeeder3WTLegNodeForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
154+
public FeederNode createFeeder3WTLegNode(String id, NodeSide side, int order,
155+
Direction direction) {
156+
var f3WTe = NodeFactory.createFeeder3WTLegNodeForSubstationDiagram(getGraph(), id + "_" + side, id, id, side);
158157
commonFeederSetting(f3WTe, id + side.getIntValue(), order, direction);
159158
return f3WTe;
160159
}

‎service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/CommonUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.w3c.dom.Attr;
77
import org.w3c.dom.Element;
88

9-
import java.util.stream.Collectors;
109
import java.util.stream.IntStream;
1110

1211
import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCLXY_NS_URI;
@@ -34,7 +33,7 @@ public static void cleanSXYDeclarationAndAttributes(Element element) {
3433
.filter(Attr.class::isInstance)
3534
.map(Attr.class::cast)
3635
.filter(attr -> SCLXY_NS_URI.equals(attr.getNamespaceURI()))
37-
.collect(Collectors.toList());
36+
.toList();
3837
// Remove the attribute from the element.
3938
attributesToRemove.forEach(element::removeAttributeNode);
4039

0 commit comments

Comments
 (0)