Indentation

single-line-diagram-core/src/main/java/com/powsybl/sld/library/ResourcesComponentLibrary.java

@@ -11,7 +11,12 @@
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URL;
@@ -66,14 +71,8 @@ private void loadLibrary(String directory, StringBuilder styleSheetBuilder) {
                 String resourceName = directory + "/" + s.getFileName();
                 LOGGER.debug("Reading subComponent {}", resourceName);
                 SVGOMDocument doc = svgLoadDoc.read(resourceName);
-                Map<String, SVGOMDocument> mapSubDoc;
-                if (!svgDocuments.containsKey(componentType)) {
-                    mapSubDoc = new TreeMap<>();
-                    svgDocuments.put(componentType, mapSubDoc);
-                } else {
-                    mapSubDoc = svgDocuments.get(componentType);
-                }
-                mapSubDoc.put(s.getName(), doc);
+                cleanEmptyTextNodes(doc, resourceName);
+                svgDocuments.computeIfAbsent(componentType, k -> new TreeMap<>()).put(s.getName(), doc);
             });
             components.put(componentType, c);
         });
@@ -86,6 +85,22 @@ private void loadLibrary(String directory, StringBuilder styleSheetBuilder) {
         }
     }
 
+    private static void cleanEmptyTextNodes(Node parentNode, String resourceName) {
+        try {
+            // Find empty text nodes
+            NodeList nl = (NodeList) XPathFactory.newInstance().newXPath()
+                .evaluate("//text()[normalize-space(.)='']", parentNode, XPathConstants.NODESET);
+
+            // Remove the found nodes
+            for (int i = 0; i < nl.getLength(); ++i) {
+                Node node = nl.item(i);
+                node.getParentNode().removeChild(node);
+            }
+        } catch (XPathExpressionException e) {
+            LOGGER.warn("Exception occurred while cleaning the subcomponent {} from empty text nodes", resourceName);
+        }
+    }
+
     @Override
     public Map<String, SVGOMDocument> getSvgDocument(String type) {
         Objects.requireNonNull(type);

single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java

@@ -731,10 +731,8 @@ private void insertClonedSubcomponent(Element g, BiConsumer<Element, String> ele
         for (int i = 0; i < subComponentChildren.getLength(); i++) {
             org.w3c.dom.Node n = subComponentChildren.item(i).cloneNode(true);
             if (n instanceof Element) {
-                elementAttributesSetter.accept((Element) n, subComponentName);
+                setAttributesAndInsertElement(g, elementAttributesSetter, subComponentName, (Element) n);
             }
-            g.getOwnerDocument().adoptNode(n);
-            g.appendChild(n);
         }
     }