X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fxml%2FXmlNormalizer.java;h=42923997d11a04cbf82aa4daf15798b3b074d5d7;hb=7daff2134fd8e6250e84ab5bb3c1a47debdad549;hp=c3cc26cf21448135f2d09685717e08c8c241c56c;hpb=e3db2eba9a7f8380a6f76d7b0e6cd4825e91893e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/xml/XmlNormalizer.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/XmlNormalizer.java
index c3cc26cf2..42923997d 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/xml/XmlNormalizer.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/XmlNormalizer.java
@@ -4,8 +4,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -15,11 +13,13 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
@@ -33,10 +33,12 @@ import org.xml.sax.SAXException;
  * versioning system).
  */
 public class XmlNormalizer {
-	private final static Logger logger = System.getLogger(XmlNormalizer.class.getName());
+//	private final static Logger logger = System.getLogger(XmlNormalizer.class.getName());
 
 	private DocumentBuilder documentBuilder;
-	private Transformer transformer;
+	private TransformerFactory transformerFactory;
+
+	private DOMSource stripSpaceXsl;
 
 	public XmlNormalizer() {
 		this(2);
@@ -45,12 +47,14 @@ public class XmlNormalizer {
 	public XmlNormalizer(int indent) {
 		try {
 			documentBuilder = DocumentBuilderFactory.newNSInstance().newDocumentBuilder();
-			TransformerFactory transformerFactory = TransformerFactory.newInstance();
+			transformerFactory = TransformerFactory.newInstance();
 			transformerFactory.setAttribute("indent-number", indent);
 			try (InputStream in = XmlNormalizer.class.getResourceAsStream("stripSpaces.xsl")) {
-				transformer = transformerFactory.newTransformer(new StreamSource(in));
+				DOMResult result = new DOMResult();
+				transformerFactory.newTransformer().transform(new StreamSource(in), result);
+				stripSpaceXsl = new DOMSource(result.getNode());
 			}
-		} catch (TransformerConfigurationException | ParserConfigurationException | TransformerFactoryConfigurationError
+		} catch (ParserConfigurationException | TransformerFactoryConfigurationError | TransformerException
 				| IOException e) {
 			throw new IllegalStateException("Cannot initialise document builder and transformer", e);
 		}
@@ -67,15 +71,24 @@ public class XmlNormalizer {
 		try (ByteArrayInputStream in = new ByteArrayInputStream(bytes);
 				OutputStream out = Files.newOutputStream(path)) {
 			normalizeAndIndent(in, out);
-			logger.log(Level.DEBUG, () -> "Normalized XML " + path);
+//			logger.log(Level.DEBUG, () -> "Normalized XML " + path);
 		}
 	}
 
-	public void normalizeAndIndent(InputStream in, OutputStream out) throws IOException {
-		normalizeAndIndent(in, out, 2);
+	public void normalizeAndIndent(Source source, Result result) {
+		try {
+			Transformer transformer = transformerFactory.newTransformer(stripSpaceXsl);
+			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+			// transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+
+			transformer.transform(source, result);
+		} catch (TransformerException e) {
+			throw new RuntimeException("Cannot strip space from " + source, e);
+		}
 	}
 
-	public void normalizeAndIndent(InputStream in, OutputStream out, int indent) throws IOException {
+	public void normalizeAndIndent(InputStream in, OutputStream out) throws IOException {
 		try {
 			Document document = documentBuilder.parse(in);
 
@@ -90,17 +103,21 @@ public class XmlNormalizer {
 //				node.getParentNode().removeChild(node);
 //			}
 
-			transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-			// transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-
-			transformer.transform(new DOMSource(document), new StreamResult(out));
-		} catch (DOMException | IllegalArgumentException | SAXException | TransformerFactoryConfigurationError
-				| TransformerException e) {
+			normalizeAndIndent(new DOMSource(document), new StreamResult(out));
+		} catch (DOMException | IllegalArgumentException | SAXException | TransformerFactoryConfigurationError e) {
 			throw new RuntimeException("Cannot normalise and indent XML", e);
 		}
 	}
 
+	public static void print(Source source, int indent) {
+		XmlNormalizer xmlNormalizer = new XmlNormalizer(indent);
+		xmlNormalizer.normalizeAndIndent(source, new StreamResult(System.out));
+	}
+
+	public static void print(Source source) {
+		print(source, 2);
+	}
+
 	public static void main(String[] args) throws IOException {
 		Path dir = Paths.get(args[0]);
 		XmlNormalizer xmlNormalizer = new XmlNormalizer();