Skip to content

Commit 36c7995

Browse files
author
Dennis Labordus
authored
Merge pull request #134 from com-pas/dependabot/maven/com.powsybl-powsybl-single-line-diagram-core-2.13.0
Bump powsybl-single-line-diagram-core from 2.12.0 to 2.13.0
2 parents d7386be + b7e5be9 commit 36c7995

File tree

8 files changed

+114
-43
lines changed

8 files changed

+114
-43
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0
2727

2828
<quarkus.platform.version>2.12.2.Final</quarkus.platform.version>
2929
<slf4j.version>2.0.1</slf4j.version>
30-
<powsybl.sld.version>2.12.0</powsybl.sld.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>

‎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/model/GenericPowerTransformer.java

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

6-
import com.powsybl.sld.model.nodes.FeederWithSideNode;
6+
import com.powsybl.sld.model.nodes.NodeSide;
77
import org.w3c.dom.Element;
88

99
import java.util.Collection;
@@ -44,17 +44,17 @@ public boolean isFeeder3WT() {
4444
return getTransformerWindings().size() == 3;
4545
}
4646

47-
public FeederWithSideNode.Side getSide(String connectivityNode) {
47+
public NodeSide getSide(String connectivityNode) {
4848
var ptw = getTransformerWindingByConnectivityNode(connectivityNode);
4949
var index = getTransformerWindings().indexOf(ptw);
5050

5151
switch (index) {
5252
case 0:
53-
return FeederWithSideNode.Side.ONE;
53+
return NodeSide.ONE;
5454
case 1:
55-
return FeederWithSideNode.Side.TWO;
55+
return NodeSide.TWO;
5656
case 2:
57-
return FeederWithSideNode.Side.THREE;
57+
return NodeSide.THREE;
5858
default:
5959
return null;
6060
}

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
import com.powsybl.sld.library.ComponentTypeName;
77
import com.powsybl.sld.model.coordinate.Direction;
8+
import com.powsybl.sld.model.coordinate.Side;
89
import com.powsybl.sld.model.graphs.SubstationGraph;
10+
import com.powsybl.sld.model.graphs.VoltageLevelGraph;
11+
import com.powsybl.sld.model.nodes.BusNode;
912
import com.powsybl.sld.model.nodes.FeederNode;
1013
import com.powsybl.sld.model.nodes.Node;
11-
import com.powsybl.sld.svg.DiagramLabelProvider;
12-
import com.powsybl.sld.svg.DirectionalFeederInfo;
13-
import com.powsybl.sld.svg.FeederInfo;
14-
import com.powsybl.sld.svg.LabelPosition;
14+
import com.powsybl.sld.svg.*;
1515
import org.apache.commons.lang3.StringUtils;
1616

1717
import java.util.*;
@@ -46,7 +46,27 @@ public List<NodeLabel> getNodeLabels(Node node, Direction direction) {
4646

4747
@Override
4848
public List<NodeDecorator> getNodeDecorators(Node node, Direction direction) {
49-
return new ArrayList<>();
49+
return Collections.emptyList();
50+
}
51+
52+
@Override
53+
public String getTooltip(Node node) {
54+
return null;
55+
}
56+
57+
@Override
58+
public List<ElectricalNodeInfo> getElectricalNodesInfos(VoltageLevelGraph voltageLevelGraph) {
59+
return Collections.emptyList();
60+
}
61+
62+
@Override
63+
public Optional<BusInfo> getBusInfo(BusNode busNode) {
64+
return Optional.empty();
65+
}
66+
67+
@Override
68+
public Map<String, Side> getBusInfoSides(VoltageLevelGraph voltageLevelGraph) {
69+
return Collections.emptyMap();
5070
}
5171

5272
String stripLabel(String id) {

‎service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformerTest.java

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

6-
import com.powsybl.sld.model.nodes.FeederWithSideNode;
6+
import com.powsybl.sld.model.nodes.NodeSide;
77
import org.junit.jupiter.api.BeforeEach;
88
import org.junit.jupiter.api.Test;
99

@@ -77,9 +77,9 @@ void isFeederXWT_WhenCalledWithOtherPowerTransformer_ThenItWillBeA2WT() throws I
7777

7878
@Test
7979
void getSide_WhenCalledWithDifferentConnectivityNodes_ThenCorrectSidesAreReturned() {
80-
assertEquals(FeederWithSideNode.Side.ONE, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 30kV/BAY_T4_0/CONNECTIVITY_NODE78"));
81-
assertEquals(FeederWithSideNode.Side.TWO, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 110kV/BAY_T4_1/CONNECTIVITY_NODE81"));
82-
assertEquals(FeederWithSideNode.Side.THREE, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 380kV/BAY_T4_2/CONNECTIVITY_NODE85"));
80+
assertEquals(NodeSide.ONE, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 30kV/BAY_T4_0/CONNECTIVITY_NODE78"));
81+
assertEquals(NodeSide.TWO, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 110kV/BAY_T4_1/CONNECTIVITY_NODE81"));
82+
assertEquals(NodeSide.THREE, powerTransformer.getSide("_af9a4ae3-ba2e-4c34-8e47-5af894ee20f4/S1 380kV/BAY_T4_2/CONNECTIVITY_NODE85"));
8383
assertNull(powerTransformer.getSide("UNKNOWN"));
8484
}
8585

‎service/src/test/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProviderTest.java

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// SPDX-FileCopyrightText: 2022 Alliander N.V.
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
package org.lfenergy.compas.scl.auto.alignment.service;
5+
6+
import com.powsybl.sld.model.graphs.SubstationGraph;
7+
import org.junit.jupiter.api.BeforeEach;
8+
import org.junit.jupiter.api.Test;
9+
10+
import static org.junit.jupiter.api.Assertions.*;
11+
12+
class SclAutoAlignmentDiagramLabelProviderTest {
13+
private SclAutoAlignmentDiagramLabelProvider provider;
14+
15+
@BeforeEach
16+
void setup() {
17+
provider = new SclAutoAlignmentDiagramLabelProvider(SubstationGraph.create("Dummy"));
18+
}
19+
20+
@Test
21+
void getNodeDecorators_whenCalled_ThenAlwaysReturnEmptyList() {
22+
var result = provider.getNodeDecorators(null, null);
23+
24+
assertNotNull(result);
25+
assertTrue(result.isEmpty());
26+
}
27+
28+
@Test
29+
void getTooltip_whenCalled_ThenAlwaysReturnNull() {
30+
var result = provider.getTooltip(null);
31+
32+
assertNull(result);
33+
}
34+
35+
@Test
36+
void getElectricalNodesInfos_whenCalled_ThenAlwaysReturnEmptyList() {
37+
var result = provider.getElectricalNodesInfos(null);
38+
39+
assertNotNull(result);
40+
assertTrue(result.isEmpty());
41+
}
42+
43+
@Test
44+
void getBusInfo_whenCalled_ThenAlwaysReturnEmptyOptional() {
45+
var result = provider.getBusInfo(null);
46+
47+
assertNotNull(result);
48+
assertTrue(result.isEmpty());
49+
}
50+
51+
@Test
52+
void getBusInfoSides_whenCalled_ThenAlwaysReturnEmptyMap() {
53+
var result = provider.getBusInfoSides(null);
54+
55+
assertNotNull(result);
56+
assertTrue(result.isEmpty());
57+
}
58+
}

‎service/src/test/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ void updateSCL_WhenPassingCase1_ThenUpdatedSCLReturned() throws Exception {
3838

3939
var rootElement = toElement(result);
4040
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']", 2, 4);
41-
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='BusBar A']", 1, 15);
42-
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']", 2, 13);
41+
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='BusBar A']", 1, 14);
42+
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']", 2, 12);
4343
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='J1']/scl:Bay[@name='Bay 1S']/scl:ConductingEquipment[@name='CBR1']", 1, 1);
4444
}
4545

@@ -55,9 +55,9 @@ void updateSCL_WhenPassingCase2_ThenUpdatedSCLReturned() throws Exception {
5555
var rootElement = toElement(result);
5656
assertXYCoordinates(rootElement, "//scl:PowerTransformer[@name='T4']", 27, 3);
5757
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']", 2, 7);
58-
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BUSBAR10']", 1, 12);
58+
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BUSBAR10']", 1, 10);
5959
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']", 1, 4);
60-
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']/scl:ConductingEquipment[@name='BREAKER25']", 1, 4);
60+
assertXYCoordinates(rootElement, "//scl:VoltageLevel[@name='S1 380kV']/scl:Bay[@name='BAY_T4_2']/scl:ConductingEquipment[@name='BREAKER25']", 1, 2);
6161
}
6262

6363
@Test

0 commit comments

Comments
 (0)