fix(#185): remove synchronization in XSLDocument

maxonfjvipon · maxonfjvipon · commit 6c093bc541d0 · 2024-10-29T12:35:52.000+03:00
diff --git a/src/main/java/com/jcabi/xml/XSLDocument.java b/src/main/java/com/jcabi/xml/XSLDocument.java
@@ -107,18 +107,6 @@ public final class XSLDocument implements XSL {
         XSL.class.getResourceAsStream("strip.xsl")
     );
 
-    /**
-     * DOM document builder factory.
-     */
-    private static final DocumentBuilderFactory DFACTORY =
-        DocumentBuilderFactory.newInstance();
-
-    /**
-     * Transformer factory.
-     */
-    private static final TransformerFactory TFACTORY =
-        TransformerFactory.newInstance();
-
     /**
      * XSL document.
      */
@@ -402,16 +390,15 @@ public String toString() {
 
     @Override
     public XML transform(final XML xml) {
+        final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         final DocumentBuilder builder;
         try {
-            synchronized (XSLDocument.DFACTORY) {
-                builder = XSLDocument.DFACTORY.newDocumentBuilder();
-            }
+            builder = factory.newDocumentBuilder();
         } catch (final ParserConfigurationException ex) {
             throw new IllegalArgumentException(
                 String.format(
                     "Failed to create new XML document by %s",
-                    XSLDocument.DFACTORY.getClass().getName()
+                    factory.getClass().getName()
                 ),
                 ex
             );
@@ -446,17 +433,15 @@ public String applyTo(final XML xml) {
      * @param xml XML
      * @param result Result
      * @since 0.11
-     * @link <a href="https://stackoverflow.com/questions/4695489">Relevant SO question</a>
+     * @link https://stackoverflow.com/questions/4695489/capture-xslmessage-output-in-java
      */
     private void transformInto(final XML xml, final Result result) {
         final Transformer trans = this.transformer();
         final ConsoleErrorListener errors = new ConsoleErrorListener();
         trans.setErrorListener(errors);
         final long start = System.nanoTime();
         try {
-            synchronized (XSLDocument.DFACTORY) {
-                trans.transform(new DOMSource(xml.node()), result);
-            }
+            trans.transform(new DOMSource(xml.node()), result);
         } catch (final TransformerException ex) {
             final StringBuilder summary = new StringBuilder(
                 String.join("; ", errors.summary())
@@ -488,30 +473,26 @@ private void transformInto(final XML xml, final Result result) {
      * @return The transformer
      */
     private Transformer transformer() {
-        synchronized (XSLDocument.TFACTORY) {
-            if (this.cached.get() == null) {
-                XSLDocument.TFACTORY.setURIResolver(this.sources);
-                final Transformer trans;
-                try {
-                    trans = XSLDocument.TFACTORY.newTransformer(
-                        new StreamSource(new StringReader(this.xsl), this.sid)
-                    );
-                } catch (final TransformerConfigurationException ex) {
-                    throw new IllegalArgumentException(
-                        String.format(
-                            "Failed to create transformer by %s",
-                            XSLDocument.TFACTORY.getClass().getName()
-                        ),
-                        ex
-                    );
-                }
-                for (final Map.Entry<String, Object> ent : this.params.entrySet()) {
-                    trans.setParameter(ent.getKey(), ent.getValue());
-                }
-                this.cached.set(XSLDocument.forSaxon(trans));
-            }
+        final TransformerFactory factory = TransformerFactory.newInstance();
+        factory.setURIResolver(this.sources);
+        Transformer trans;
+        try {
+            trans = factory.newTransformer(
+                new StreamSource(new StringReader(this.xsl), this.sid)
+            );
+        } catch (final TransformerConfigurationException ex) {
+            throw new IllegalArgumentException(
+                String.format(
+                    "Failed to create transformer by %s",
+                    factory.getClass().getName()
+                ),
+                ex
+            );
         }
-        return this.cached.get();
+        for (final Map.Entry<String, Object> ent : this.params.entrySet()) {
+            trans.setParameter(ent.getKey(), ent.getValue());
+        }
+        return trans;
     }
 
     /**
