You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/12/23 18:59:02 UTC
[06/15] jena git commit: LiteralLabelFactory : create(Object) ->
createTypeLiteral(Object)
LiteralLabelFactory : create(Object) -> createTypeLiteral(Object)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/244e1bf0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/244e1bf0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/244e1bf0
Branch: refs/heads/master
Commit: 244e1bf06c7ae7feb1e06565dce0398dfdd707b5
Parents: a29b1c9
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 23 15:33:55 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 23 15:33:55 2014 +0000
----------------------------------------------------------------------
.../com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java | 11 ++++++++---
.../java/com/hp/hpl/jena/rdf/model/ResourceFactory.java | 2 +-
.../java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java | 4 ++--
.../main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java | 8 ++++----
.../com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java | 2 +-
.../com/hp/hpl/jena/graph/test/TestFindLiterals.java | 8 ++++----
.../hpl/jena/graph/test/TestLiteralLabelSameValueAs.java | 2 +-
.../com/hp/hpl/jena/graph/test/TestLiteralLabels.java | 8 ++++----
.../com/hp/hpl/jena/graph/test/TestTypedLiterals.java | 2 +-
.../com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java | 2 +-
10 files changed, 27 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index bfd5021..487b05b 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -82,15 +82,20 @@ public class LiteralLabelFactory
return new LiteralLabelImpl(value, lang, dtype) ;
}
+ /** Use {@linkplain #createTypedLiteral} */
+ @Deprecated
+ public static LiteralLabel create(Object value) {
+ return createTypedLiteral(value) ;
+ }
+
/**
* 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.
* @param value the literal value to encapsulate
*/
- public static LiteralLabel create(Object value) {
- if ( value instanceof String )
- create((String)value, (RDFDatatype)null) ;
+ public static LiteralLabel createTypedLiteral(Object value) {
return new LiteralLabelImpl(value) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
index b2299c6..55d2089 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
@@ -286,7 +286,7 @@ public class ResourceFactory {
Object valuec = new XSDDateTime( (Calendar) value);
ll = LiteralLabelFactory.create(valuec, "", XSDDatatype.XSDdateTime);
} else {
- ll = LiteralLabelFactory.create(value);
+ ll = LiteralLabelFactory.createTypedLiteral(value);
}
return new LiteralImpl(NodeFactory.createLiteral( ll ), null) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
index 717c63c..fc18800 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
@@ -681,7 +681,7 @@ implements Model, PrefixMapping, Lock
*/
@Override
public Literal createTypedLiteral(String v) {
- LiteralLabel ll = LiteralLabelFactory.create(v);
+ LiteralLabel ll = LiteralLabelFactory.createTypedLiteral(v);
return new LiteralImpl(NodeFactory.createLiteral(ll), this);
}
@@ -764,7 +764,7 @@ implements Model, PrefixMapping, Lock
// Catch special case of a Calendar which we want to act as if it were an XSDDateTime
if (value instanceof Calendar)
return createTypedLiteral( (Calendar)value );
- LiteralLabel ll = LiteralLabelFactory.create( value );
+ LiteralLabel ll = LiteralLabelFactory.createTypedLiteral( value );
return new LiteralImpl( NodeFactory.createLiteral( ll ), this);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
index c3bf421..c22b85f 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
@@ -213,7 +213,7 @@ public class Util {
* Construct a new integer valued node
*/
public static Node makeIntNode(int value) {
- return NodeFactory.createLiteral(LiteralLabelFactory.create( value ));
+ return NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral( value ));
}
/**
@@ -221,9 +221,9 @@ public class Util {
*/
public static Node makeLongNode(long value) {
if (value > Integer.MAX_VALUE) {
- return NodeFactory.createLiteral(LiteralLabelFactory.create( value ));
+ return NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral( value ));
} else {
- return NodeFactory.createLiteral(LiteralLabelFactory.create( (int) value ));
+ return NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral( (int) value ));
}
}
@@ -231,7 +231,7 @@ public class Util {
* Construct a new double valued node
*/
public static Node makeDoubleNode(double value) {
- return NodeFactory.createLiteral(LiteralLabelFactory.create( value ));
+ return NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral( value ));
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
index f61aa71..2feff15 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
@@ -61,7 +61,7 @@ public class Now extends BaseBuiltin {
public boolean bodyCall(Node[] args, int length, RuleContext context) {
checkArgs(length, context);
BindingEnvironment env = context.getEnv();
- Node now = NodeFactory.createLiteral( LiteralLabelFactory.create(new XSDDateTime(Calendar.getInstance())) );
+ Node now = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral(new XSDDateTime(Calendar.getInstance())) );
return env.bind(args[0], now);
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
index a43d26c..26e343e 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
@@ -112,10 +112,10 @@ public class TestFindLiterals extends GraphTestBase
public void testProgrammaticValues()
{
- Node ab = NodeFactory.createLiteral( LiteralLabelFactory.create( (byte) 42 ) );
- Node as = NodeFactory.createLiteral( LiteralLabelFactory.create( (short) 42 ) );
- Node ai = NodeFactory.createLiteral( LiteralLabelFactory.create( 42 ) );
- Node al = NodeFactory.createLiteral( LiteralLabelFactory.create( (long) 42 ) );
+ Node ab = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral( (byte) 42 ) );
+ Node as = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral( (short) 42 ) );
+ Node ai = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral( 42 ) );
+ Node al = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral( (long) 42 ) );
Graph g = graphWith( "" );
Node SB = NodeCreateUtils.create( "SB" );
Node SS = NodeCreateUtils.create( "SS" );
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabelSameValueAs.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabelSameValueAs.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabelSameValueAs.java
index 63d6709..3e2c586 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabelSameValueAs.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabelSameValueAs.java
@@ -59,7 +59,7 @@ public class TestLiteralLabelSameValueAs
}
private static LiteralLabel gen(String lex) {
- return LiteralLabelFactory.create(lex) ;
+ return LiteralLabelFactory.createTypedLiteral(lex) ;
}
static RDFDatatype dtUnknown = NodeFactory.getType("http://example/unknown") ;
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
index ebd284c..eab4776 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestLiteralLabels.java
@@ -97,8 +97,8 @@ public class TestLiteralLabels extends GraphTestBase
public void testEquality1()
{
- LiteralLabel A = LiteralLabelFactory.create("xyz") ;
- LiteralLabel B = LiteralLabelFactory.create("xyz") ;
+ LiteralLabel A = LiteralLabelFactory.createTypedLiteral("xyz") ;
+ LiteralLabel B = LiteralLabelFactory.createTypedLiteral("xyz") ;
assertTrue(A.equals(B)) ;
assertTrue(A.sameValueAs(B)) ;
assertEquals(A.hashCode(), B.hashCode()) ;
@@ -106,8 +106,8 @@ public class TestLiteralLabels extends GraphTestBase
public void testEquality2()
{
- LiteralLabel A = LiteralLabelFactory.create("xyz") ;
- LiteralLabel B = LiteralLabelFactory.create("XYZ") ;
+ LiteralLabel A = LiteralLabelFactory.createTypedLiteral("xyz") ;
+ LiteralLabel B = LiteralLabelFactory.createTypedLiteral("XYZ") ;
assertFalse(A.equals(B)) ;
assertFalse(A.sameValueAs(B)) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
index e59098f..9219bc0 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
@@ -124,7 +124,7 @@ public class TestTypedLiterals extends TestCase {
// Check we can create a literal of an unregistered java type without anything blowing up
Object foo = new java.sql.Date(123456l);
- LiteralLabel ll = LiteralLabelFactory.create(foo);
+ LiteralLabel ll = LiteralLabelFactory.createTypedLiteral(foo);
assertEquals(ll.getLexicalForm(), foo.toString());
}
http://git-wip-us.apache.org/repos/asf/jena/blob/244e1bf0/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
index a34fdd4..352db0b 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
@@ -823,7 +823,7 @@ public class TestBugs extends TestCase {
checkArgs(length, context);
BindingEnvironment env = context.getEnv();
Triple t = new Triple( NodeFactory.createAnon(), NodeFactory.createURI("http://jena.hpl.hp.com/example#"), NodeFactory.createAnon());
- Node l = NodeFactory.createLiteral( LiteralLabelFactory.create(t) );
+ Node l = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral(t) );
return env.bind(args[0], l);
}
}