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 9f6ca08d286ee257d1ae854f34f915c10a504b9a Author: Andy Seaborne <[email protected]> AuthorDate: Wed Aug 21 10:39:46 2024 +0100 GH-2665: XMLLiteralType: rename theXMLLiteralType as rdfXMLLiteral --- .../apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java | 2 +- .../apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java | 2 +- .../apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java | 2 +- .../riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java | 2 +- .../riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java | 2 +- .../main/java/org/apache/jena/riot/writer/WriterTriX.java | 2 +- .../jena/sparql/engine/iterator/QueryIteratorBase.java | 8 +++++--- .../main/java/org/apache/jena/datatypes/TypeMapper.java | 2 +- .../org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java | 14 ++++++++++++-- .../main/java/org/apache/jena/graph/impl/LiteralLabel.java | 2 +- .../org/apache/jena/rdfxml/xmlinput0/RDFXMLReader0.java | 2 +- .../org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java | 2 +- .../src/main/java/org/apache/jena/vocabulary/RDF.java | 4 ++-- .../java/org/apache/jena/datatypes/TestRDFXMLiteral.java | 4 ++-- .../java/org/apache/jena/graph/test/AbstractTestGraph.java | 4 ++-- 15 files changed, 33 insertions(+), 21 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java index 536d6b1e4b..b93139f252 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java @@ -220,7 +220,7 @@ public class ReaderRDFXML_ARP0 implements ReaderRIOT return NodeFactory.createLiteralLang(lit.toString(), lit.getLang()); if (lit.isWellFormedXML()) { - return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.theXMLLiteralType); + return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.rdfXMLLiteral); } RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java index 5a5437e765..e6c0837352 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP1.java @@ -235,7 +235,7 @@ public class ReaderRDFXML_ARP1 implements ReaderRIOT return parserProfile.createLangLiteral(lit.toString(), lit.getLang(), -1, -1); if (lit.isWellFormedXML()) { - return parserProfile.createTypedLiteral(lit.toString(), XMLLiteralType.theXMLLiteralType, -1, -1); + return parserProfile.createTypedLiteral(lit.toString(), XMLLiteralType.rdfXMLLiteral, -1, -1); } RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java index 6d3e768ef5..f1bf90887f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx/ParserRRX_SAX.java @@ -93,7 +93,7 @@ class ParserRRX_SAX private static final String rdfAboutEachPrefix = "aboutEachPrefix"; private static final String rdfBagID = "bagID"; - private static final RDFDatatype rdfXmlLiteralDT = XMLLiteralType.theXMLLiteralType; + private static final RDFDatatype rdfXmlLiteralDT = XMLLiteralType.rdfXMLLiteral; // LN = Local name. private static final String xmlBaseLN = "base"; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java index f0706cdcd4..cbd3fd68e3 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_ev/ParserRRX_StAX_EV.java @@ -814,7 +814,7 @@ class ParserRRX_StAX_EV { //NamespaceContext nsCxt = startElt.getNamespaceContext(); String text = xmlLiteralAccumulateText(startElt); - Node object = literalDatatype(text, XMLLiteralType.theXMLLiteralType, startElt.getLocation()); + Node object = literalDatatype(text, XMLLiteralType.rdfXMLLiteral, startElt.getLocation()); emitter.emit(subject, property, object, startElt.getLocation()); // Skip trailer then end property tag. XMLEvent event = peekEvent(); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java index d6df70f8af..32c8eaf971 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/rrx_stax_sr/ParserRRX_StAX_SR.java @@ -781,7 +781,7 @@ class ParserRRX_StAX_SR { private int parseTypeLiteral(Node subject, Node property, Emitter emitter, Location location) { String text = xmlLiteralAccumulateText(); - Node object = literalDatatype(text, XMLLiteralType.theXMLLiteralType, location); + Node object = literalDatatype(text, XMLLiteralType.rdfXMLLiteral, location); emitter.emit(subject, property, object, location); return END_ELEMENT; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java index 18d1b10b6d..b8ac070ebe 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java @@ -43,7 +43,7 @@ import org.apache.jena.sparql.util.Context; * @see StreamWriterTriX */ public class WriterTriX implements WriterDatasetRIOT, WriterGraphRIOT { - private static String rdfXMLLiteral = XMLLiteralType.theXMLLiteralType.getURI(); + private static String rdfXMLLiteral = XMLLiteralType.rdfXMLLiteral.getURI(); // Common pattern. @Override diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java index 4177328edb..e58361ea3c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java @@ -78,13 +78,15 @@ public abstract class QueryIteratorBase // -------- The contract with the subclasses /** - * Implement this, not hasNext() + * Implement this, not hasNext(). + * Do not throw {@link NoSuchElementException}. */ protected abstract boolean hasNextBinding(); /** - * Implement this, not next() or nextBinding() Returning null is turned into - * NoSuchElementException Does not need to call hasNext (can presume it is true) + * Implement this, not next() or nextBinding(). + * Returning null is turned into + * NoSuchElementException. Does not need to call hasNextBinding. */ protected abstract Binding moveToNextBinding(); diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java b/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java index 7a944fa9ad..5dd07fba12 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/TypeMapper.java @@ -69,7 +69,7 @@ public class TypeMapper { theTypeMap.registerDatatype(RDFLangString.rdfLangString) ; theTypeMap.registerDatatype(RDFDirLangString.rdfDirLangString) ; theTypeMap.registerDatatype(RDFjson.rdfJSON); - theTypeMap.registerDatatype(XMLLiteralType.theXMLLiteralType); + theTypeMap.registerDatatype(XMLLiteralType.rdfXMLLiteral); theTypeMap.registerDatatype(RDFhtml.rdfHTML); XSDDatatype.loadXSDSimpleTypes(theTypeMap); diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java index 50460ab9bc..741f4d0a68 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java @@ -42,6 +42,7 @@ import org.apache.jena.graph.impl.LiteralLabel; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.apache.jena.util.JenaXMLOutput; +import org.apache.jena.vocabulary.RDF; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; @@ -61,8 +62,17 @@ import org.xml.sax.SAXParseException; public class XMLLiteralType extends BaseDatatype implements RDFDatatype { public static String XMLLiteralTypeURI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral";; - /** Singleton instance */ - // Include the string for the RDF namespace, do not use RDF.getURI(), to avoid the risk of an initializer circularity. + /** + * Singleton instance of the rdf:XMLLIteral datatype. + * Prefer {@link RDF#dtXMLLiteral} in applications. + */ + public static final RDFDatatype rdfXMLLiteral = new XMLLiteralType(XMLLiteralTypeURI); + + /** + * Singleton instance (legacy name) + * @deprecated Prefer the constant {@link #rdfXMLLiteral} or {@link RDF#dtXMLLiteral} + */ + @Deprecated public static final RDFDatatype theXMLLiteralType = new XMLLiteralType(XMLLiteralTypeURI); private static final String xmlWrapperTagName = "xml-literal-fragment"; diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java index 06b5adb0ec..441b649cae 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java @@ -341,7 +341,7 @@ final public class LiteralLabel { * Therefore getValueHashCode is the same as hashCode(); */ private boolean indexingValueIsSelf() { - return dtype == XMLLiteralType.theXMLLiteralType || + return dtype == XMLLiteralType.rdfXMLLiteral || dtype == RDFjson.rdfJSON || dtype == RDFhtml.rdfHTML ; } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/RDFXMLReader0.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/RDFXMLReader0.java index 7969db5447..63ee78a278 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/RDFXMLReader0.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput0/RDFXMLReader0.java @@ -127,7 +127,7 @@ public class RDFXMLReader0 implements RDFReaderI, ARPErrorNumbers { return NodeFactory.createLiteralLang(lit.toString(), lit.getLang()); if (lit.isWellFormedXML()) { - return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.theXMLLiteralType); + return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.rdfXMLLiteral); } RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java index cae8262b03..dc8813efa9 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput1/RDFXMLReader.java @@ -146,7 +146,7 @@ public class RDFXMLReader implements RDFReaderI, ARPErrorNumbers { return NodeFactory.createLiteralLang(lit.toString(), lit.getLang()); if (lit.isWellFormedXML()) { - return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.theXMLLiteralType); + return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.rdfXMLLiteral); } RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java index 711bdf3682..e162a9b737 100644 --- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java +++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java @@ -125,7 +125,7 @@ public class RDF { public static final RDFDatatype dtRDFHTML = RDFhtml.rdfHTML; public static final RDFDatatype dtLangString = RDFLangString.rdfLangString; public static final RDFDatatype dtDirLangString = RDFDirLangString.rdfDirLangString; - public static final RDFDatatype dtXMLLiteral = XMLLiteralType.theXMLLiteralType; + public static final RDFDatatype dtXMLLiteral = XMLLiteralType.rdfXMLLiteral; // Added to the RDF namespace December 2019 // https://lists.w3.org/Archives/Public/semantic-web/2019Dec/0027.html @@ -179,7 +179,7 @@ public class RDF { public static RDFDatatype dtRDFHTML() { return RDFhtml.rdfHTML; } public static RDFDatatype dtLangString() { return RDFLangString.rdfLangString; } public static RDFDatatype dtDirLangString() { return RDFDirLangString.rdfDirLangString; } - public static RDFDatatype dtXMLLiteral() { return XMLLiteralType.theXMLLiteralType; } + public static RDFDatatype dtXMLLiteral() { return XMLLiteralType.rdfXMLLiteral; } public static RDFDatatype dtRDFJSON() { return RDFjson.rdfJSON; } } diff --git a/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java b/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java index e1419a1c8a..99cfddca8a 100644 --- a/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java +++ b/jena-core/src/test/java/org/apache/jena/datatypes/TestRDFXMLiteral.java @@ -60,8 +60,8 @@ public class TestRDFXMLiteral { // ---- private static void test(String lex1, String lex2, boolean javaEquals, boolean sameTerm, boolean sameValue) { - Node n1 = NodeFactory.createLiteralDT(lex1, XMLLiteralType.theXMLLiteralType); - Node n2 = NodeFactory.createLiteralDT(lex2, XMLLiteralType.theXMLLiteralType); + Node n1 = NodeFactory.createLiteralDT(lex1, XMLLiteralType.rdfXMLLiteral); + Node n2 = NodeFactory.createLiteralDT(lex2, XMLLiteralType.rdfXMLLiteral); assertEquals(javaEquals, n1.equals(n2)); assertEquals(sameTerm, n1.sameTermAs(n2)); assertEquals(sameValue, n1.sameValueAs(n2)); diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java index 8100411d08..69d1170226 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestGraph.java @@ -414,8 +414,8 @@ public abstract class AbstractTestGraph extends GraphTestBase { Graph g = getGraph(); graphAdd( g, "S P O" ); - assertDiffer( new HashSet<Triple>(), g.find( Node.ANY, Node.ANY, Node.ANY ).toSet() ); - assertDiffer( new HashSet<Triple>(), g.find( Triple.ANY ).toSet() ); + assertDiffer( Set.of(), g.find( Node.ANY, Node.ANY, Node.ANY ).toSet() ); + assertDiffer( Set.of(), g.find( Triple.ANY ).toSet() ); } protected boolean canBeEmpty( Graph g )
