Merge pull request #3 from maxprograms-com/Java25

rmraya · web-flow · commit e832a97f1198 · 2026-06-22T05:50:18.000-03:00
Migration to Java25
diff --git a/README.md b/README.md
@@ -16,10 +16,10 @@ Features in development:
 
 ## Building
 
-You need Java 21 and [Gradle](https://gradle.org/)
+You need Java 25 and [Gradle](https://gradle.org/)
 
 - Clone this repository
-- Point your JAVA_HOME variable to JDK 21
+- Point your JAVA_HOME variable to JDK 25
 - Run `gradle` to compile the source code
 
 ``` text
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
diff --git a/lib/xmljava.jar b/lib/xmljava.jar
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -2,14 +2,14 @@
 sonar.projectKey=XMLJava
 # this is the name displayed in the SonarQube UI
 sonar.projectName=XMLJava
-sonar.projectVersion=4.1.0
+sonar.projectVersion=5.0.0
  
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # Since SonarQube 4.2, this property is optional if sonar.modules is set. 
 # If not set, SonarQube starts looking for source code from the directory containing 
 # the sonar-project.properties file.
 sonar.sources=src
-sonar.java.source=21
+sonar.java.source=25
 sonar.java.binaries=bin
 sonar.java.libraries=lib
 sonar.scm.provider=git
diff --git a/src/com/maxprograms/xml/Catalog.java b/src/com/maxprograms/xml/Catalog.java
@@ -57,7 +57,7 @@ public class Catalog implements EntityResolver2 {
     private Map<String, Catalog> delegateCatalogs;
     private String workDir;
     private String base = "";
-    private String documentParent = "";
+    private final ThreadLocal<String> documentParent = ThreadLocal.withInitial(() -> "");
     private String prefer = "public";
 
     protected Catalog(String catalogFile)
@@ -442,7 +442,7 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S
                 return new InputSource(uri.toURL().openStream());
             }
             return new InputSource(new FileInputStream(uri.toURL().toString()));
-        } catch (URISyntaxException | IllegalArgumentException | NullPointerException e) {
+        } catch (URISyntaxException | IllegalArgumentException | NullPointerException _) {
             // ignore
         }
         if (dtdPublicEntities != null && publicId != null && dtdPublicEntities.containsKey(publicId)) {
@@ -554,7 +554,7 @@ public String matchSystem(String baseURI, String systemId) {
             }
             // this resource is not in catalog.
 
-            if (!documentParent.isEmpty()) {
+            if (!documentParent.get().isEmpty()) {
                 // try to find the file in parent folder
                 File f = new File(systemId);
                 String name = f.getAbsolutePath();
@@ -566,19 +566,19 @@ public String matchSystem(String baseURI, String systemId) {
                         name = f.getName();
                     }
                 }
-                File parent = new File(documentParent);
+                File parent = new File(documentParent.get());
                 File file = new File(parent, name);
                 if (file.exists()) {
                     return file.getAbsolutePath();
                 }
             }
             try {
-                URI u = new URI(baseURI != null ? baseURI : documentParent).resolve(systemId).normalize();
+                URI u = new URI(baseURI != null ? baseURI : documentParent.get()).resolve(systemId).normalize();
                 File file = new File(u.toURL().toString());
                 if (file.exists()) {
                     return file.getAbsolutePath();
                 }
-            } catch (MalformedURLException | URISyntaxException | IllegalArgumentException e) {
+            } catch (MalformedURLException | URISyntaxException | IllegalArgumentException _) {
                 // ignore
             }
         }
@@ -628,15 +628,15 @@ public String matchURI(String uri) {
                 if (u.isAbsolute() && u.toURL().getProtocol().startsWith("file")) {
                     return u.toString();
                 }
-            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException e) {
+            } catch (URISyntaxException | MalformedURLException | IllegalArgumentException _) {
                 // ignore
             }
         }
         return null;
     }
 
     public void currentDocumentBase(String parentFile) {
-        documentParent = parentFile;
+        documentParent.set(parentFile);
     }
 
     public String getDTD(String name) {
@@ -681,7 +681,7 @@ public void parseDTD(String publicId) {
                     EntityDecl entity = it.next();
                     addDtdSystemEntity(entity.getValue(), entity.getSystemId());
                 }
-            } catch (IOException | SAXException e) {
+            } catch (IOException | SAXException _) {
                 // do nothing
                 MessageFormat mf = new MessageFormat(Messages.getString("Catalog.0"));
                 logger.log(Level.WARNING, mf.format(new String[] { publicId }));
diff --git a/src/com/maxprograms/xml/Constants.java b/src/com/maxprograms/xml/Constants.java
@@ -12,8 +12,8 @@
 
 public class Constants {
 
-    public static final String VERSION = "4.2.0";
-    public static final String BUILD = "20260601_1626";
+    public static final String VERSION = "5.0.0";
+    public static final String BUILD = "20260613_1707";
 
     private Constants() {
         // private for security
diff --git a/src/com/maxprograms/xml/CustomContentHandler.java b/src/com/maxprograms/xml/CustomContentHandler.java
@@ -44,6 +44,7 @@ public class CustomContentHandler implements IContentHandler {
 	private String encoding;
 	private Catalog catalog;
 	private boolean isRelaxNG;
+	private static Hashtable<String, Map<String, Map<String, String>>> relaxNgCache = new Hashtable<>();
 	private Map<String, Map<String, String>> defaultAttributes;
 	private File documentBase;
 
@@ -100,7 +101,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
 				}
 			}
 			current = stack.pop();
-		} catch (EmptyStackException es) {
+		} catch (EmptyStackException _) {
 			throw new SAXException(Messages.getString("CustomContentHandler.0"));
 		}
 	}
@@ -215,7 +216,7 @@ public void setDocumentLocator(Locator locator) {
 		}
 		try {
 			documentBase = new File(new URI(sysId)).getParentFile();
-		} catch (Exception e) {
+		} catch (Exception _) {
 			documentBase = new File(sysId).getParentFile();
 		}
 	}
@@ -432,8 +433,13 @@ private void parseRelaxNG(String href) throws SAXException, IOException, ParserC
 			}
 		}
 		if (system != null) {
-			RelaxNGParser relaxngParser = new RelaxNGParser(system, catalog);
-			defaultAttributes = relaxngParser.getElements();
+			synchronized (relaxNgCache) {
+				if (!relaxNgCache.containsKey(system)) {
+					RelaxNGParser relaxngParser = new RelaxNGParser(system, catalog);
+					relaxNgCache.put(system, relaxngParser.getElements());
+				}
+				defaultAttributes = relaxNgCache.get(system);
+			}
 			isRelaxNG = true;
 		}
 	}
diff --git a/src/com/maxprograms/xml/DTDResolver.java b/src/com/maxprograms/xml/DTDResolver.java
@@ -28,7 +28,7 @@ public InputSource resolveEntity(String publicId, String systemId) throws IOExce
 			if (file.exists()) {
 				return new InputSource(new FileInputStream(file));
 			}
-		} catch (URISyntaxException e) {
+		} catch (URISyntaxException _) {
 			// ignore
 		}
 		return null;
diff --git a/src/com/maxprograms/xml/Messages.java b/src/com/maxprograms/xml/Messages.java
@@ -48,7 +48,7 @@ public static String getString(String key) {
                 }
             }
             return props.getProperty(key, '!' + key + '!');
-        } catch (IOException | NullPointerException e) {
+        } catch (IOException | NullPointerException _) {
             return '!' + key + '!';
         }
     }
diff --git a/src/com/maxprograms/xml/RelaxNGParser.java b/src/com/maxprograms/xml/RelaxNGParser.java
@@ -187,7 +187,7 @@ private void nameAttribute(Element e, Map<String, String> context) {
                 nameEl.setAttribute("ns", e.getAttributeValue("ns"));
                 e.removeAttribute("ns");
             } else {
-                String resolvedNs = resolveNamespaceBinding(value, currentContext, isElementPattern, isAttributePattern);
+                String resolvedNs = resolveNamespaceBinding(value, currentContext, isElementPattern);
                 if (resolvedNs != null && !resolvedNs.isEmpty()) {
                     nameEl.setAttribute("ns", resolvedNs);
                 }
@@ -216,8 +216,7 @@ private Map<String, String> augmentNamespaceContext(Map<String, String> base, El
         return updated;
     }
 
-    private String resolveNamespaceBinding(String lexicalName, Map<String, String> context, boolean isElementPattern,
-            boolean isAttributePattern) {
+    private String resolveNamespaceBinding(String lexicalName, Map<String, String> context, boolean isElementPattern) {
         int separatorIndex = lexicalName.indexOf(':');
         if (separatorIndex == -1) {
             if (isElementPattern) {
diff --git a/src/com/maxprograms/xml/SAXBuilder.java b/src/com/maxprograms/xml/SAXBuilder.java
@@ -79,6 +79,10 @@ public Document build(ByteArrayInputStream stream) throws SAXException, IOExcept
 			parser.setFeature("http://apache.org/xml/features/validation/dynamic", true);
 		}
 		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/totalEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxParameterEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxGeneralEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxXMLNameLimit", 0);
 		boolean clearHandler = false;
 		if (contentHandler == null) {
 			contentHandler = new CustomContentHandler();
@@ -145,6 +149,10 @@ public Document build(URL url) throws SAXException, IOException, ParserConfigura
 			parser.setFeature("http://apache.org/xml/features/validation/dynamic", true);
 		}
 		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/totalEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxParameterEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxGeneralEntitySizeLimit", 0);
+		parser.setProperty("http://www.oracle.com/xml/jaxp/properties/maxXMLNameLimit", 0);
 		boolean clearHandler = false;
 		if (contentHandler == null) {
 			contentHandler = new CustomContentHandler();

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`
`5`	`5`	`java {`
`6`	`6`	`toolchain {`
`7`		`- languageVersion = JavaLanguageVersion.of(21)`
	`7`	`+ languageVersion = JavaLanguageVersion.of(25)`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class Catalog implements EntityResolver2 {`
`57`	`57`	`private Map<String, Catalog> delegateCatalogs;`
`58`	`58`	`private String workDir;`
`59`	`59`	`private String base = "";`
`60`		`- private String documentParent = "";`
	`60`	`+ private final ThreadLocal<String> documentParent = ThreadLocal.withInitial(() -> "");`
`61`	`61`	`private String prefer = "public";`
`62`	`62`
`63`	`63`	`protected Catalog(String catalogFile)`
`@@ -442,7 +442,7 @@ public InputSource resolveEntity(String name, String publicId, String baseURI, S`
`442`	`442`	`return new InputSource(uri.toURL().openStream());`
`443`	`443`	`}`
`444`	`444`	`return new InputSource(new FileInputStream(uri.toURL().toString()));`
`445`		`- } catch (URISyntaxException \| IllegalArgumentException \| NullPointerException e) {`
	`445`	`+ } catch (URISyntaxException \| IllegalArgumentException \| NullPointerException _) {`
`446`	`446`	`// ignore`
`447`	`447`	`}`
`448`	`448`	`if (dtdPublicEntities != null && publicId != null && dtdPublicEntities.containsKey(publicId)) {`
`@@ -554,7 +554,7 @@ public String matchSystem(String baseURI, String systemId) {`
`554`	`554`	`}`
`555`	`555`	`// this resource is not in catalog.`
`556`	`556`
`557`		`- if (!documentParent.isEmpty()) {`
	`557`	`+ if (!documentParent.get().isEmpty()) {`
`558`	`558`	`// try to find the file in parent folder`
`559`	`559`	`File f = new File(systemId);`
`560`	`560`	`String name = f.getAbsolutePath();`
`@@ -566,19 +566,19 @@ public String matchSystem(String baseURI, String systemId) {`
`566`	`566`	`name = f.getName();`
`567`	`567`	`}`
`568`	`568`	`}`
`569`		`- File parent = new File(documentParent);`
	`569`	`+ File parent = new File(documentParent.get());`
`570`	`570`	`File file = new File(parent, name);`
`571`	`571`	`if (file.exists()) {`
`572`	`572`	`return file.getAbsolutePath();`
`573`	`573`	`}`
`574`	`574`	`}`
`575`	`575`	`try {`
`576`		`- URI u = new URI(baseURI != null ? baseURI : documentParent).resolve(systemId).normalize();`
	`576`	`+ URI u = new URI(baseURI != null ? baseURI : documentParent.get()).resolve(systemId).normalize();`
`577`	`577`	`File file = new File(u.toURL().toString());`
`578`	`578`	`if (file.exists()) {`
`579`	`579`	`return file.getAbsolutePath();`
`580`	`580`	`}`
`581`		`- } catch (MalformedURLException \| URISyntaxException \| IllegalArgumentException e) {`
	`581`	`+ } catch (MalformedURLException \| URISyntaxException \| IllegalArgumentException _) {`
`582`	`582`	`// ignore`
`583`	`583`	`}`
`584`	`584`	`}`
`@@ -628,15 +628,15 @@ public String matchURI(String uri) {`
`628`	`628`	`if (u.isAbsolute() && u.toURL().getProtocol().startsWith("file")) {`
`629`	`629`	`return u.toString();`
`630`	`630`	`}`
`631`		`- } catch (URISyntaxException \| MalformedURLException \| IllegalArgumentException e) {`
	`631`	`+ } catch (URISyntaxException \| MalformedURLException \| IllegalArgumentException _) {`
`632`	`632`	`// ignore`
`633`	`633`	`}`
`634`	`634`	`}`
`635`	`635`	`return null;`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`public void currentDocumentBase(String parentFile) {`
`639`		`- documentParent = parentFile;`
	`639`	`+ documentParent.set(parentFile);`
`640`	`640`	`}`
`641`	`641`
`642`	`642`	`public String getDTD(String name) {`
`@@ -681,7 +681,7 @@ public void parseDTD(String publicId) {`
`681`	`681`	`EntityDecl entity = it.next();`
`682`	`682`	`addDtdSystemEntity(entity.getValue(), entity.getSystemId());`
`683`	`683`	`}`
`684`		`- } catch (IOException \| SAXException e) {`
	`684`	`+ } catch (IOException \| SAXException _) {`
`685`	`685`	`// do nothing`
`686`	`686`	`MessageFormat mf = new MessageFormat(Messages.getString("Catalog.0"));`
`687`	`687`	`logger.log(Level.WARNING, mf.format(new String[] { publicId }));`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public class CustomContentHandler implements IContentHandler {`
`44`	`44`	`private String encoding;`
`45`	`45`	`private Catalog catalog;`
`46`	`46`	`private boolean isRelaxNG;`
	`47`	`+ private static Hashtable<String, Map<String, Map<String, String>>> relaxNgCache = new Hashtable<>();`
`47`	`48`	`private Map<String, Map<String, String>> defaultAttributes;`
`48`	`49`	`private File documentBase;`
`49`	`50`
`@@ -100,7 +101,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc`
`100`	`101`	`}`
`101`	`102`	`}`
`102`	`103`	`current = stack.pop();`
`103`		`- } catch (EmptyStackException es) {`
	`104`	`+ } catch (EmptyStackException _) {`
`104`	`105`	`throw new SAXException(Messages.getString("CustomContentHandler.0"));`
`105`	`106`	`}`
`106`	`107`	`}`
`@@ -215,7 +216,7 @@ public void setDocumentLocator(Locator locator) {`
`215`	`216`	`}`
`216`	`217`	`try {`
`217`	`218`	`documentBase = new File(new URI(sysId)).getParentFile();`
`218`		`- } catch (Exception e) {`
	`219`	`+ } catch (Exception _) {`
`219`	`220`	`documentBase = new File(sysId).getParentFile();`
`220`	`221`	`}`
`221`	`222`	`}`
`@@ -432,8 +433,13 @@ private void parseRelaxNG(String href) throws SAXException, IOException, ParserC`
`432`	`433`	`}`
`433`	`434`	`}`
`434`	`435`	`if (system != null) {`
`435`		`- RelaxNGParser relaxngParser = new RelaxNGParser(system, catalog);`
`436`		`- defaultAttributes = relaxngParser.getElements();`
	`436`	`+ synchronized (relaxNgCache) {`
	`437`	`+ if (!relaxNgCache.containsKey(system)) {`
	`438`	`+ RelaxNGParser relaxngParser = new RelaxNGParser(system, catalog);`
	`439`	`+ relaxNgCache.put(system, relaxngParser.getElements());`
	`440`	`+ }`
	`441`	`+ defaultAttributes = relaxNgCache.get(system);`
	`442`	`+ }`
`437`	`443`	`isRelaxNG = true;`
`438`	`444`	`}`
`439`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public InputSource resolveEntity(String publicId, String systemId) throws IOExce`
`28`	`28`	`if (file.exists()) {`
`29`	`29`	`return new InputSource(new FileInputStream(file));`
`30`	`30`	`}`
`31`		`- } catch (URISyntaxException e) {`
	`31`	`+ } catch (URISyntaxException _) {`
`32`	`32`	`// ignore`
`33`	`33`	`}`
`34`	`34`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static String getString(String key) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`return props.getProperty(key, '!' + key + '!');`
`51`		`- } catch (IOException \| NullPointerException e) {`
	`51`	`+ } catch (IOException \| NullPointerException _) {`
`52`	`52`	`return '!' + key + '!';`
`53`	`53`	`}`
`54`	`54`	`}`