This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 8966375635b1749912249834f1001905a2789fd7 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Jan 10 21:43:25 2025 +0000 GH-2936: Use IRI3986 in the Fuseki IRIValidator --- .../org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java | 6 +++++- .../org/apache/jena/fuseki/validation/json/IRIValidatorJSON.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java index d8914d88d4..003b4aabc3 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java @@ -26,7 +26,9 @@ import java.io.PrintStream; import jakarta.servlet.ServletOutputStream; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import org.apache.jena.iri3986.provider.IRIProvider3986; import org.apache.jena.irix.IRIException; +import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.IRIx; public class IRIValidatorHTML @@ -60,6 +62,8 @@ public class IRIValidatorHTML try { boolean first = true; + IRIProvider provider = new IRIProvider3986(); + for ( String iriStr : args ) { if ( iriStr.startsWith("<") ) { iriStr = iriStr.substring(1); @@ -70,7 +74,7 @@ public class IRIValidatorHTML System.out.println(); first = false; try { - IRIx iri = IRIx.create(iriStr); + IRIx iri = provider.create(iriStr); System.out.println(iriStr + " ==> " + iri); if ( iri.isRelative() ) System.out.println("Relative IRI: " + iriStr); diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/IRIValidatorJSON.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/IRIValidatorJSON.java index d36ce85b76..6fde9c91d6 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/IRIValidatorJSON.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/json/IRIValidatorJSON.java @@ -28,7 +28,9 @@ import java.util.List; import org.apache.jena.atlas.json.JsonBuilder; import org.apache.jena.atlas.json.JsonObject; import org.apache.jena.fuseki.servlets.ServletOps; +import org.apache.jena.iri3986.provider.IRIProvider3986; import org.apache.jena.irix.IRIException; +import org.apache.jena.irix.IRIProvider; import org.apache.jena.irix.IRIx; public class IRIValidatorJSON { @@ -55,13 +57,15 @@ public class IRIValidatorJSON { obj.key(jIRIs); obj.startArray(); + IRIProvider provider = new IRIProvider3986(); + for ( String iriStr : args ) { obj.startObject(); obj.key(jIRI).value(iriStr); List<String> errors = new ArrayList<>(); List<String> warnings = new ArrayList<>(); try { - IRIx iri = IRIx.create(iriStr); + IRIx iri = provider.create(iriStr); System.out.println(iriStr + " ==> " + iri); if ( iri.isRelative() ) if ( iri.isRelative() )
