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 00a48826373253ff231a4339e44463a22e267ef4 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Apr 25 14:58:37 2025 +0100 GH-3150: ReaderTriX: Use constant, not function call --- .../java/org/apache/jena/riot/lang/ReaderTriX.java | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java index 7792fe5218..da67af96f6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java @@ -18,14 +18,25 @@ package org.apache.jena.riot.lang; +import static org.apache.jena.riot.lang.ReaderTriX.State.*; + +import java.io.InputStream; +import java.io.Reader; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.NoSuchElementException; +import java.util.Objects; + import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; + import org.apache.jena.atlas.web.ContentType; import org.apache.jena.datatypes.RDFDatatype; import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.datatypes.xsd.impl.XMLLiteralType; import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.graph.Node_Marker; @@ -44,19 +55,6 @@ import org.apache.jena.sparql.util.Context; import org.apache.jena.util.JenaXMLInput; import org.apache.jena.vocabulary.RDF; -import java.io.InputStream; -import java.io.Reader; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.NoSuchElementException; -import java.util.Objects; - -import static org.apache.jena.riot.lang.ReaderTriX.State.TRIPLE_TERM; -import static org.apache.jena.riot.lang.ReaderTriX.State.GRAPH; -import static org.apache.jena.riot.lang.ReaderTriX.State.OUTER; -import static org.apache.jena.riot.lang.ReaderTriX.State.TRIPLE; -import static org.apache.jena.riot.lang.ReaderTriX.State.TRIX; - /** Read TriX. * See {@link TriX} for details. * @see TriX @@ -113,10 +111,10 @@ public class ReaderTriX implements ReaderRIOT { read(xReader, baseURI, output); } - private static String nsRDF = RDF.getURI(); + private static String nsRDF = RDF.uri; private static String nsXSD = XSDDatatype.XSD; // No "#" - private static String nsXML0 = "http://www.w3.org/XML/1998/namespace";; - private static String rdfXMLLiteral = RDF.xmlLiteral.getURI(); + private static String nsXML = "http://www.w3.org/XML/1998/namespace";; + private static String rdfXMLLiteral = XMLLiteralType.XMLLiteralTypeURI; // State TRIPLE is "asserted triple" - a triple that will go into the output. // State TRIPLE_TERM is a triple term (<<()>>) that will be term in another triple/quad. @@ -359,7 +357,7 @@ public class ReaderTriX implements ReaderRIOT { staxError(parser.getLocation(), "Multiple attributes : only one allowed"); String lang = null; if ( x == 1 ) - lang = attribute(parser, nsXML0, TriX.attrXmlLang); + lang = attribute(parser, nsXML, TriX.attrXmlLang); String lex = parser.getElementText(); if ( lang == null ) return profile.createStringLiteral(lex, line, col);
