feat: update Saxon library to v11.4

rdeltour · rdeltour · commit ef2697e8b690 · 2022-12-09T11:23:02.000+01:00
This commit updates the Saxon-HE dependency to version 11.4. It refactors the Saxon-related code as follows: - update the function+registration code to the latest API changes - extract the Saxon schema reader factory (used by Jing) in its own class - the Saxon schema reader factory is made available to Jing via the SPI mechanism (declared in `META-INF/services/com.thaiopensource.validate.SchemaReaderFactory`). This notably allows Jing to find and use our factory for both Schematron and NVDL. - the Saxon schema reader factory no longer extends Jing's `NewSaxonSchemaReaderFactory`, which set the feature "XSLT_VERSION" to "2.0" and caused a Warning to be issued by Saxon 11. Fix #1341
diff --git a/pom.xml b/pom.xml
@@ -178,7 +178,7 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-            <version>9.8.0-8</version>
+            <version>11.4</version>
         </dependency>
         <dependency>
             <groupId>nu.validator</groupId>
@@ -368,7 +368,7 @@
                 <configuration>
                     <instructions>
                         <Import-Package>
-                            net.sf.saxon.*;version="[9.8.0,9.8.1)",
+                            net.sf.saxon.*;version="[11.4.0,11.4.1)",
                             *
                         </Import-Package>
                         <Automatic-Module-Name>org.w3c.epubcheck</Automatic-Module-Name>
@@ -444,7 +444,7 @@
                     <dependency>
                         <groupId>net.sf.saxon</groupId>
                         <artifactId>Saxon-HE</artifactId>
-                        <version>9.4</version>
+                        <version>11.4</version>
                     </dependency>
                 </dependencies>
             </plugin>
diff --git a/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java b/src/main/java/com/adobe/epubcheck/xml/XMLValidator.java
@@ -28,11 +28,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import javax.xml.transform.TransformerFactory;
-
-import org.idpf.epubcheck.util.saxon.ColumnNumberFunction;
-import org.idpf.epubcheck.util.saxon.LineNumberFunction;
-import org.idpf.epubcheck.util.saxon.SystemIdFunction;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -48,16 +43,7 @@
 import com.thaiopensource.validate.SchemaReader;
 import com.thaiopensource.validate.ValidateProperty;
 import com.thaiopensource.validate.auto.AutoSchemaReader;
-import com.thaiopensource.validate.auto.SchemaReaderFactorySchemaReceiverFactory;
 import com.thaiopensource.validate.rng.CompactSchemaReader;
-import com.thaiopensource.validate.schematron.NewSaxonSchemaReaderFactory;
-
-import net.sf.saxon.Configuration;
-import net.sf.saxon.TransformerFactoryImpl;
-import net.sf.saxon.sxpath.IndependentContext;
-import net.sf.saxon.sxpath.XPathStaticContext;
-import net.sf.saxon.trans.SymbolicName;
-
 
 public class XMLValidator
 {
@@ -84,19 +70,19 @@ public static BasicResolver getInstance()
       return theInstance;
     }
 
-    public void resolve(Identifier id, Input input) throws
-        IOException,
-        ResolverException
+    public void resolve(Identifier id, Input input)
+      throws IOException,
+      ResolverException
     {
       if (!input.isResolved())
       {
         input.setUri(resolveUri(id));
       }
     }
 
-    public void open(Input input) throws
-        IOException,
-        ResolverException
+    public void open(Input input)
+      throws IOException,
+      ResolverException
     {
       if (!input.isUriDefinitive())
       {
@@ -106,8 +92,7 @@ public void open(Input input) throws
       try
       {
         uri = new URI(input.getUri());
-      }
-      catch (URISyntaxException e)
+      } catch (URISyntaxException e)
       {
         throw new ResolverException(e);
       }
@@ -122,8 +107,8 @@ public void open(Input input) throws
       input.setByteStream(url.openStream());
     }
 
-    public static String resolveUri(Identifier id) throws
-        ResolverException
+    public static String resolveUri(Identifier id)
+      throws ResolverException
     {
       try
       {
@@ -153,74 +138,40 @@ public static String resolveUri(Identifier id) throws
         }
 
         return uriRef;
-      }
-      catch (URISyntaxException e)
+      } catch (URISyntaxException e)
       {
         throw new ResolverException(e);
-      }
-      catch (MalformedURLException e)
+      } catch (MalformedURLException e)
       {
         throw new ResolverException(e);
       }
     }
   }
 
-  /**
-   * Extends Jing's Saxon 9 schema reader factory by registering
-   * extension functions.
-   */
-  static public class ExtendedSaxonSchemaReaderFactory extends NewSaxonSchemaReaderFactory
-  {
-    public void initTransformerFactory(TransformerFactory factory)
-    {
-      super.initTransformerFactory(factory);
-      SymbolicName.F lineNumberFn = new SymbolicName.F(LineNumberFunction.QNAME, 0);
-      SymbolicName.F columnNumberFn = new SymbolicName.F(ColumnNumberFunction.QNAME, 0);
-      SymbolicName.F systemIdFn = new SymbolicName.F(SystemIdFunction.QNAME, 0);
-      if (factory instanceof TransformerFactoryImpl)
-      {
-        Configuration configuration = ((TransformerFactoryImpl) factory).getConfiguration();
-        XPathStaticContext xpathContext = new IndependentContext(configuration);
-        if (!xpathContext.getFunctionLibrary().isAvailable(lineNumberFn))
-        {
-          configuration.registerExtensionFunction(new LineNumberFunction());
-        }
-        if (!xpathContext.getFunctionLibrary().isAvailable(columnNumberFn))
-        {
-          configuration.registerExtensionFunction(new ColumnNumberFunction());
-        }
-        if (!xpathContext.getFunctionLibrary().isAvailable(systemIdFn))
-        {
-          configuration.registerExtensionFunction(new SystemIdFunction());
-        }
-      }
-    }
-  }
-
   // handles errors in schemas
   private class ErrorHandlerImpl implements ErrorHandler
   {
 
-    public void error(SAXParseException exception) throws
-        SAXException
+    public void error(SAXParseException exception)
+      throws SAXException
     {
       exception.printStackTrace();
     }
 
-    public void fatalError(SAXParseException exception) throws
-        SAXException
+    public void fatalError(SAXParseException exception)
+      throws SAXException
     {
       exception.printStackTrace();
     }
 
-    public void warning(SAXParseException exception) throws
-        SAXException
+    public void warning(SAXParseException exception)
+      throws SAXException
     {
       exception.printStackTrace();
     }
 
   }
-  
+
   public XMLValidator(String schemaName, boolean isNormative)
   {
     this.isNormative = isNormative;
@@ -245,36 +196,31 @@ public XMLValidator(String schemaName, boolean isNormative)
       if (schemaName.endsWith(".rnc"))
       {
         schemaReader = CompactSchemaReader.getInstance();
-			} else if (schemaName.endsWith(".sch")) {
-				schemaReader = new AutoSchemaReader(
-						new SchemaReaderFactorySchemaReceiverFactory(
-  								new ExtendedSaxonSchemaReaderFactory()));
       }
       else
       {
-
         schemaReader = new AutoSchemaReader();
       }
 
       schema = schemaReader.createSchema(schemaSource,
           mapBuilder.toPropertyMap());
-    }
-    catch (RuntimeException e)
+    } catch (RuntimeException e)
     {
       throw e;
-    }
-    catch (Exception e)
+    } catch (Exception e)
     {
       e.printStackTrace();
       throw new Error("Internal error: " + e + " " + schemaName);
     }
   }
-  
-  public Schema getSchema() {
+
+  public Schema getSchema()
+  {
     return schema;
   }
-  
-  public boolean isNormative() {
+
+  public boolean isNormative()
+  {
     return isNormative;
   }
 }
diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/ColumnNumberFunction.java b/src/main/java/org/idpf/epubcheck/util/saxon/ColumnNumberFunction.java
@@ -13,8 +13,6 @@
 public class ColumnNumberFunction extends ExtensionFunctionDefinition
 {
 
-  private static final long serialVersionUID = -4202710868367933385L;
-
   public static StructuredQName QNAME = new StructuredQName("saxon", "https://saxon.sf.net/", "column-number");
 
   @Override
@@ -64,9 +62,7 @@ public ExtensionFunctionCall makeCallExpression()
   {
     return new ExtensionFunctionCall()
     {
-      private static final long serialVersionUID = -4202710868367933385L;
-
-      public Sequence call(XPathContext context, @SuppressWarnings("rawtypes") Sequence[] arguments) throws XPathException
+      public Sequence call(XPathContext context, Sequence[] arguments) throws XPathException
       {
         if (context.getContextItem() instanceof NodeInfo)
         {
diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java b/src/main/java/org/idpf/epubcheck/util/saxon/Int64ValueSequence.java
@@ -3,7 +3,6 @@
 import net.sf.saxon.om.Item;
 import net.sf.saxon.om.Sequence;
 import net.sf.saxon.om.SequenceIterator;
-import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.Int64Value;
 
 class Int64ValueSequence implements Sequence
@@ -21,8 +20,7 @@ public Item head()
   }
 
   @Override
-  public SequenceIterator iterate() throws
-      XPathException
+  public SequenceIterator iterate()
   {
     return item.iterate();
   }
diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/LineNumberFunction.java b/src/main/java/org/idpf/epubcheck/util/saxon/LineNumberFunction.java
@@ -13,8 +13,6 @@
 public class LineNumberFunction extends ExtensionFunctionDefinition
 {
 
-  private static final long serialVersionUID = -4202710868367933385L;
-
   public static StructuredQName QNAME = new StructuredQName("saxon", "https://saxon.sf.net/", "line-number");
 
   @Override
@@ -65,9 +63,7 @@ public ExtensionFunctionCall makeCallExpression()
     return new ExtensionFunctionCall()
     {
 
-      private static final long serialVersionUID = -4202710868367933385L;
-
-      public Sequence call(XPathContext context, @SuppressWarnings("rawtypes") Sequence[] arguments) throws XPathException
+      public Sequence call(XPathContext context, Sequence[] arguments) throws XPathException
       {
         if (context.getContextItem() instanceof NodeInfo)
         {
diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/SaxonSchemaReaderFactory.java b/src/main/java/org/idpf/epubcheck/util/saxon/SaxonSchemaReaderFactory.java
@@ -0,0 +1,55 @@
+package org.idpf.epubcheck.util.saxon;
+
+import javax.xml.transform.TransformerFactory;
+
+import com.thaiopensource.validate.schematron.SchematronSchemaReaderFactory;
+
+import net.sf.saxon.Configuration;
+import net.sf.saxon.TransformerFactoryImpl;
+import net.sf.saxon.lib.ErrorReporter;
+import net.sf.saxon.lib.FeatureKeys;
+import net.sf.saxon.s9api.XmlProcessingError;
+import net.sf.saxon.sxpath.IndependentContext;
+import net.sf.saxon.sxpath.XPathStaticContext;
+import net.sf.saxon.trans.SymbolicName;
+
+public class SaxonSchemaReaderFactory extends SchematronSchemaReaderFactory
+{
+  public void initTransformerFactory(TransformerFactory factory)
+  {
+    super.initTransformerFactory(factory);
+    factory.setAttribute(FeatureKeys.LINE_NUMBERING, Boolean.TRUE);
+    SymbolicName.F lineNumberFn = new SymbolicName.F(LineNumberFunction.QNAME, 0);
+    SymbolicName.F columnNumberFn = new SymbolicName.F(ColumnNumberFunction.QNAME, 0);
+    SymbolicName.F systemIdFn = new SymbolicName.F(SystemIdFunction.QNAME, 0);
+    if (factory instanceof TransformerFactoryImpl)
+    {
+      Configuration configuration = ((TransformerFactoryImpl) factory).getConfiguration();
+      configuration.setErrorReporterFactory(config -> {
+        return new ErrorReporter()
+        {
+
+          @Override
+          public void report(XmlProcessingError error)
+          {
+            System.out.println(error.getMessage());
+
+          }
+        };
+      });
+      XPathStaticContext xpathContext = new IndependentContext(configuration);
+      if (!xpathContext.getFunctionLibrary().isAvailable(lineNumberFn, 20))
+      {
+        configuration.registerExtensionFunction(new LineNumberFunction());
+      }
+      if (!xpathContext.getFunctionLibrary().isAvailable(columnNumberFn, 20))
+      {
+        configuration.registerExtensionFunction(new ColumnNumberFunction());
+      }
+      if (!xpathContext.getFunctionLibrary().isAvailable(systemIdFn, 20))
+      {
+        configuration.registerExtensionFunction(new SystemIdFunction());
+      }
+    }
+  }
+}
diff --git a/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java b/src/main/java/org/idpf/epubcheck/util/saxon/SystemIdFunction.java
@@ -5,8 +5,8 @@
 import net.sf.saxon.lib.ExtensionFunctionDefinition;
 import net.sf.saxon.om.Item;
 import net.sf.saxon.om.NodeInfo;
-import net.sf.saxon.om.SequenceIterator;
 import net.sf.saxon.om.Sequence;
+import net.sf.saxon.om.SequenceIterator;
 import net.sf.saxon.om.StructuredQName;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.value.AnyURIValue;
@@ -15,8 +15,6 @@
 public class SystemIdFunction extends ExtensionFunctionDefinition
 {
 
-  private static final long serialVersionUID = -4202710868367933385L;
-
   public static StructuredQName QNAME = new StructuredQName("saxon", "https://saxon.sf.net/", "system-id");
 
   @Override
@@ -66,9 +64,7 @@ public ExtensionFunctionCall makeCallExpression()
   {
     return new ExtensionFunctionCall()
     {
-      private static final long serialVersionUID = -4202710868367933385L;
-
-      public Sequence call(XPathContext context, @SuppressWarnings("rawtypes") Sequence[] arguments) throws XPathException
+      public Sequence call(XPathContext context, Sequence[] arguments) throws XPathException
       {
         if (context.getContextItem() instanceof NodeInfo)
         {
@@ -94,8 +90,7 @@ public Item head()
     }
 
     @Override
-    public SequenceIterator iterate() throws
-        XPathException
+    public SequenceIterator iterate()
     {
       return item.iterate();
     }
diff --git a/src/main/resources/META-INF/services/com.thaiopensource.validate.SchemaReaderFactory b/src/main/resources/META-INF/services/com.thaiopensource.validate.SchemaReaderFactory
@@ -0,0 +1 @@
+org.idpf.epubcheck.util.saxon.SaxonSchemaReaderFactory

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,6 @@`
`28`	`28`	`import java.net.URISyntaxException;`
`29`	`29`	`import java.net.URL;`
`30`	`30`
`31`		`-import javax.xml.transform.TransformerFactory;`
`32`		`-`
`33`		`-import org.idpf.epubcheck.util.saxon.ColumnNumberFunction;`
`34`		`-import org.idpf.epubcheck.util.saxon.LineNumberFunction;`
`35`		`-import org.idpf.epubcheck.util.saxon.SystemIdFunction;`
`36`	`31`	`import org.xml.sax.ErrorHandler;`
`37`	`32`	`import org.xml.sax.InputSource;`
`38`	`33`	`import org.xml.sax.SAXException;`
`@@ -48,16 +43,7 @@`
`48`	`43`	`import com.thaiopensource.validate.SchemaReader;`
`49`	`44`	`import com.thaiopensource.validate.ValidateProperty;`
`50`	`45`	`import com.thaiopensource.validate.auto.AutoSchemaReader;`
`51`		`-import com.thaiopensource.validate.auto.SchemaReaderFactorySchemaReceiverFactory;`
`52`	`46`	`import com.thaiopensource.validate.rng.CompactSchemaReader;`
`53`		`-import com.thaiopensource.validate.schematron.NewSaxonSchemaReaderFactory;`
`54`		`-`
`55`		`-import net.sf.saxon.Configuration;`
`56`		`-import net.sf.saxon.TransformerFactoryImpl;`
`57`		`-import net.sf.saxon.sxpath.IndependentContext;`
`58`		`-import net.sf.saxon.sxpath.XPathStaticContext;`
`59`		`-import net.sf.saxon.trans.SymbolicName;`
`60`		`-`
`61`	`47`
`62`	`48`	`public class XMLValidator`
`63`	`49`	`{`
`@@ -84,19 +70,19 @@ public static BasicResolver getInstance()`
`84`	`70`	`return theInstance;`
`85`	`71`	`}`
`86`	`72`
`87`		`- public void resolve(Identifier id, Input input) throws`
`88`		`- IOException,`
`89`		`- ResolverException`
	`73`	`+ public void resolve(Identifier id, Input input)`
	`74`	`+ throws IOException,`
	`75`	`+ ResolverException`
`90`	`76`	`{`
`91`	`77`	`if (!input.isResolved())`
`92`	`78`	`{`
`93`	`79`	`input.setUri(resolveUri(id));`
`94`	`80`	`}`
`95`	`81`	`}`
`96`	`82`
`97`		`- public void open(Input input) throws`
`98`		`- IOException,`
`99`		`- ResolverException`
	`83`	`+ public void open(Input input)`
	`84`	`+ throws IOException,`
	`85`	`+ ResolverException`
`100`	`86`	`{`
`101`	`87`	`if (!input.isUriDefinitive())`
`102`	`88`	`{`
`@@ -106,8 +92,7 @@ public void open(Input input) throws`
`106`	`92`	`try`
`107`	`93`	`{`
`108`	`94`	`uri = new URI(input.getUri());`
`109`		`- }`
`110`		`- catch (URISyntaxException e)`
	`95`	`+ } catch (URISyntaxException e)`
`111`	`96`	`{`
`112`	`97`	`throw new ResolverException(e);`
`113`	`98`	`}`
`@@ -122,8 +107,8 @@ public void open(Input input) throws`
`122`	`107`	`input.setByteStream(url.openStream());`
`123`	`108`	`}`
`124`	`109`
`125`		`- public static String resolveUri(Identifier id) throws`
`126`		`- ResolverException`
	`110`	`+ public static String resolveUri(Identifier id)`
	`111`	`+ throws ResolverException`
`127`	`112`	`{`
`128`	`113`	`try`
`129`	`114`	`{`
`@@ -153,74 +138,40 @@ public static String resolveUri(Identifier id) throws`
`153`	`138`	`}`
`154`	`139`
`155`	`140`	`return uriRef;`
`156`		`- }`
`157`		`- catch (URISyntaxException e)`
	`141`	`+ } catch (URISyntaxException e)`
`158`	`142`	`{`
`159`	`143`	`throw new ResolverException(e);`
`160`		`- }`
`161`		`- catch (MalformedURLException e)`
	`144`	`+ } catch (MalformedURLException e)`
`162`	`145`	`{`
`163`	`146`	`throw new ResolverException(e);`
`164`	`147`	`}`
`165`	`148`	`}`
`166`	`149`	`}`
`167`	`150`
`168`		`- /**`
`169`		`- * Extends Jing's Saxon 9 schema reader factory by registering`
`170`		`- * extension functions.`
`171`		`- */`
`172`		`- static public class ExtendedSaxonSchemaReaderFactory extends NewSaxonSchemaReaderFactory`
`173`		`- {`
`174`		`- public void initTransformerFactory(TransformerFactory factory)`
`175`		`- {`
`176`		`- super.initTransformerFactory(factory);`
`177`		`- SymbolicName.F lineNumberFn = new SymbolicName.F(LineNumberFunction.QNAME, 0);`
`178`		`- SymbolicName.F columnNumberFn = new SymbolicName.F(ColumnNumberFunction.QNAME, 0);`
`179`		`- SymbolicName.F systemIdFn = new SymbolicName.F(SystemIdFunction.QNAME, 0);`
`180`		`- if (factory instanceof TransformerFactoryImpl)`
`181`		`- {`
`182`		`- Configuration configuration = ((TransformerFactoryImpl) factory).getConfiguration();`
`183`		`- XPathStaticContext xpathContext = new IndependentContext(configuration);`
`184`		`- if (!xpathContext.getFunctionLibrary().isAvailable(lineNumberFn))`
`185`		`- {`
`186`		`- configuration.registerExtensionFunction(new LineNumberFunction());`
`187`		`- }`
`188`		`- if (!xpathContext.getFunctionLibrary().isAvailable(columnNumberFn))`
`189`		`- {`
`190`		`- configuration.registerExtensionFunction(new ColumnNumberFunction());`
`191`		`- }`
`192`		`- if (!xpathContext.getFunctionLibrary().isAvailable(systemIdFn))`
`193`		`- {`
`194`		`- configuration.registerExtensionFunction(new SystemIdFunction());`
`195`		`- }`
`196`		`- }`
`197`		`- }`
`198`		`- }`
`199`		`-`
`200`	`151`	`// handles errors in schemas`
`201`	`152`	`private class ErrorHandlerImpl implements ErrorHandler`
`202`	`153`	`{`
`203`	`154`
`204`		`- public void error(SAXParseException exception) throws`
`205`		`- SAXException`
	`155`	`+ public void error(SAXParseException exception)`
	`156`	`+ throws SAXException`
`206`	`157`	`{`
`207`	`158`	`exception.printStackTrace();`
`208`	`159`	`}`
`209`	`160`
`210`		`- public void fatalError(SAXParseException exception) throws`
`211`		`- SAXException`
	`161`	`+ public void fatalError(SAXParseException exception)`
	`162`	`+ throws SAXException`
`212`	`163`	`{`
`213`	`164`	`exception.printStackTrace();`
`214`	`165`	`}`
`215`	`166`
`216`		`- public void warning(SAXParseException exception) throws`
`217`		`- SAXException`
	`167`	`+ public void warning(SAXParseException exception)`
	`168`	`+ throws SAXException`
`218`	`169`	`{`
`219`	`170`	`exception.printStackTrace();`
`220`	`171`	`}`
`221`	`172`
`222`	`173`	`}`
`223`		`-`
	`174`	`+`
`224`	`175`	`public XMLValidator(String schemaName, boolean isNormative)`
`225`	`176`	`{`
`226`	`177`	`this.isNormative = isNormative;`
`@@ -245,36 +196,31 @@ public XMLValidator(String schemaName, boolean isNormative)`
`245`	`196`	`if (schemaName.endsWith(".rnc"))`
`246`	`197`	`{`
`247`	`198`	`schemaReader = CompactSchemaReader.getInstance();`
`248`		`- } else if (schemaName.endsWith(".sch")) {`
`249`		`- schemaReader = new AutoSchemaReader(`
`250`		`- new SchemaReaderFactorySchemaReceiverFactory(`
`251`		`- new ExtendedSaxonSchemaReaderFactory()));`
`252`	`199`	`}`
`253`	`200`	`else`
`254`	`201`	`{`
`255`		`-`
`256`	`202`	`schemaReader = new AutoSchemaReader();`
`257`	`203`	`}`
`258`	`204`
`259`	`205`	`schema = schemaReader.createSchema(schemaSource,`
`260`	`206`	`mapBuilder.toPropertyMap());`
`261`		`- }`
`262`		`- catch (RuntimeException e)`
	`207`	`+ } catch (RuntimeException e)`
`263`	`208`	`{`
`264`	`209`	`throw e;`
`265`		`- }`
`266`		`- catch (Exception e)`
	`210`	`+ } catch (Exception e)`
`267`	`211`	`{`
`268`	`212`	`e.printStackTrace();`
`269`	`213`	`throw new Error("Internal error: " + e + " " + schemaName);`
`270`	`214`	`}`
`271`	`215`	`}`
`272`		`-`
`273`		`- public Schema getSchema() {`
	`216`	`+`
	`217`	`+ public Schema getSchema()`
	`218`	`+ {`
`274`	`219`	`return schema;`
`275`	`220`	`}`
`276`		`-`
`277`		`- public boolean isNormative() {`
	`221`	`+`
	`222`	`+ public boolean isNormative()`
	`223`	`+ {`
`278`	`224`	`return isNormative;`
`279`	`225`	`}`
`280`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`public class ColumnNumberFunction extends ExtensionFunctionDefinition`
`14`	`14`	`{`
`15`	`15`
`16`		`- private static final long serialVersionUID = -4202710868367933385L;`
`17`		`-`
`18`	`16`	`public static StructuredQName QNAME = new StructuredQName("saxon", "https://saxon.sf.net/", "column-number");`
`19`	`17`
`20`	`18`	`@Override`
`@@ -64,9 +62,7 @@ public ExtensionFunctionCall makeCallExpression()`
`64`	`62`	`{`
`65`	`63`	`return new ExtensionFunctionCall()`
`66`	`64`	`{`
`67`		`- private static final long serialVersionUID = -4202710868367933385L;`
`68`		`-`
`69`		`- public Sequence call(XPathContext context, @SuppressWarnings("rawtypes") Sequence[] arguments) throws XPathException`
	`65`	`+ public Sequence call(XPathContext context, Sequence[] arguments) throws XPathException`
`70`	`66`	`{`
`71`	`67`	`if (context.getContextItem() instanceof NodeInfo)`
`72`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`import net.sf.saxon.om.Item;`
`4`	`4`	`import net.sf.saxon.om.Sequence;`
`5`	`5`	`import net.sf.saxon.om.SequenceIterator;`
`6`		`-import net.sf.saxon.trans.XPathException;`
`7`	`6`	`import net.sf.saxon.value.Int64Value;`
`8`	`7`
`9`	`8`	`class Int64ValueSequence implements Sequence`
`@@ -21,8 +20,7 @@ public Item head()`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`@Override`
`24`		`- public SequenceIterator iterate() throws`
`25`		`- XPathException`
	`23`	`+ public SequenceIterator iterate()`
`26`	`24`	`{`
`27`	`25`	`return item.iterate();`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`import net.sf.saxon.lib.ExtensionFunctionDefinition;`
`6`	`6`	`import net.sf.saxon.om.Item;`
`7`	`7`	`import net.sf.saxon.om.NodeInfo;`
`8`		`-import net.sf.saxon.om.SequenceIterator;`
`9`	`8`	`import net.sf.saxon.om.Sequence;`
	`9`	`+import net.sf.saxon.om.SequenceIterator;`
`10`	`10`	`import net.sf.saxon.om.StructuredQName;`
`11`	`11`	`import net.sf.saxon.trans.XPathException;`
`12`	`12`	`import net.sf.saxon.value.AnyURIValue;`
`@@ -15,8 +15,6 @@`
`15`	`15`	`public class SystemIdFunction extends ExtensionFunctionDefinition`
`16`	`16`	`{`
`17`	`17`
`18`		`- private static final long serialVersionUID = -4202710868367933385L;`
`19`		`-`
`20`	`18`	`public static StructuredQName QNAME = new StructuredQName("saxon", "https://saxon.sf.net/", "system-id");`
`21`	`19`
`22`	`20`	`@Override`
`@@ -66,9 +64,7 @@ public ExtensionFunctionCall makeCallExpression()`
`66`	`64`	`{`
`67`	`65`	`return new ExtensionFunctionCall()`
`68`	`66`	`{`
`69`		`- private static final long serialVersionUID = -4202710868367933385L;`
`70`		`-`
`71`		`- public Sequence call(XPathContext context, @SuppressWarnings("rawtypes") Sequence[] arguments) throws XPathException`
	`67`	`+ public Sequence call(XPathContext context, Sequence[] arguments) throws XPathException`
`72`	`68`	`{`
`73`	`69`	`if (context.getContextItem() instanceof NodeInfo)`
`74`	`70`	`{`
`@@ -94,8 +90,7 @@ public Item head()`
`94`	`90`	`}`
`95`	`91`
`96`	`92`	`@Override`
`97`		`- public SequenceIterator iterate() throws`
`98`		`- XPathException`
	`93`	`+ public SequenceIterator iterate()`
`99`	`94`	`{`
`100`	`95`	`return item.iterate();`
`101`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.idpf.epubcheck.util.saxon.SaxonSchemaReaderFactory`