Added a customizer method for #176

phax · Jul 31, 2024 · 1a8464e · 1a8464e
1 parent 98c78a5
commit 1a8464e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/...chematron-api/src/main/java/com/helger/schematron/saxon/SchematronTransformerFactory.java b/...chematron-api/src/main/java/com/helger/schematron/saxon/SchematronTransformerFactory.java
@@ -19,6 +19,7 @@
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Locale;
+import java.util.function.Consumer;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -44,6 +45,8 @@
  * {@link TransformerFactory} before calling the SPI version
  * <code>TransformerFactory.newInstance ()</code>. This is mainly to solve the
  * interoperability issue when using Xalan and Saxon together in the class path.
+ * Also in general, Saxon is always to be preferred to Xalan. Xalan is simply
+ * out of date.
  *
  * @author Philip Helger
  */
@@ -52,15 +55,16 @@ public final class SchematronTransformerFactory
 {
   public static final String SAXON_TRANSFORMER_FACTORY_CLASS = "net.sf.saxon.TransformerFactoryImpl";
   private static final Logger LOGGER = LoggerFactory.getLogger (SchematronTransformerFactory.class);
-  private static final TransformerFactory DEFAULT_FACTORY;
 
-  static
+  private static final class SingletonHolder
   {
-    DEFAULT_FACTORY = createTransformerFactorySaxonFirst (SchematronTransformerFactory.class.getClassLoader (),
-                                                          new LoggingTransformErrorListener (Locale.US),
-                                                          new DefaultTransformURIResolver ());
+    static final TransformerFactory INSTANCE = createTransformerFactorySaxonFirst (SchematronTransformerFactory.class.getClassLoader (),
+                                                                                   new LoggingTransformErrorListener (Locale.US),
+                                                                                   new DefaultTransformURIResolver ());
   }
 
+  private static Consumer <TransformerFactory> s_aFactoryCustomizer;
+
   private SchematronTransformerFactory ()
   {}
 
@@ -71,7 +75,21 @@ private SchematronTransformerFactory ()
   @Nonnull
   public static TransformerFactory getDefaultSaxonFirst ()
   {
-    return DEFAULT_FACTORY;
+    return SingletonHolder.INSTANCE;
+  }
+
+  /**
+   * Set an optional {@link Consumer} that is called for every
+   * {@link TransformerFactory} created by this class. This may e.g. be used, to
+   * add implementation specific configuration. Based on #176.
+   *
+   * @param a
+   *        The consumer to invoke. May be <code>null</code>.
+   * @since 8.0.3
+   */
+  public static void setTransformerFactoryCustomizer (@Nullable final Consumer <TransformerFactory> a)
+  {
+    s_aFactoryCustomizer = a;
   }
 
   /**
@@ -158,6 +176,10 @@ public static TransformerFactory createTransformerFactorySaxonFirst (@Nullable f
     if (aURIResolver != null)
       aFactory.setURIResolver (aURIResolver);
 
+    // Call the customizer
+    if (s_aFactoryCustomizer != null)
+      s_aFactoryCustomizer.accept (aFactory);
+
     if (LOGGER.isDebugEnabled ())
       LOGGER.debug ("Created TransformerFactory is " + aFactory);
 

diff --git a/...ematron-xslt/src/main/java/com/helger/schematron/xslt/SchematronProviderXSLTPrebuild.java b/...ematron-xslt/src/main/java/com/helger/schematron/xslt/SchematronProviderXSLTPrebuild.java
@@ -46,6 +46,7 @@
 public class SchematronProviderXSLTPrebuild implements ISchematronXSLTBasedProvider
 {
   private static final Logger LOGGER = LoggerFactory.getLogger (SchematronProviderXSLTPrebuild.class);
+
   private Document m_aSchematronXSLTDoc;
   private Templates m_aSchematronXSLTTemplates;