Skip to content

Commit 6962884

Browse files
author
Rob Tjalma
authored
Merge pull request #80 from com-pas/fix-native-error-messages
Fixed reflection config for native build.
2 parents e18f70e + 3f9ce08 commit 6962884

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/CompasSclAutoAlignmentConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
* Create Beans from other dependencies that are used in the application.
1414
*/
1515
@RegisterForReflection(targets = {com.powsybl.sld.library.Components.class,
16-
com.powsybl.sld.library.Component.class})
16+
com.powsybl.sld.library.Component.class,
17+
org.lfenergy.compas.core.jaxrs.model.ErrorResponse.class,
18+
org.lfenergy.compas.core.jaxrs.model.ErrorMessage.class})
1719
public class CompasSclAutoAlignmentConfiguration {
1820
@Produces
1921
@ApplicationScoped

app/src/main/java/org/lfenergy/compas/scl/auto/alignment/rest/v1/SclAutoAlignmentResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public SclAutoAlignmentResource(SclAutoAlignmentService compasCimMappingService)
4444
@POST
4545
@Consumes(MediaType.APPLICATION_XML)
4646
@Produces(MediaType.APPLICATION_XML)
47-
public SclAutoAlignResponse updateSCL(@Valid SclAutoAlignRequest request) {
47+
public SclAutoAlignResponse alignment(@Valid SclAutoAlignRequest request) {
4848
String who = jsonWebToken.getClaim(userInfoProperties.who());
4949
LOGGER.trace("Username used for Who {}", who);
5050

@@ -57,7 +57,7 @@ public SclAutoAlignResponse updateSCL(@Valid SclAutoAlignRequest request) {
5757
@Consumes(MediaType.APPLICATION_XML)
5858
@Produces(MediaType.APPLICATION_SVG_XML)
5959
@Path("/svg")
60-
public String getSVG(@Valid SclAutoAlignSVGRequest request) {
60+
public String svg(@Valid SclAutoAlignSVGRequest request) {
6161
return sclAutoAlignmentService.getSVG(request.getSclData(), request.getSubstationName());
6262
}
6363
}

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,18 @@ private void processConductingEquipment(GenericConductingEquipment conductingEqu
104104
var fullName = conductingEquipment.getFullName();
105105
var node = createSwitchNode(fullName);
106106

107-
Node node1 = terminalToNode(terminals.get(0));
108-
Node node2 = null;
109-
var termNb = terminals.size();
110-
if (termNb == 1) {
111-
node2 = createLoad(fullName + "/Grounded");
112-
} else if (termNb == 2) {
113-
node2 = terminalToNode(terminals.get(1));
107+
if (!terminals.isEmpty()) {
108+
Node node1 = terminalToNode(terminals.get(0));
109+
Node node2 = null;
110+
var termNb = terminals.size();
111+
if (termNb == 1) {
112+
node2 = createLoad(fullName + "/Grounded");
113+
} else if (termNb == 2) {
114+
node2 = terminalToNode(terminals.get(1));
115+
}
116+
connectNode(node, node1);
117+
connectNode(node, node2);
114118
}
115-
connectNode(node, node1);
116-
connectNode(node, node2);
117119
}
118120

119121
private Node terminalToNode(GenericTerminal terminal) {

0 commit comments

Comments
 (0)