Merge branch 'main' into nro/licenses

flo-dup · web-flow · commit 9e003c9faad9 · 2026-03-06T16:32:06.000+01:00
diff --git a/.github/workflows/fork-build-tests.yml b/.github/workflows/fork-build-tests.yml
@@ -23,19 +23,20 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          cache: 'maven'
 
       - name: Build with Maven (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        run: ./mvnw --batch-mode -P jacoco,checks install
+        run: ./mvnw -B -ntp -Pjacoco install
 
       - name: Build with Maven (Windows)
         if: matrix.os == 'windows-latest'
-        run: mvnw.cmd --batch-mode install
+        run: mvnw.cmd -B -ntp verify -Dpowsybl.checks.skip=true
         shell: cmd
 
       - name: Build with Maven (MacOS)
         if: matrix.os == 'macos-latest'
-        run: ./mvnw --batch-mode install
+        run: ./mvnw -B -ntp verify -Dpowsybl.checks.skip=true
 
       - name: Regroup dependencies in target folders
         if: matrix.os == 'ubuntu-latest'
diff --git a/.github/workflows/fork-sonar.yml b/.github/workflows/fork-sonar.yml
@@ -82,6 +82,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '21'
+          cache: 'maven'
 
       - name: Download artifact
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -24,30 +24,33 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          fetch-depth: 0
 
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: '21'
+          cache: 'maven'
 
       - name: Build with Maven (Ubuntu)
         if: matrix.os == 'ubuntu-latest'
-        run: ./mvnw --batch-mode -P jacoco,checks install
+        run: ./mvnw -B -ntp -Pjacoco install
 
       - name: Build with Maven (Windows)
         if: matrix.os == 'windows-latest'
-        run: mvnw.cmd --batch-mode install
+        run: mvnw.cmd -B -ntp verify -Dpowsybl.checks.skip=true
         shell: cmd
 
       - name: Build with Maven (MacOS)
         if: matrix.os == 'macos-latest'
-        run: ./mvnw --batch-mode install
+        run: ./mvnw -B -ntp verify -Dpowsybl.checks.skip=true
 
       - name: Run SonarCloud analysis
         if: matrix.os == 'ubuntu-latest'
         run: >
-          ./mvnw --batch-mode -Pjacoco verify sonar:sonar
+          ./mvnw -B -ntp -DskipTests sonar:sonar
           -Dsonar.host.url=https://sonarcloud.io
           -Dsonar.organization=powsybl-ci-github
           -Dsonar.projectKey=com.powsybl:powsybl-diagram
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/EdgeInfo.java
@@ -29,17 +29,27 @@ public class EdgeInfo {
     private final Direction arrowDirection;
     private final String labelA;
     private final String labelB;
+    private final String componentType;
 
     public EdgeInfo(String infoTypeA, String infoTypeB, Direction arrowDirection, String labelA, String labelB) {
+        this(infoTypeA, infoTypeB, arrowDirection, labelA, labelB, null);
+    }
+
+    public EdgeInfo(String infoTypeA, String infoTypeB, Direction arrowDirection, String labelA, String labelB, String componentType) {
         this.infoTypeB = infoTypeB;
         this.infoTypeA = infoTypeA;
         this.arrowDirection = arrowDirection;
         this.labelA = labelA;
         this.labelB = labelB;
+        this.componentType = componentType;
     }
 
     public EdgeInfo(String infoTypeA, String infoTypeB, double referenceValue, String labelA, String labelB) {
-        this(infoTypeA, infoTypeB, getArrowDirection(referenceValue), labelA, labelB);
+        this(infoTypeA, infoTypeB, getArrowDirection(referenceValue), labelA, labelB, null);
+    }
+
+    public EdgeInfo(String infoTypeA, String infoTypeB, double referenceValue, String labelA, String labelB, String componentType) {
+        this(infoTypeA, infoTypeB, getArrowDirection(referenceValue), labelA, labelB, componentType);
     }
 
     private static Direction getArrowDirection(double value) {
@@ -77,6 +87,10 @@ public Optional<String> getLabelB() {
         return Optional.ofNullable(labelB);
     }
 
+    public Optional<String> getComponentType() {
+        return Optional.ofNullable(componentType);
+    }
+
     /**
      * Returns the main info type.
      * @return the main info type. By default, the info type of the side 2.
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/SvgWriter.java
@@ -9,6 +9,7 @@
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.commons.exceptions.UncheckedXmlStreamException;
 import com.powsybl.commons.xml.XmlUtil;
+import com.powsybl.diagram.components.ComponentSize;
 import com.powsybl.diagram.util.CssUtil;
 import com.powsybl.nad.library.NadComponentLibrary;
 import com.powsybl.nad.model.*;
@@ -218,23 +219,42 @@ private void insertSvgComponent(Injection injection, XMLStreamWriter writer) thr
         writer.writeStartElement(GROUP_ELEMENT_NAME);
         writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(injection.getIconOrigin(svgParameters.getInjectionCircleRadius())));
 
-        Result result = new SAXResult(new SvgContentHandlerToXMLStreamWriter(writer));
         String componentType = injection.getComponentType();
+        writeSvgComponent(writer, componentType, "Cannot insert SVG for injection of type " + injection.getType());
+    }
+
+    private void drawComponentOnBranchEdgeMiddle(XMLStreamWriter writer, String componentType) throws XMLStreamException {
+        writer.writeStartElement(GROUP_ELEMENT_NAME);
+        ComponentSize componentSize = componentLibrary.getComponentsSize().getOrDefault(componentType, null);
+
+        if (componentSize == null) {
+            throw new PowsyblException("Cannot find size for component of type " + componentType);
+        }
+        Point trans = new Point(-componentSize.width() / 2, -componentSize.height() / 2);
+        writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(trans));
+
+        writeSvgComponent(writer, componentType, "Cannot insert SVG component of type " + componentType + " on branch edge middle");
+    }
+
+    private void writeSvgComponent(XMLStreamWriter writer, String componentType, String errorMessage) throws XMLStreamException {
+        Result result = new SAXResult(new SvgContentHandlerToXMLStreamWriter(writer));
         writeStyleClasses(writer, componentLibrary.getComponentStyleClass(componentType).map(List::of).orElse(List.of()));
 
         try {
             Transformer transformer = componentLibrary.getSvgTransformer();
             Map<String, List<Element>> subComponents = componentLibrary.getSvgElements(componentType);
-            for (Map.Entry<String, List<Element>> scEntry : subComponents.entrySet()) {
-                List<String> edgeStyleClasses = componentLibrary.getSubComponentStyleClass(componentType, scEntry.getKey())
+            if (subComponents != null) {
+                for (Map.Entry<String, List<Element>> scEntry : subComponents.entrySet()) {
+                    List<String> edgeStyleClasses = componentLibrary.getSubComponentStyleClass(componentType, scEntry.getKey())
                         .map(List::of).orElse(List.of());
-                writeStyleClasses(writer, edgeStyleClasses);
-                for (Element element : scEntry.getValue()) {
-                    transformer.transform(new DOMSource(element), result);
+                    writeStyleClasses(writer, edgeStyleClasses);
+                    for (Element element : scEntry.getValue()) {
+                        transformer.transform(new DOMSource(element), result);
+                    }
                 }
             }
         } catch (TransformerException e) {
-            throw new PowsyblException("Cannot insert SVG for injection of type " + injection.getType(), e);
+            throw new PowsyblException(errorMessage, e);
         }
         writer.writeEndElement();
     }
@@ -590,7 +610,7 @@ private <E> void drawEdgeInfoOrLabel(XMLStreamWriter writer,
         if (checkIfEdgeInfoIsEmpty(edgeInfo)) {
             return;
         }
-        if (edgeInfo.getDirection().isPresent() || edgeInfo.getLabelB().isPresent() && edgeInfo.getLabelA().isPresent()) {
+        if (edgeInfo.getDirection().isPresent() || edgeInfo.getComponentType().isPresent() || edgeInfo.getLabelB().isPresent() && edgeInfo.getLabelA().isPresent()) {
             drawEdgeInfo(writer, svgEdgeInfo, point, edgeAngle);
         } else {
             String label = edgeInfo.getLabelB().orElse(edgeInfo.getLabelA().orElse(null));
@@ -655,7 +675,13 @@ private void drawEdgeInfo(XMLStreamWriter writer, SvgEdgeInfo svgEdgeInfo, Point
         writer.writeStartElement(GROUP_ELEMENT_NAME);
         writer.writeAttribute(ID_ATTRIBUTE, svgEdgeInfo.svgId());
         writer.writeAttribute(TRANSFORM_ATTRIBUTE, getTranslateString(infoCenter));
-        drawArrow(writer, edgeInfo, edgeAngle);
+
+        Optional<String> componentType = edgeInfo.getComponentType();
+        if (componentType.isPresent()) {
+            this.drawComponentOnBranchEdgeMiddle(writer, componentType.get());
+        } else {
+            drawArrow(writer, edgeInfo, edgeAngle);
+        }
         Optional<String> label2 = edgeInfo.getLabelB();
         if (label2.isPresent()) {
             drawLabel(writer, label2.get(), edgeAngle, true, styleProvider.getEdgeInfoStyleClasses(edgeInfo.getInfoTypeB()));
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/metadata/DiagramMetadata.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/metadata/DiagramMetadata.java
@@ -199,7 +199,8 @@ private static EdgeInfoMetadata createEdgeInfoMetadata(SvgEdgeInfo svgEdgeInfo)
                 edgeInfo.getInfoTypeB(),
                 edgeInfo.getDirection().map(Enum::name).orElse(null),
                 edgeInfo.getLabelA().orElse(null),
-                edgeInfo.getLabelB().orElse(null));
+                edgeInfo.getLabelB().orElse(null),
+                edgeInfo.getComponentType().orElse(null));
     }
 
     private String getPrefixedId(String id) {
diff --git a/network-area-diagram/src/main/java/com/powsybl/nad/svg/metadata/EdgeInfoMetadata.java b/network-area-diagram/src/main/java/com/powsybl/nad/svg/metadata/EdgeInfoMetadata.java
@@ -7,6 +7,7 @@
  */
 package com.powsybl.nad.svg.metadata;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -21,19 +22,23 @@ public class EdgeInfoMetadata {
     private final String direction;
     private final String labelA;
     private final String labelB;
+    private final String componentType;
 
+    @JsonCreator
     public EdgeInfoMetadata(@JsonProperty("svgId") String svgId,
                             @JsonProperty("infoTypeA") String infoTypeA,
                             @JsonProperty("infoTypeB") String infoTypeB,
                             @JsonProperty("direction") String direction,
                             @JsonProperty("labelA") String labelA,
-                            @JsonProperty("labelB") String labelB) {
+                            @JsonProperty("labelB") String labelB,
+                            @JsonProperty("componentType") String componentType) {
         this.svgId = svgId;
         this.infoTypeA = infoTypeA;
         this.infoTypeB = infoTypeB;
         this.direction = direction;
         this.labelA = labelA;
         this.labelB = labelB;
+        this.componentType = componentType;
     }
 
     @JsonProperty("svgId")
@@ -65,4 +70,9 @@ public String getLabelA() {
     public String getLabelB() {
         return labelB;
     }
+
+    @JsonProperty("componentType")
+    public String getComponentType() {
+        return componentType;
+    }
 }
diff --git a/network-area-diagram/src/main/resources/DefaultLibrary/components.json b/network-area-diagram/src/main/resources/DefaultLibrary/components.json
@@ -83,6 +83,34 @@
     ],
     "styleClass": "nad-svc"
   },
+  {
+    "type": "LOCK",
+    "size": {
+      "width": 50.0,
+      "height": 50.0
+    },
+    "subComponents": [
+      {
+        "name": "LOCK",
+        "fileName": "lock.svg"
+      }
+    ],
+    "styleClass": "nad-lock"
+  },
+  {
+    "type": "FLASH",
+    "size": {
+      "width": 50.0,
+      "height": 50.0
+    },
+    "subComponents": [
+      {
+        "name": "FLASH",
+        "fileName": "flash.svg"
+      }
+    ],
+    "styleClass": "nad-flash"
+  },
   {
     "type": "UNKNOWN_COMPONENT",
     "size": {
diff --git a/network-area-diagram/src/main/resources/DefaultLibrary/flash.svg b/network-area-diagram/src/main/resources/DefaultLibrary/flash.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="50" xmlns="http://www.w3.org/2000/svg">
+<path d="M34.71 3.91H21l-7.4 22.28a.1.1 0 0 0 .09.13h8.49a.1.1 0 0 1 .1.13L15.71 46.09a.5.5 0 0 0 .88.45L36.41 19.33a.1.1 0 0 0-.08-.16H27.42a.11.11 0 0 1-.09-.15l7.47-15a.1.1 0 0 0-.09-.11Z"/>
+</svg>
diff --git a/network-area-diagram/src/main/resources/DefaultLibrary/lock.svg b/network-area-diagram/src/main/resources/DefaultLibrary/lock.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" style="fill:none;stroke:black;stroke-width:1">
+<path d="M32 22V18A8 8 0 0 0 16 18v4a3.24 3.24 0 0 0-3 3.21v9.54A3.23 3.23 0 0 0 16.23 38H31.77A3.23 3.23 0 0 0 35 34.77V25.23A3.24 3.24 0 0 0 32 22ZM24 12a6 6 0 0 1 6 6v4H18V18A6 6 0 0 1 24 12Zm9 22.77A1.23 1.23 0 0 1 31.77 36H16.23A1.23 1.23 0 0 1 15 34.77V25.23A1.23 1.23 0 0 1 16.23 24H31.77A1.23 1.23 0 0 1 33 25.23Z"/>
+</svg>
diff --git a/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoSvgComponentTest.java b/network-area-diagram/src/test/java/com/powsybl/nad/svg/EdgeInfoSvgComponentTest.java
diff --git a/network-area-diagram/src/test/resources/edge_info_components.svg b/network-area-diagram/src/test/resources/edge_info_components.svg
diff --git a/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java b/single-line-diagram/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/LayoutParameters.java

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,8 @@ private static EdgeInfoMetadata createEdgeInfoMetadata(SvgEdgeInfo svgEdgeInfo)`
`199`	`199`	`edgeInfo.getInfoTypeB(),`
`200`	`200`	`edgeInfo.getDirection().map(Enum::name).orElse(null),`
`201`	`201`	`edgeInfo.getLabelA().orElse(null),`
`202`		`- edgeInfo.getLabelB().orElse(null));`
	`202`	`+ edgeInfo.getLabelB().orElse(null),`
	`203`	`+ edgeInfo.getComponentType().orElse(null));`
`203`	`204`	`}`
`204`	`205`
`205`	`206`	`private String getPrefixedId(String id) {`