Taking into account PR comments

Signed-off-by: Thomas ADAM <tadam@silicom.fr>
powsybl · Jun 14, 2022 · fe20ed4 · fe20ed4
1 parent 3eca39c
commit fe20ed4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/com/powsybl/nad/svg/GraphMetadata.java b/src/main/java/com/powsybl/nad/svg/GraphMetadata.java
@@ -40,7 +40,7 @@ public class GraphMetadata {
 
     private final Map<String, String> edgeIdByDiagramId = new LinkedHashMap<>();
 
-    private final Optional<UnaryOperator<String>> diagramIdFunction;
+    private final UnaryOperator<String> diagramIdFunction;
 
     public GraphMetadata() {
         this(Collections.emptyList(), Collections.emptyList(), null);
@@ -56,7 +56,7 @@ public GraphMetadata(List<Node> nodes,
                          List<Edge> edges,
                          UnaryOperator<String> diagramIdFunction) {
 
-        this.diagramIdFunction = Optional.ofNullable(diagramIdFunction);
+        this.diagramIdFunction = diagramIdFunction;
         nodes.forEach(this::addNode);
         edges.forEach(this::addEdge);
     }
@@ -127,17 +127,17 @@ private void writeIdMapping(String rootElementName, String tagElementName, Map<S
     public void addNode(Node node) {
         Objects.requireNonNull(node);
         String svgId = node.getDiagramId();
-        if (diagramIdFunction.isPresent()) {
-            svgId = diagramIdFunction.get().apply(svgId);
+        if (diagramIdFunction != null) {
+            svgId = diagramIdFunction.apply(svgId);
         }
         nodeIdByDiagramId.put(svgId, node.getEquipmentId());
     }
 
     public void addEdge(Edge edge) {
         Objects.requireNonNull(edge);
         String svgId = edge.getDiagramId();
-        if (diagramIdFunction.isPresent()) {
-            svgId = diagramIdFunction.get().apply(svgId);
+        if (diagramIdFunction != null) {
+            svgId = diagramIdFunction.apply(svgId);
         }
         edgeIdByDiagramId.put(svgId, edge.getEquipmentId());
     }

diff --git a/src/main/java/com/powsybl/nad/svg/SvgWriter.java b/src/main/java/com/powsybl/nad/svg/SvgWriter.java
@@ -123,7 +123,7 @@ private void drawBranchEdges(Graph graph, XMLStreamWriter writer) throws XMLStre
         writer.writeAttribute(CLASS_ATTRIBUTE, StyleProvider.BRANCH_EDGES_CLASS);
         for (BranchEdge edge : graph.getBranchEdges()) {
             writer.writeStartElement(GROUP_ELEMENT_NAME);
-            writer.writeAttribute(ID_ATTRIBUTE, getIdAttribute(edge.getDiagramId()));
+            writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(edge.getDiagramId()));
             addStylesIfAny(writer, styleProvider.getEdgeStyleClasses(edge));
             insertName(writer, edge::getName);
 
@@ -221,7 +221,7 @@ private void drawThreeWtEdge(Graph graph, XMLStreamWriter writer, ThreeWtEdge ed
             return;
         }
         writer.writeStartElement(GROUP_ELEMENT_NAME);
-        writer.writeAttribute(ID_ATTRIBUTE, getIdAttribute(edge.getDiagramId()));
+        writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(edge.getDiagramId()));
         addStylesIfAny(writer, styleProvider.getEdgeStyleClasses(edge));
         insertName(writer, edge::getName);
         writer.writeEmptyElement(POLYLINE_ELEMENT_NAME);
@@ -433,7 +433,7 @@ private void writeTextNode(XMLStreamWriter writer, TextNode textNode, List<Strin
     }
 
     private void drawNode(Graph graph, XMLStreamWriter writer, VoltageLevelNode vlNode) throws XMLStreamException {
-        writer.writeAttribute(ID_ATTRIBUTE, getIdAttribute(vlNode.getDiagramId()));
+        writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(vlNode.getDiagramId()));
         addStylesIfAny(writer, styleProvider.getNodeStyleClasses(vlNode));
         insertName(writer, vlNode::getName);
 
@@ -458,7 +458,7 @@ private void drawNode(Graph graph, XMLStreamWriter writer, VoltageLevelNode vlNo
                 writer.writeEmptyElement(PATH_ELEMENT_NAME);
                 writer.writeAttribute(PATH_D_ATTRIBUTE, getFragmentedAnnulusPath(busInnerRadius, busOuterRadius, traversingBusEdges, graph, vlNode, busNode));
             }
-            writer.writeAttribute(ID_ATTRIBUTE, getIdAttribute(busNode.getDiagramId()));
+            writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(busNode.getDiagramId()));
             addStylesIfAny(writer, styleProvider.getNodeStyleClasses(busNode));
             busInnerRadius = busOuterRadius;
             traversingBusEdges.addAll(graph.getBusEdges(busNode));
@@ -572,7 +572,7 @@ private void drawTextEdges(Graph graph, XMLStreamWriter writer) throws XMLStream
 
     private void drawTextEdge(XMLStreamWriter writer, TextEdge edge, VoltageLevelNode vlNode) throws XMLStreamException {
         writer.writeEmptyElement(POLYLINE_ELEMENT_NAME);
-        writer.writeAttribute(ID_ATTRIBUTE, getIdAttribute(edge.getDiagramId()));
+        writer.writeAttribute(ID_ATTRIBUTE, getPrefixedId(edge.getDiagramId()));
         addStylesIfAny(writer, styleProvider.getEdgeStyleClasses(edge));
         List<Point> points = edge.getPoints();
         shiftEdgeStart(points, vlNode);
@@ -660,7 +660,7 @@ private void addStyle(XMLStreamWriter writer) throws XMLStreamException {
     }
 
     private void addMetadata(Graph graph, XMLStreamWriter writer) throws XMLStreamException {
-        GraphMetadata metadata = new GraphMetadata(graph.getNodesStream(), graph.getEdgesStream(), this::getIdAttribute);
+        GraphMetadata metadata = new GraphMetadata(graph.getNodesStream(), graph.getEdgesStream(), this::getPrefixedId);
         metadata.writeXml(writer);
     }
 
@@ -705,7 +705,7 @@ public static double getBusAnnulusOuterRadius(BusNode node, VoltageLevelNode vlN
         return (node.getIndex() + 1) * unitaryRadius;
     }
 
-    public String getIdAttribute(String id) {
+    public String getPrefixedId(String id) {
         return svgParameters.getSvgPrefix() + id;
     }
 }