Rename in NodeFactory: createUncachedLiteral -> createLiteralByValue. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d2da6f7a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d2da6f7a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d2da6f7a
Branch: refs/heads/add-contract-tests Commit: d2da6f7a95e2bdaeb0fb92cd637813b0264f13b4 Parents: 1119bf8 Author: Andy Seaborne <[email protected]> Authored: Fri May 8 14:06:33 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Fri May 8 14:06:33 2015 +0100 ---------------------------------------------------------------------- .../apache/jena/sparql/util/TestFmtUtils.java | 10 ++--- .../java/org/apache/jena/graph/NodeFactory.java | 39 ++++++++++++++++++-- .../jena/graph/impl/LiteralLabelFactory.java | 6 +-- .../apache/jena/rdf/model/ResourceFactory.java | 2 +- .../apache/jena/rdf/model/impl/ModelCom.java | 6 +-- .../apache/jena/reasoner/rulesys/Functor.java | 2 +- .../jena/graph/test/TestLiteralLabels.java | 10 ++--- .../org/apache/jena/graph/test/TestNode.java | 4 +- .../jena/graph/test/TestTypedLiterals.java | 2 +- 9 files changed, 57 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java index b801e93..1e5b033 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java @@ -101,31 +101,31 @@ public class TestFmtUtils @Test public void stringLiteral() throws Exception { - Node_Literal nl = (Node_Literal)NodeFactory.createUncachedLiteral("abc", "no", new XSDDatatype("string")) ; + Node_Literal nl = (Node_Literal)NodeFactory.createLiteral("abc", "no", new XSDDatatype("string")) ; assertEquals("\"abc\"@no", FmtUtils.stringForLiteral(nl, getContext())) ; } @Test public void integerLiteral() throws Exception { - Node_Literal nl = (Node_Literal)NodeFactory.createUncachedLiteral("2", new XSDDatatype("int")) ; + Node_Literal nl = (Node_Literal)NodeFactory.createLiteral("2", new XSDDatatype("int")) ; assertEquals("\"2\"^^<http://www.w3.org/2001/XMLSchema#int>", FmtUtils.stringForLiteral(nl, getContext())) ; } @Test public void doubleLiteral() throws Exception { - Node_Literal nl = (Node_Literal)NodeFactory.createUncachedLiteral("2.1e2", new XSDDatatype("double")) ; + Node_Literal nl = (Node_Literal)NodeFactory.createLiteral("2.1e2", new XSDDatatype("double")) ; assertEquals("2.1e2", FmtUtils.stringForLiteral(nl, getContext())) ; } @Test public void decimalLiteral() throws Exception { - Node_Literal nl = (Node_Literal)NodeFactory.createUncachedLiteral("2.4", new XSDDatatype("decimal")) ; + Node_Literal nl = (Node_Literal)NodeFactory.createLiteral("2.4", new XSDDatatype("decimal")) ; assertEquals("2.4", FmtUtils.stringForLiteral(nl, getContext())) ; } @Test public void booleanLiteral() throws Exception { - Node_Literal nl = (Node_Literal)NodeFactory.createUncachedLiteral("false", new XSDDatatype("boolean")) ; + Node_Literal nl = (Node_Literal)NodeFactory.createLiteral("false", new XSDDatatype("boolean")) ; assertEquals("false", FmtUtils.stringForLiteral(nl, getContext())) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java index 35e9cd9..3f9951a 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java +++ b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java @@ -126,12 +126,45 @@ public class NodeFactory { return createLiteral(LiteralLabelFactory.create(lex, dtype)) ; } - public static Node createUncachedLiteral(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException { - return new Node_Literal(LiteralLabelFactory.create(value, lang, dtype)) ; + /** Create a Node based on the value + * If the value is a string we + * assume this is inteded to be a lexical form after all. + * @param value + * The value, mapped according to registered types. + * @param dtype + * RDF Datatype. + * @return Node + * @throws DatatypeFormatException + */ + public static Node createLiteralByValue(Object value, RDFDatatype dtype) throws DatatypeFormatException { + return new Node_Literal(LiteralLabelFactory.createByValue(value, "", dtype)) ; + } + + /** Create a Node based on the value + * If the value is a string we + * assume this is inteded to be a lexical form after all. + * @param value + * The value, mapped according to registered types. + * @param lang + * (optional) Language tag, if a string. + * @param dtype + * RDF Datatype. + * @return Node + * @throws DatatypeFormatException + */ + public static Node createLiteralByValue(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException { + return new Node_Literal(LiteralLabelFactory.createByValue(value, lang, dtype)) ; } + /** @deprecated To be removed: Use {@link #createLiteralByValue(Object, RDFDatatype)} */ + @Deprecated public static Node createUncachedLiteral(Object value, RDFDatatype dtype) throws DatatypeFormatException { - return new Node_Literal(LiteralLabelFactory.create(value, "", dtype)) ; + return createLiteralByValue(value, dtype) ; } + /** @deprecated To be removed: Use {@link #createLiteralByValue(Object, String, RDFDatatype)} */ + @Deprecated + public static Node createUncachedLiteral(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException { + return createLiteralByValue(value, lang, dtype) ; + } } http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java index 9f1c8ee..fbfc522 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java +++ b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java @@ -75,9 +75,9 @@ public class LiteralLabelFactory * * @param value the value of the literal * @param lang the optional language tag, only relevant for plain literals - * @param dtype the type of the literal, null for old style "plain" literals + * @param dtype the type of the literal, null for old style "plain" literals (which become xsd:string in RDF 1.1) */ - public static LiteralLabel create(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException { + public static LiteralLabel createByValue(Object value, String lang, RDFDatatype dtype) throws DatatypeFormatException { dtype = fixDatatype(dtype, lang) ; return new LiteralLabelImpl(value, lang, dtype) ; } @@ -92,7 +92,7 @@ public class LiteralLabelFactory * Build a typed literal label from its value form using * whatever datatype is currently registered as the the default * representation for this java class. No language tag is supplied. - * A plain strign becomes an xsd:string. + * A plain string becomes an xsd:string. * @param value the literal value to encapsulate */ public static LiteralLabel createTypedLiteral(Object value) { http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/main/java/org/apache/jena/rdf/model/ResourceFactory.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/ResourceFactory.java b/jena-core/src/main/java/org/apache/jena/rdf/model/ResourceFactory.java index 57e0bbb..b70493a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/ResourceFactory.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/ResourceFactory.java @@ -284,7 +284,7 @@ public class ResourceFactory { LiteralLabel ll = null; if (value instanceof Calendar) { Object valuec = new XSDDateTime( (Calendar) value); - ll = LiteralLabelFactory.create(valuec, "", XSDDatatype.XSDdateTime); + ll = LiteralLabelFactory.createByValue(valuec, "", XSDDatatype.XSDdateTime); } else { ll = LiteralLabelFactory.createTypedLiteral(value); } http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java index e644f55..8d25a3e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java +++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java @@ -692,7 +692,7 @@ implements Model, PrefixMapping, Lock @Override public Literal createTypedLiteral(Calendar cal) { Object value = new XSDDateTime(cal); - LiteralLabel ll = LiteralLabelFactory.create(value, "", XSDDatatype.XSDdateTime); + LiteralLabel ll = LiteralLabelFactory.createByValue(value, "", XSDDatatype.XSDdateTime); return new LiteralImpl(NodeFactory.createLiteral(ll), this); } @@ -720,7 +720,7 @@ implements Model, PrefixMapping, Lock */ @Override public Literal createTypedLiteral(Object value, RDFDatatype dtype) { - LiteralLabel ll = LiteralLabelFactory.create(value, "", dtype); + LiteralLabel ll = LiteralLabelFactory.createByValue(value, "", dtype); return new LiteralImpl( NodeFactory.createLiteral(ll), this ); } @@ -749,7 +749,7 @@ implements Model, PrefixMapping, Lock @Override public Literal createTypedLiteral(Object value, String typeURI) { RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI); - LiteralLabel ll = LiteralLabelFactory.create(value, "", dt); + LiteralLabel ll = LiteralLabelFactory.createByValue(value, "", dt); return new LiteralImpl(NodeFactory.createLiteral(ll), this); } http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java index 27217e6..2eb22e5 100755 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Functor.java @@ -278,7 +278,7 @@ public class Functor implements ClauseEntry { * @param f the functor data structure to be wrapped in a node. */ public static Node makeFunctorNode(Functor f) { - return NodeFactory.createUncachedLiteral(f, FunctorDatatype.theFunctorDatatype); + return NodeFactory.createLiteralByValue(f, FunctorDatatype.theFunctorDatatype); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java index 97c6552..4bc39ab 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestLiteralLabels.java @@ -40,14 +40,14 @@ public class TestLiteralLabels extends GraphTestBase public void testHashCode() { - LiteralLabel ll = LiteralLabelFactory.create("test", "", null) ; + LiteralLabel ll = LiteralLabelFactory.createByValue("test", "", null) ; ll.hashCode() ; } public void testHashCode2() { - LiteralLabel ll1 = LiteralLabelFactory.create("test", "", null) ; - LiteralLabel ll2 = LiteralLabelFactory.create("test", "", null) ; + LiteralLabel ll1 = LiteralLabelFactory.createByValue("test", "", null) ; + LiteralLabel ll2 = LiteralLabelFactory.createByValue("test", "", null) ; assertEquals(ll1.hashCode(), ll2.hashCode()) ; } @@ -89,8 +89,8 @@ public class TestLiteralLabels extends GraphTestBase return false ; } } ; - LiteralLabel A = LiteralLabelFactory.create("17", "", d) ; - LiteralLabel B = LiteralLabelFactory.create("17", "", null) ; + LiteralLabel A = LiteralLabelFactory.createByValue("17", "", d) ; + LiteralLabel B = LiteralLabelFactory.createByValue("17", "", null) ; assertFalse(A.sameValueAs(B)) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java index 0bfd21b..3be7ac8 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java @@ -117,8 +117,8 @@ public class TestNode extends GraphTestBase AnonId id = AnonId.create(); LiteralLabel L2 = LiteralLabelFactory.create( id.toString(), "", false ); - LiteralLabel LLang1 = LiteralLabelFactory.create( "xyz", "en", null) ; - LiteralLabel LLang2 = LiteralLabelFactory.create( "xyz", "EN", null) ; + LiteralLabel LLang1 = LiteralLabelFactory.createByValue( "xyz", "en", null) ; + LiteralLabel LLang2 = LiteralLabelFactory.createByValue( "xyz", "EN", null) ; String U2 = id.toString(); String N2 = id.toString(); http://git-wip-us.apache.org/repos/asf/jena/blob/d2da6f7a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java index 954410a..7f5b674 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java @@ -678,7 +678,7 @@ public class TestTypedLiterals extends TestCase { calM1.set(Calendar.MONTH, 10); calM1.set(Calendar.DATE, 23); XSDDateTime xdtM = new XSDDateTime(calM1); - LiteralLabel xdtM_ll = LiteralLabelFactory.create(xdtM, "", XSDDatatype.XSDdateTime); + LiteralLabel xdtM_ll = LiteralLabelFactory.createByValue(xdtM, "", XSDDatatype.XSDdateTime); assertTrue("Pre-1000 calendar value", xdtM_ll.getLexicalForm().matches("-?[0-9]{4}-.*")) ; assertTrue("Pre-1000 calendar value", xdtM_ll.isWellFormed()) ;
