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 2013/03/17 18:48:10 UTC
svn commit: r1457500 [3/4] - in /jena/trunk:
jena-arq/src-examples/arq/examples/
jena-arq/src-examples/arq/examples/propertyfunction/
jena-arq/src/main/java/arq/ jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparq...
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java Sun Mar 17 17:48:00 2013
@@ -24,7 +24,7 @@ import org.junit.Assert ;
import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueDecimal ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueDouble ;
@@ -444,7 +444,7 @@ public class TestXSDFuncOp extends TestC
@Test public void testCompare23()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
NodeValue nv2 = NodeValue.makeString("5") ;
try {
@@ -457,8 +457,8 @@ public class TestXSDFuncOp extends TestC
@Test public void testSameUnknown_1()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createURI("test:abc")) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("test:abc")) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
assertTrue(NodeValue.sameAs(nv1, nv2)) ;
assertFalse(NodeValue.notSameAs(nv1, nv2)) ;
@@ -472,8 +472,8 @@ public class TestXSDFuncOp extends TestC
@Test public void testSameUnknown_2()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createAnon()) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("test:abc")) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
assertFalse(NodeValue.sameAs(nv1, nv2)) ;
assertTrue(NodeValue.notSameAs(nv1, nv2)) ;
@@ -589,7 +589,7 @@ public class TestXSDFuncOp extends TestC
@Test public void testCompareGeneral1()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
NodeValue nv2 = NodeValue.makeString("5") ;
// bNodes before strings
@@ -599,8 +599,8 @@ public class TestXSDFuncOp extends TestC
@Test public void testCompareGeneral2()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createAnon()) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("test:abc")) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
// bNodes before URIs
int x = NodeValue.compareAlways(nv1, nv2) ;
@@ -609,8 +609,8 @@ public class TestXSDFuncOp extends TestC
@Test public void testCompareGeneral3()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("test:abc")) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("test:abc")) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("test:abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
// URIs before literals
int x = NodeValue.compareAlways(nv1, nv2) ;
@@ -619,8 +619,8 @@ public class TestXSDFuncOp extends TestC
@Test public void testCompareGeneral4()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createURI("test:abc")) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("test:xyz")) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:xyz")) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertEquals("Does not compare "+nv1+" & "+nv2, NodeValue.CMP_LESS, NodeValue.compareAlways(nv1, nv2) ) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java Sun Mar 17 17:48:00 2013
@@ -41,7 +41,7 @@ import com.hp.hpl.jena.sparql.expr.nodev
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueInteger;
import com.hp.hpl.jena.sparql.function.FunctionEnvBase;
import com.hp.hpl.jena.sparql.sse.builders.ExprBuildException;
-import com.hp.hpl.jena.sparql.util.NodeFactory;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
/**
* Test for checking that functions are appropriately expanded when supplied with actual arguments
@@ -339,7 +339,7 @@ public class TestFunctionExpansion {
Expr actual = f.getActualExpr();
NodeValue result = actual.eval(BindingFactory.create(), FunctionEnvBase.createTest());
- Assert.assertEquals(8, NodeFactory.nodeToInt(result.asNode()));
+ Assert.assertEquals(8, NodeFactoryExtra.nodeToInt(result.asNode()));
//Change the definition of the function we depend on
//This has no effect with preserveDependencies set to false (the default) since we fully expanded the call to the dependent
@@ -350,7 +350,7 @@ public class TestFunctionExpansion {
actual = f.getActualExpr();
result = actual.eval(BindingFactory.create(), FunctionEnvBase.createTest());
- Assert.assertEquals(8, NodeFactory.nodeToInt(result.asNode()));
+ Assert.assertEquals(8, NodeFactoryExtra.nodeToInt(result.asNode()));
}
@Test(expected=ExprBuildException.class)
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java Sun Mar 17 17:48:00 2013
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.expr.ExprV
import com.hp.hpl.jena.sparql.expr.NodeValue;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueInteger;
import com.hp.hpl.jena.sparql.function.FunctionEnvBase;
-import com.hp.hpl.jena.sparql.util.NodeFactory;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
/**
* Tests which check that functions are not expanded when {@link UserDefinedFunctionFactory#setPreserveDependencies(boolean)} is set to true
@@ -90,7 +90,7 @@ public class TestFunctionNonExpansion {
Expr actual = f.getActualExpr();
NodeValue result = actual.eval(BindingFactory.create(), FunctionEnvBase.createTest());
- Assert.assertEquals(8, NodeFactory.nodeToInt(result.asNode()));
+ Assert.assertEquals(8, NodeFactoryExtra.nodeToInt(result.asNode()));
//Change the definition of the function we depend on
square = new ExprVar("x");
@@ -99,6 +99,6 @@ public class TestFunctionNonExpansion {
actual = f.getActualExpr();
result = actual.eval(BindingFactory.create(), FunctionEnvBase.createTest());
- Assert.assertEquals(4, NodeFactory.nodeToInt(result.asNode()));
+ Assert.assertEquals(4, NodeFactoryExtra.nodeToInt(result.asNode()));
}
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java Sun Mar 17 17:48:00 2013
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.expr.E_Multiply;
import com.hp.hpl.jena.sparql.expr.Expr;
import com.hp.hpl.jena.sparql.expr.ExprVar;
-import com.hp.hpl.jena.sparql.util.NodeFactory;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
/**
* Tests that user functions are properly wired in and usable from SPARQL
@@ -76,6 +76,6 @@ public class TestUserFunctionsInSparql {
//Validate returned value
Node actual = b.get(Var.alloc("square"));
- Assert.assertEquals(NodeFactory.intToNode(4), actual);
+ Assert.assertEquals(NodeFactoryExtra.intToNode(4), actual);
}
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java Sun Mar 17 17:48:00 2013
@@ -24,24 +24,24 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/** Basic add and delete tests for a graph */
public abstract class AbstractTestGraph2 extends BaseTest
{
// This will become the basis for a general graph test in Jena
- protected static final Node s1 = NodeFactory.parseNode("<ex:s1>") ;
- protected static final Node p1 = NodeFactory.parseNode("<ex:p1>") ;
- protected static final Node o1 = NodeFactory.parseNode("<ex:o1>") ;
-
- protected static final Node s2 = NodeFactory.parseNode("<ex:s2>") ;
- protected static final Node p2 = NodeFactory.parseNode("<ex:p2>") ;
- protected static final Node o2 = NodeFactory.parseNode("<ex:o2>") ;
-
- protected static final Node lit1 = NodeFactory.parseNode("'lex'") ;
- protected static final Node lit2 = NodeFactory.parseNode("'lex'@en") ;
- protected static final Node lit3 = NodeFactory.parseNode("123") ;
+ protected static final Node s1 = NodeFactoryExtra.parseNode("<ex:s1>") ;
+ protected static final Node p1 = NodeFactoryExtra.parseNode("<ex:p1>") ;
+ protected static final Node o1 = NodeFactoryExtra.parseNode("<ex:o1>") ;
+
+ protected static final Node s2 = NodeFactoryExtra.parseNode("<ex:s2>") ;
+ protected static final Node p2 = NodeFactoryExtra.parseNode("<ex:p2>") ;
+ protected static final Node o2 = NodeFactoryExtra.parseNode("<ex:o2>") ;
+
+ protected static final Node lit1 = NodeFactoryExtra.parseNode("'lex'") ;
+ protected static final Node lit2 = NodeFactoryExtra.parseNode("'lex'@en") ;
+ protected static final Node lit3 = NodeFactoryExtra.parseNode("123") ;
static Triple triple(Node s, Node p, Node o)
{ return new Triple(s, p, o) ; }
@@ -85,13 +85,13 @@ public abstract class AbstractTestGraph2
{
Graph g = emptyGraph() ;
// SPO twice -- as different nodes.
- Node ns1 = NodeFactory.parseNode("<ex:s>") ;
- Node np1 = NodeFactory.parseNode("<ex:p>") ;
- Node no1 = NodeFactory.parseNode("<ex:o>") ;
+ Node ns1 = NodeFactoryExtra.parseNode("<ex:s>") ;
+ Node np1 = NodeFactoryExtra.parseNode("<ex:p>") ;
+ Node no1 = NodeFactoryExtra.parseNode("<ex:o>") ;
- Node ns2 = NodeFactory.parseNode("<ex:s>") ;
- Node np2 = NodeFactory.parseNode("<ex:p>") ;
- Node no2 = NodeFactory.parseNode("<ex:o>") ;
+ Node ns2 = NodeFactoryExtra.parseNode("<ex:s>") ;
+ Node np2 = NodeFactoryExtra.parseNode("<ex:p>") ;
+ Node no2 = NodeFactoryExtra.parseNode("<ex:o>") ;
Triple t1 = triple(ns1, np1, no1) ;
Triple t2 = triple(ns2, np2, no2) ;
@@ -118,7 +118,7 @@ public abstract class AbstractTestGraph2
assertTrue(g.contains(t2)) ;
assertTrue(g.contains(s1,p1,lit1)) ;
assertTrue(g.contains(s1,p1,lit2)) ;
- Node o = NodeFactory.parseNode("<ex:lex>") ;
+ Node o = NodeFactoryExtra.parseNode("<ex:lex>") ;
assertFalse(g.contains(s1,p1,o)) ;
returnGraph(g) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java Sun Mar 17 17:48:00 2013
@@ -28,6 +28,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.graph.GraphUnionRead ;
import com.hp.hpl.jena.sparql.sse.Item ;
@@ -76,7 +77,7 @@ public class TestGraphUnionRead extends
{
List<Node> gnodes = list(gn1, gn2) ;
Graph g = new GraphUnionRead(dsg, gnodes) ;
- Node s = Node.createURI("http://example/s") ;
+ Node s = NodeFactory.createURI("http://example/s") ;
long x = Iter.count(g.find(s, null, null)) ;
assertEquals(3, x) ;
}
@@ -85,7 +86,7 @@ public class TestGraphUnionRead extends
{
List<Node> gnodes = list(gn1, gn2, gn9) ;
Graph g = new GraphUnionRead(dsg, gnodes) ;
- Node o = Node.createLiteral("g2") ;
+ Node o = NodeFactory.createLiteral("g2") ;
long x = Iter.count(g.find(null, null, o)) ;
assertEquals(1, x) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java Sun Mar 17 17:48:00 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.graph;
import org.junit.Test ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -34,9 +34,9 @@ public class TestGraphsMem extends Graph
protected Dataset createDataset()
{
DatasetGraph dsg = DatasetGraphFactory.createMem() ;
- dsg.addGraph(Node.createURI(graph1), GraphFactory.createDefaultGraph()) ;
- dsg.addGraph(Node.createURI(graph2), GraphFactory.createDefaultGraph()) ;
- dsg.addGraph(Node.createURI(graph3), GraphFactory.createDefaultGraph()) ;
+ dsg.addGraph(NodeFactory.createURI(graph1), GraphFactory.createDefaultGraph()) ;
+ dsg.addGraph(NodeFactory.createURI(graph2), GraphFactory.createDefaultGraph()) ;
+ dsg.addGraph(NodeFactory.createURI(graph3), GraphFactory.createDefaultGraph()) ;
return DatasetFactory.create(dsg) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Sun Mar 17 17:48:00 2013
@@ -27,6 +27,7 @@ import org.apache.jena.atlas.logging.Log
import org.apache.jena.riot.checker.CheckerLiterals ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.shared.JenaException ;
@@ -274,7 +275,7 @@ public class QueryTest extends EarlTestC
s = "_:"+n.getBlankNodeLabel() ;
else
s = NodeFunctions.str(n) ;
- b2.add(v, Node.createLiteral(s)) ;
+ b2.add(v, NodeFactory.createLiteral(s)) ;
}
bindings.add(b2) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java Sun Mar 17 17:48:00 2013
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.graph.Grap
import com.hp.hpl.jena.sparql.modify.request.* ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.syntax.Element ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.update.GraphStore ;
import com.hp.hpl.jena.update.UpdateAction ;
import com.hp.hpl.jena.update.UpdateExecutionFactory ;
@@ -43,17 +43,17 @@ import com.hp.hpl.jena.update.UpdateProc
public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
{
- protected static Node s = NodeFactory.parseNode("<http://example/r>") ;
- protected static Node p = NodeFactory.parseNode("<http://example/p>") ;
- protected static Node q = NodeFactory.parseNode("<http://example/q>") ;
- protected static Node v = NodeFactory.parseNode("<http://example/v>") ;
+ protected static Node s = NodeFactoryExtra.parseNode("<http://example/r>") ;
+ protected static Node p = NodeFactoryExtra.parseNode("<http://example/p>") ;
+ protected static Node q = NodeFactoryExtra.parseNode("<http://example/q>") ;
+ protected static Node v = NodeFactoryExtra.parseNode("<http://example/v>") ;
- protected static Node o1 = NodeFactory.parseNode("2007") ;
+ protected static Node o1 = NodeFactoryExtra.parseNode("2007") ;
protected static Triple triple1 = new Triple(s,p,o1) ;
- protected static Node o2 = NodeFactory.parseNode("1066") ;
+ protected static Node o2 = NodeFactoryExtra.parseNode("1066") ;
protected static Triple triple2 = new Triple(s,p,o2) ;
protected static Graph graph1 = data1() ;
- protected static Node graphIRI = NodeFactory.parseNode("<http://example/graph>") ;
+ protected static Node graphIRI = NodeFactoryExtra.parseNode("<http://example/graph>") ;
@Test public void testInsertData1()
{
@@ -222,7 +222,7 @@ public abstract class AbstractTestUpdate
@Test public void testModify2()
{
// Use blank nodes (will expose any problems in serialization when spill occurs)
- Triple t = new Triple(Node.createAnon(),p,o2);
+ Triple t = new Triple(com.hp.hpl.jena.graph.NodeFactory.createAnon(),p,o2);
GraphStore gStore = getEmptyGraphStore() ;
// Set the threshold to in order to force spill to disk
@@ -248,8 +248,8 @@ public abstract class AbstractTestUpdate
@Test public void testCopy()
{
// Use blank nodes (will expose any problems in serialization when spill occurs)
- Triple t = new Triple(Node.createAnon(),p,o2);
- Triple t2 = new Triple(Node.createAnon(),p,o1);
+ Triple t = new Triple(com.hp.hpl.jena.graph.NodeFactory.createAnon(),p,o2);
+ Triple t2 = new Triple(com.hp.hpl.jena.graph.NodeFactory.createAnon(),p,o1);
GraphStore gStore = getEmptyGraphStore() ;
// Set the threshold to in order to force spill to disk
@@ -274,15 +274,15 @@ public abstract class AbstractTestUpdate
{
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "update-1.ru") ;
- assertTrue(graphContains(gStore.getDefaultGraph(), new Triple(s,p,NodeFactory.parseNode("123")))) ;
+ assertTrue(graphContains(gStore.getDefaultGraph(), new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
}
@Test public void testUpdateScript2()
{
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "update-2.ru") ;
- assertTrue(graphContains(gStore.getGraph(Node.createURI("http://example/g1")),
- new Triple(s,p,NodeFactory.parseNode("123")))) ;
+ assertTrue(graphContains(gStore.getGraph(com.hp.hpl.jena.graph.NodeFactory.createURI("http://example/g1")),
+ new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
assertTrue(graphEmpty(gStore.getDefaultGraph())) ;
}
@@ -290,7 +290,7 @@ public abstract class AbstractTestUpdate
{
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "update-3.ru") ;
- assertTrue(graphEmpty(gStore.getGraph(Node.createURI("http://example/g1")))) ;
+ assertTrue(graphEmpty(gStore.getGraph(com.hp.hpl.jena.graph.NodeFactory.createURI("http://example/g1")))) ;
assertTrue(graphEmpty(gStore.getDefaultGraph())) ;
}
@@ -299,7 +299,7 @@ public abstract class AbstractTestUpdate
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "data-1.ru") ;
assertTrue(graphContains(gStore.getDefaultGraph(),
- new Triple(s,p,NodeFactory.parseNode("123")))) ;
+ new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
}
@Test public void testUpdateScript5()
@@ -309,7 +309,7 @@ public abstract class AbstractTestUpdate
Graph g = GraphFactory.createPlainGraph() ;
- Node b = Node.createAnon() ;
+ Node b = com.hp.hpl.jena.graph.NodeFactory.createAnon() ;
g.add(new Triple(s, p, b)) ;
g.add(new Triple(b, q, v)) ;
@@ -321,7 +321,7 @@ public abstract class AbstractTestUpdate
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "data-3.ru") ;
assertTrue(graphContains(gStore.getGraph(graphIRI),
- new Triple(s,p,NodeFactory.parseNode("123")))) ;
+ new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
}
@Test public void testUpdateScript7()
@@ -329,7 +329,7 @@ public abstract class AbstractTestUpdate
GraphStore gStore = getEmptyGraphStore() ;
script(gStore, "data-4.ru") ;
assertTrue(graphContains(gStore.getDefaultGraph(),
- new Triple(s,p,NodeFactory.parseNode("123")))) ;
+ new Triple(s,p,NodeFactoryExtra.parseNode("123")))) ;
Graph g = gStore.getGraph(graphIRI) ;
assertTrue(graphContains(gStore.getGraph(graphIRI),
new Triple(s,p,o2))) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java Sun Mar 17 17:48:00 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.modify;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.modify.request.UpdateCreate ;
import com.hp.hpl.jena.sparql.modify.request.UpdateDrop ;
@@ -31,7 +32,7 @@ import com.hp.hpl.jena.update.UpdateExce
public abstract class AbstractTestUpdateGraphMgt extends AbstractTestUpdateBase
{
- static final Node graphIRI = Node.createURI("http://example/graph") ;
+ static final Node graphIRI = NodeFactory.createURI("http://example/graph") ;
@Test public void testCreateDrop1()
{
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java Sun Mar 17 17:48:00 2013
@@ -30,6 +30,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.QueryParseException ;
@@ -58,14 +59,14 @@ public class TestPath extends BaseTest
static Graph graph6 = GraphFactory.createDefaultGraph() ;
static Graph graph7 = GraphFactory.createDefaultGraph() ;
- static Node n1 = Node.createURI("n1") ;
- static Node n2 = Node.createURI("n2") ;
- static Node n3 = Node.createURI("n3") ;
- static Node n4 = Node.createURI("n4") ;
- static Node n5 = Node.createURI("n5") ;
- static Node n6 = Node.createURI("n6") ;
- static Node p = Node.createURI("http://example/p") ;
- static Node q = Node.createURI("http://example/q") ;
+ static Node n1 = NodeFactory.createURI("n1") ;
+ static Node n2 = NodeFactory.createURI("n2") ;
+ static Node n3 = NodeFactory.createURI("n3") ;
+ static Node n4 = NodeFactory.createURI("n4") ;
+ static Node n5 = NodeFactory.createURI("n5") ;
+ static Node n6 = NodeFactory.createURI("n6") ;
+ static Node p = NodeFactory.createURI("http://example/p") ;
+ static Node q = NodeFactory.createURI("http://example/q") ;
static PrefixMapping pmap = new PrefixMappingImpl() ;
static {
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java Sun Mar 17 17:48:00 2013
@@ -43,7 +43,7 @@ import com.hp.hpl.jena.sparql.engine.ite
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterSingleton ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderResultSet ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.sparql.util.ResultSetUtils ;
public class TestResultSet extends BaseTest
@@ -71,7 +71,7 @@ public class TestResultSet extends BaseT
@Test public void test_RS_2()
{
- ResultSetRewindable rs1 = makeRewindable("x", Node.createURI("tag:local")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
ResultSetFormatter.outputAsXML(arr, rs1) ;
rs1.reset() ;
@@ -82,7 +82,7 @@ public class TestResultSet extends BaseT
@Test public void test_RS_2_str()
{
- ResultSetRewindable rs1 = makeRewindable("x", Node.createURI("tag:local")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
String x = ResultSetFormatter.asXMLString(rs1) ;
rs1.reset() ;
ResultSet rs2 = ResultSetFactory.fromXML(x) ;
@@ -102,7 +102,7 @@ public class TestResultSet extends BaseT
@Test public void test_RS_4()
{
- ResultSetRewindable rs1 = makeRewindable("x", Node.createURI("tag:local")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
Model model = ResultSetFormatter.toModel(rs1) ;
rs1.reset() ;
ResultSetRewindable rs2 = ResultSetFactory.makeRewindable(ResultSetFactory.fromRDF(model)) ;
@@ -133,7 +133,7 @@ public class TestResultSet extends BaseT
@Test public void test_RS_6()
{
- ResultSetRewindable rs1 = make2Rewindable("x", Node.createURI("tag:local")) ;
+ ResultSetRewindable rs1 = make2Rewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
ResultSetFormatter.outputAsJSON(arr, rs1) ;
rs1.reset() ;
@@ -172,17 +172,17 @@ public class TestResultSet extends BaseT
@Test public void test_RS_union_1()
{
- ResultSet rs1 = make("x", Node.createURI("tag:local")) ;
- ResultSet rs2 = make("x", Node.createURI("tag:local")) ;
- ResultSet rs3 = make2("x", Node.createURI("tag:local")) ;
+ ResultSet rs1 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
+ ResultSet rs2 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
+ ResultSet rs3 = make2("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
assertTrue(ResultSetCompare.equalsByTerm(rs3, ResultSetUtils.union(rs1, rs2))) ;
}
@Test(expected = ResultSetException.class)
public void test_RS_union_2()
{
- ResultSet rs1 = make("x", Node.createURI("tag:local")) ;
- ResultSet rs2 = make("y", Node.createURI("tag:local")) ;
+ ResultSet rs1 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
+ ResultSet rs2 = make("y", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
ResultSetUtils.union(rs1, rs2) ;
}
@@ -229,7 +229,7 @@ public class TestResultSet extends BaseT
@Test public void test_RS_cmp_2()
{
- ResultSet rs1 = make("x", Node.createURI("tag:local")) ;
+ ResultSet rs1 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
ResultSet rs2 = new ResultSetMem() ;
assertFalse(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
@@ -237,15 +237,15 @@ public class TestResultSet extends BaseT
@Test public void test_RS_cmp_3()
{
- ResultSet rs1 = make("x", Node.createURI("tag:local")) ;
+ ResultSet rs1 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
ResultSet rs2 = new ResultSetMem() ;
assertFalse(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
}
@Test public void test_RS_cmp_4()
{
- ResultSet rs1 = make("x", Node.createURI("tag:local")) ;
- ResultSet rs2 = make("x", Node.createURI("tag:local")) ;
+ ResultSet rs1 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
+ ResultSet rs2 = make("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
assertTrue(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
assertTrue(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
}
@@ -253,8 +253,8 @@ public class TestResultSet extends BaseT
@Test public void test_RS_cmp_5()
{
// Same variable, different values
- ResultSetRewindable rs1 = makeRewindable("x", Node.createURI("tag:local:1")) ;
- ResultSetRewindable rs2 = makeRewindable("x", Node.createURI("tag:local:2")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local:1")) ;
+ ResultSetRewindable rs2 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local:2")) ;
assertFalse(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
rs1.reset() ;
rs2.reset() ;
@@ -264,8 +264,8 @@ public class TestResultSet extends BaseT
@Test public void test_RS_cmp_6()
{
// Different variable, same values
- ResultSetRewindable rs1 = makeRewindable("x", Node.createURI("tag:local")) ;
- ResultSetRewindable rs2 = makeRewindable("y", Node.createURI("tag:local")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
+ ResultSetRewindable rs2 = makeRewindable("y", com.hp.hpl.jena.graph.NodeFactory.createURI("tag:local")) ;
assertFalse(ResultSetCompare.equalsByTermAndOrder(rs1, rs2)) ;
rs1.reset() ;
rs2.reset() ;
@@ -275,8 +275,8 @@ public class TestResultSet extends BaseT
// Value based
@Test public void test_RS_cmp_value_1()
{
- ResultSetRewindable rs1 = makeRewindable("x", NodeFactory.parseNode("123")) ;
- ResultSetRewindable rs2 = makeRewindable("x", NodeFactory.parseNode("0123")) ;
+ ResultSetRewindable rs1 = makeRewindable("x", NodeFactoryExtra.parseNode("123")) ;
+ ResultSetRewindable rs2 = makeRewindable("x", NodeFactoryExtra.parseNode("0123")) ;
assertFalse(ResultSetCompare.equalsByTerm(rs1, rs2)) ;
assertTrue(ResultSetCompare.equalsByValue(rs1, rs2)) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java Sun Mar 17 17:48:00 2013
@@ -30,18 +30,18 @@ import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemException ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.SSEParseException ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestSSE_Basic extends TestCase
{
// Tests not requiring URI resolution or prefix name handling.
- static Node int1 = Node.createLiteral("1", null, XSDDatatype.XSDinteger) ;
- static Node int2 = Node.createLiteral("2", null, XSDDatatype.XSDinteger) ;
- static Node int3 = Node.createLiteral("3", null, XSDDatatype.XSDinteger) ;
- static Node strLangEN = Node.createLiteral("xyz", "en", null) ;
+ static Node int1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("1", null, XSDDatatype.XSDinteger) ;
+ static Node int2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("2", null, XSDDatatype.XSDinteger) ;
+ static Node int3 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
+ static Node strLangEN = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
- static Node typeLit1 = NodeFactory.createLiteralNode("123", null, "http://example/type") ;
+ static Node typeLit1 = NodeFactoryExtra.createLiteralNode("123", null, "http://example/type") ;
static Item int1i = Item.createNode(int1) ;
static Item int2i = Item.createNode(int2) ;
@@ -92,7 +92,7 @@ public class TestSSE_Basic extends TestC
@Test public void testLit_12()
{
- Node n = Node.createLiteral("A\tB") ;
+ Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral("A\tB") ;
testNode("'''A\\tB'''", n) ;
}
@@ -153,7 +153,7 @@ public class TestSSE_Basic extends TestC
// ---- Nodes
@Test public void testNode_1() { testNode("3", int3) ; }
- @Test public void testNode_2() { testNode("<http://example/node1>", Node.createURI("http://example/node1")) ; }
+ @Test public void testNode_2() { testNode("<http://example/node1>", com.hp.hpl.jena.graph.NodeFactory.createURI("http://example/node1")) ; }
@Test public void testTypedLit_1() { testNode("\"123\"^^<http://example/type>", typeLit1) ; }
@Test public void testTypedLit_2() { testNode("'123'^^<http://example/type>", typeLit1) ; }
@Test public void testTypedLit_3() { testNode("'3'^^<"+XSDDatatype.XSDinteger.getURI()+">", int3) ; }
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java Sun Mar 17 17:48:00 2013
@@ -25,6 +25,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.sse.Item ;
@@ -55,13 +56,13 @@ public class TestSSE_Forms extends TestC
@Test public void testBase_01()
{
- Item r = Item.createNode(Node.createURI("http://example/x")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/x")) ;
testItem("(base <http://example/> <x>)", r) ;
}
@Test public void testBase_02()
{
- Item r = Item.createNode(Node.createURI("http://example/x")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/x")) ;
testItem("(base <http://HOST/> (base <http://example/xyz> <x>))", r) ;
}
@@ -99,13 +100,13 @@ public class TestSSE_Forms extends TestC
@Test public void testPrefix_01()
{
- Item r = Item.createNode(Node.createURI("http://example/abc")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/abc")) ;
testItem("(prefix ((ex: <http://example/>)) ex:abc)", r);
}
@Test public void testPrefix_02()
{
- Item r = Item.createNode(Node.createURI("http://EXAMPLE/abc")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://EXAMPLE/abc")) ;
testItem("(prefix ((ex: <http://example/>)) (prefix ((ex: <http://EXAMPLE/>)) ex:abc))", r);
}
@@ -148,7 +149,7 @@ public class TestSSE_Forms extends TestC
@Test public void testTypedLit_r1()
{
- Node node = Node.createLiteral("3", null, XSDDatatype.XSDinteger) ;
+ Node node = NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
testItem("'3'^^xsd:integer", Item.createNode(node)) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java Sun Mar 17 17:48:00 2013
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.datatypes.xsd.XSD
import com.hp.hpl.jena.graph.Factory ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -199,15 +200,15 @@ public class TestList extends TestCase
return new GNode(graph, t.getObject()) ;
}
- private static Node node1 = Node.createLiteral("1", "", XSDDatatype.XSDinteger) ;
- private static Node node2 = Node.createLiteral("2", "", XSDDatatype.XSDinteger) ;
- private static Node node3 = Node.createLiteral("3", "", XSDDatatype.XSDinteger) ;
- private static Node node4 = Node.createLiteral("4", "", XSDDatatype.XSDinteger) ;
+ private static Node node1 = NodeFactory.createLiteral("1", "", XSDDatatype.XSDinteger) ;
+ private static Node node2 = NodeFactory.createLiteral("2", "", XSDDatatype.XSDinteger) ;
+ private static Node node3 = NodeFactory.createLiteral("3", "", XSDDatatype.XSDinteger) ;
+ private static Node node4 = NodeFactory.createLiteral("4", "", XSDDatatype.XSDinteger) ;
- private static Node node0 = Node.createLiteral("0", "", XSDDatatype.XSDinteger) ;
+ private static Node node0 = NodeFactory.createLiteral("0", "", XSDDatatype.XSDinteger) ;
- private static Node r = Node.createURI("http://example/r") ;
- private static Node p = Node.createURI("http://example/p") ;
+ private static Node r = NodeFactory.createURI("http://example/r") ;
+ private static Node p = NodeFactory.createURI("http://example/p") ;
private static String preamble = "@prefix : <http://example/> . :r :p " ;
private static String listStr_1 = preamble + "() ." ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java Sun Mar 17 17:48:00 2013
@@ -33,7 +33,7 @@ import org.junit.Test ;
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.SortCondition ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
@@ -166,16 +166,16 @@ public class TestDistinctDataBag extends
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], Node.createAnon());
- binding.add(vars[1], Node.createURI(randomURI()));
- binding.add(vars[2], Node.createURI(randomURI()));
- binding.add(vars[3], Node.createLiteral(randomString(20)));
- binding.add(vars[4], Node.createAnon());
- binding.add(vars[5], Node.createURI(randomURI()));
- binding.add(vars[6], Node.createURI(randomURI()));
- binding.add(vars[7], Node.createLiteral(randomString(5)));
- binding.add(vars[8], Node.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
- binding.add(vars[9], Node.createAnon());
+ binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[1], NodeFactory.createURI(randomURI()));
+ binding.add(vars[2], NodeFactory.createURI(randomURI()));
+ binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
+ binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[5], NodeFactory.createURI(randomURI()));
+ binding.add(vars[6], NodeFactory.createURI(randomURI()));
+ binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java Sun Mar 17 17:48:00 2013
@@ -34,7 +34,7 @@ import org.junit.Test ;
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.SortCondition ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
@@ -270,16 +270,16 @@ public class TestDistinctDataNet extends
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], Node.createAnon());
- binding.add(vars[1], Node.createURI(randomURI()));
- binding.add(vars[2], Node.createURI(randomURI()));
- binding.add(vars[3], Node.createLiteral(randomString(20)));
- binding.add(vars[4], Node.createAnon());
- binding.add(vars[5], Node.createURI(randomURI()));
- binding.add(vars[6], Node.createURI(randomURI()));
- binding.add(vars[7], Node.createLiteral(randomString(5)));
- binding.add(vars[8], Node.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
- binding.add(vars[9], Node.createAnon());
+ binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[1], NodeFactory.createURI(randomURI()));
+ binding.add(vars[2], NodeFactory.createURI(randomURI()));
+ binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
+ binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[5], NodeFactory.createURI(randomURI()));
+ binding.add(vars[6], NodeFactory.createURI(randomURI()));
+ binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java Sun Mar 17 17:48:00 2013
@@ -34,7 +34,7 @@ import org.junit.Test ;
import org.openjena.riot.SerializationFactoryFinder ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.query.SortCondition ;
@@ -187,16 +187,16 @@ public class TestSortedDataBag extends T
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], Node.createAnon());
- binding.add(vars[1], Node.createURI(randomURI()));
- binding.add(vars[2], Node.createURI(randomURI()));
- binding.add(vars[3], Node.createLiteral(randomString(20)));
- binding.add(vars[4], Node.createAnon());
- binding.add(vars[5], Node.createURI(randomURI()));
- binding.add(vars[6], Node.createURI(randomURI()));
- binding.add(vars[7], Node.createLiteral(randomString(5)));
- binding.add(vars[8], Node.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
- binding.add(vars[9], Node.createAnon());
+ binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[1], NodeFactory.createURI(randomURI()));
+ binding.add(vars[2], NodeFactory.createURI(randomURI()));
+ binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
+ binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[5], NodeFactory.createURI(randomURI()));
+ binding.add(vars[6], NodeFactory.createURI(randomURI()));
+ binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java Sun Mar 17 17:48:00 2013
@@ -27,7 +27,7 @@ import org.apache.jena.riot.system.Strea
import org.apache.jena.riot.tokens.Tokenizer ;
import org.junit.Test ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.lib.DatasetLib ;
@@ -68,7 +68,7 @@ public class TestLangNQuads extends Test
// This must parse to <g>
DatasetGraph dsg = parseToDataset("<x> <p> <s> <g> .") ;
assertEquals(1,dsg.size()) ;
- assertEquals(1, dsg.getGraph(Node.createURI("g")).size()) ;
+ assertEquals(1, dsg.getGraph(NodeFactory.createURI("g")).size()) ;
assertEquals(0, dsg.getDefaultGraph().size()) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeAllocator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeAllocator.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeAllocator.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeAllocator.java Sun Mar 17 17:48:00 2013
@@ -23,11 +23,12 @@ import org.apache.jena.riot.lang.LabelTo
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
public class TestNodeAllocator extends BaseTest
{
- static Node gragh1 = Node.createURI("g1") ;
- static Node gragh2 = Node.createURI("g2") ;
+ static Node gragh1 = NodeFactory.createURI("g1") ;
+ static Node gragh2 = NodeFactory.createURI("g2") ;
// ---- One Scope
@Test public void allocOneScope1()
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java Sun Mar 17 17:48:00 2013
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/**
* Tests for the {@link PipedRDFIterator} implementation
@@ -90,7 +90,7 @@ public class TestPipedRDFIterators {
out.start();
// Generate triples
for (int i = 1; i <= generateSize; i++) {
- Triple t = new Triple(Node.createAnon(), Node.createURI("http://predicate"), NodeFactory.intToNode(i));
+ Triple t = new Triple(com.hp.hpl.jena.graph.NodeFactory.createAnon(), com.hp.hpl.jena.graph.NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.triple(t);
}
out.finish();
@@ -233,8 +233,8 @@ public class TestPipedRDFIterators {
out.start();
// Generate quads
for (int i = 1; i <= generateSize; i++) {
- Quad q = new Quad(Node.createURI("http://graph"), Node.createAnon(), Node.createURI("http://predicate"),
- NodeFactory.intToNode(i));
+ Quad q = new Quad(com.hp.hpl.jena.graph.NodeFactory.createURI("http://graph"), com.hp.hpl.jena.graph.NodeFactory.createAnon(), com.hp.hpl.jena.graph.NodeFactory.createURI("http://predicate"),
+ NodeFactoryExtra.intToNode(i));
out.quad(q);
}
out.finish();
@@ -377,8 +377,8 @@ public class TestPipedRDFIterators {
out.start();
// Generate tuples
for (int i = 1; i <= generateSize; i++) {
- Tuple<Node> t = Tuple.create(Node.createURI("http://graph"), Node.createAnon(),
- Node.createURI("http://predicate"), NodeFactory.intToNode(i));
+ Tuple<Node> t = Tuple.create(com.hp.hpl.jena.graph.NodeFactory.createURI("http://graph"), com.hp.hpl.jena.graph.NodeFactory.createAnon(),
+ com.hp.hpl.jena.graph.NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.tuple(t);
}
out.finish();
@@ -644,7 +644,7 @@ public class TestPipedRDFIterators {
public void run()
{
out.start();
- out.triple(Triple.create(Node.createURI("urn:s"), Node.createURI("urn:p"), Node.createURI("urn:o")));
+ out.triple(Triple.create(com.hp.hpl.jena.graph.NodeFactory.createURI("urn:s"), com.hp.hpl.jena.graph.NodeFactory.createURI("urn:p"), com.hp.hpl.jena.graph.NodeFactory.createURI("urn:o")));
throw new RuntimeException("die!");
}
});
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java Sun Mar 17 17:48:00 2013
@@ -26,7 +26,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestNodeFmt extends BaseTest
{
@@ -46,7 +46,7 @@ public class TestNodeFmt extends BaseTes
public static void test(NodeFormatter nodeFormatter, String nStr , String str)
{
- Node n = NodeFactory.parseNode(nStr) ;
+ Node n = NodeFactoryExtra.parseNode(nStr) ;
test(nodeFormatter, n, str) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java Sun Mar 17 17:48:00 2013
@@ -19,7 +19,7 @@
package org.apache.jena.riot.out;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.vocabulary.RDF ;
import org.apache.jena.atlas.junit.BaseTest ;
@@ -67,7 +67,7 @@ public class TestNodeFmtLib extends Base
@Test public void fmtNode_04() { test ("'abc'^^xsd:integer", "\"abc\"^^xsd:integer") ; }
private static void test(String node, String output)
- { test(NodeFactory.parseNode(node) , output) ; }
+ { test(NodeFactoryExtra.parseNode(node) , output) ; }
private static void test(Node node, String output)
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java Sun Mar 17 17:48:00 2013
@@ -30,7 +30,7 @@ import org.apache.jena.riot.system.Prolo
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
// Check the basisc of output
// Nodes, escapes, prefix mapping.
@@ -108,7 +108,7 @@ public class TestOutput extends BaseTest
private static String stringForNode(String nodeStr, Prologue prologue, String encoding)
{
- Node node = NodeFactory.parseNode(nodeStr) ;
+ Node node = NodeFactoryExtra.parseNode(nodeStr) ;
try
{
ByteArrayOutputStream bytes = new ByteArrayOutputStream() ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java Sun Mar 17 17:48:00 2013
@@ -23,7 +23,7 @@ import org.apache.jena.riot.process.norm
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestNormalization extends BaseTest
{
@@ -101,11 +101,11 @@ public class TestNormalization extends B
private static void normalize(String input, String expected)
{
- Node n1 = NodeFactory.parseNode(input) ;
+ Node n1 = NodeFactoryExtra.parseNode(input) ;
assertTrue("Invalid lexical form", n1.getLiteralDatatype().isValid(n1.getLiteralLexicalForm()));
Node n2 = CanonicalizeLiteral.get().convert(n1) ;
- Node n3 = NodeFactory.parseNode(expected) ;
+ Node n3 = NodeFactoryExtra.parseNode(expected) ;
assertEquals("Invalid canonicalization (lex)", n3.getLiteralLexicalForm(), n2.getLiteralLexicalForm()) ;
assertEquals("Invalid canonicalization (node)", n3, n2) ;
}
@@ -115,9 +115,9 @@ public class TestNormalization extends B
private static void normalizeLang(String input, String expected, boolean correct)
{
- Node n1 = NodeFactory.parseNode(input) ;
+ Node n1 = NodeFactoryExtra.parseNode(input) ;
Node n2 = CanonicalizeLiteral.get().convert(n1) ;
- Node n3 = NodeFactory.parseNode(expected) ;
+ Node n3 = NodeFactoryExtra.parseNode(expected) ;
if ( correct )
{
assertEquals("Invalid canonicalization (lang)", n3.getLiteralLanguage(), n2.getLiteralLanguage()) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java Sun Mar 17 17:48:00 2013
@@ -27,7 +27,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.shared.impl.JenaParameters ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestChecker
{
@@ -131,7 +131,7 @@ public class TestChecker
private static void check(String string)
{
- Node n = NodeFactory.parseNode(string) ;
+ Node n = NodeFactoryExtra.parseNode(string) ;
checker.check(n, -1, -1) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java Sun Mar 17 17:48:00 2013
@@ -26,7 +26,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.rdf.model.AnonId ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestTokenForNode extends BaseTest
{
@@ -62,7 +62,7 @@ public class TestTokenForNode extends Ba
{ test( "<http://example/bar>", TokenType.PREFIXED_NAME, "ex", "bar", null, null) ; }
@Test public void tokenForNode07()
- { test( Node.createAnon(new AnonId("abc")), TokenType.BNODE, "abc", null, null, null ) ; }
+ { test( com.hp.hpl.jena.graph.NodeFactory.createAnon(new AnonId("abc")), TokenType.BNODE, "abc", null, null, null ) ; }
@Test public void tokenForNode08()
{ test( Node.ANY, TokenType.KEYWORD, "ANY", null, null, null) ; }
@@ -81,7 +81,7 @@ public class TestTokenForNode extends Ba
private static void test(String nodeStr,
TokenType type, String image, String image2, Token subToken1, Token subToken2)
{
- Node n = NodeFactory.parseNode(nodeStr) ;
+ Node n = NodeFactoryExtra.parseNode(nodeStr) ;
test(n, type, image, image2, subToken1, subToken2) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java Sun Mar 17 17:48:00 2013
@@ -35,6 +35,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -136,11 +137,11 @@ public class TestRDFJSON extends BaseTes
@Test public void rdfjson_escapes()
{
Graph g = GraphFactory.createGraphMem();
- Node s = Node.createAnon();
- Node p = Node.createURI("http://predicate");
- g.add(new Triple(s, p, Node.createLiteral("quote \" character")));
- g.add(new Triple(s, p, Node.createLiteral("new \n\r lines")));
- g.add(new Triple(s, p, Node.createLiteral("tab \t character")));
+ Node s = NodeFactory.createAnon();
+ Node p = NodeFactory.createURI("http://predicate");
+ g.add(new Triple(s, p, NodeFactory.createLiteral("quote \" character")));
+ g.add(new Triple(s, p, NodeFactory.createLiteral("new \n\r lines")));
+ g.add(new Triple(s, p, NodeFactory.createLiteral("tab \t character")));
test(g);
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.GraphUtil ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
@@ -35,9 +36,9 @@ public abstract class TestDatasetGraphAc
protected static final String gn2 = "http://graph/2" ;
protected static final String gn99 = "http://graph/99" ;
- protected static final Node n1 = Node.createURI("http://graph/1") ;
- protected static final Node n2 = Node.createURI("http://graph/2") ;
- protected static final Node n99 = Node.createURI("http://graph/99") ;
+ protected static final Node n1 = NodeFactory.createURI("http://graph/1") ;
+ protected static final Node n2 = NodeFactory.createURI("http://graph/2") ;
+ protected static final Node n99 = NodeFactory.createURI("http://graph/99") ;
protected static final Graph graph1 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 1)))") ;
protected static final Graph graph2 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 2)))") ;
Modified: jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java Sun Mar 17 17:48:00 2013
@@ -40,7 +40,7 @@ import com.hp.hpl.jena.sparql.expr.E_Fun
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
import com.hp.hpl.jena.sparql.junit.SimpleTestRunner ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.sparql.vocabulary.DOAP ;
import com.hp.hpl.jena.sparql.vocabulary.FOAF ;
@@ -194,7 +194,7 @@ public class rdflangtest extends CmdGene
Resource release = model.createResource(DOAP.Version) ;
system.addProperty(DOAP.release, release) ;
- Node today_node = NodeFactory.todayAsDate() ;
+ Node today_node = NodeFactoryExtra.todayAsDate() ;
Literal today = model.createTypedLiteral(today_node.getLiteralLexicalForm(), today_node.getLiteralDatatype()) ;
release.addProperty(DOAP.created, today) ;
release.addProperty(DOAP.name, releaseName) ; // Again
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java Sun Mar 17 17:48:00 2013
@@ -21,7 +21,7 @@ package org.apache.jena.fuseki.http;
import org.apache.jena.fuseki.DatasetAccessor ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -45,7 +45,7 @@ public class DatasetAdapter implements D
@Override
public Model getModel(String graphUri)
{
- Graph g = updater.httpGet(Node.createURI(graphUri)) ;
+ Graph g = updater.httpGet(NodeFactory.createURI(graphUri)) ;
if ( g == null )
return null ;
return ModelFactory.createModelForGraph(g) ;
@@ -54,7 +54,7 @@ public class DatasetAdapter implements D
@Override
public boolean containsModel(String graphUri)
{
- return updater.httpHead(Node.createURI(graphUri)) ;
+ return updater.httpHead(NodeFactory.createURI(graphUri)) ;
}
/** Put (replace) the default model of a Dataset */
@@ -68,7 +68,7 @@ public class DatasetAdapter implements D
@Override
public void putModel(String graphUri, Model data)
{
- updater.httpPut(Node.createURI(graphUri), data.getGraph()) ;
+ updater.httpPut(NodeFactory.createURI(graphUri), data.getGraph()) ;
}
/** Delete (which means clear) the default model of a Dataset */
@@ -82,7 +82,7 @@ public class DatasetAdapter implements D
@Override
public void deleteModel(String graphUri)
{
- updater.httpDelete(Node.createURI(graphUri)) ;
+ updater.httpDelete(NodeFactory.createURI(graphUri)) ;
}
/** Add statements to the default model of a Dataset */
@@ -96,6 +96,6 @@ public class DatasetAdapter implements D
@Override
public void add(String graphUri, Model data)
{
- updater.httpPost(Node.createURI(graphUri), data.getGraph()) ;
+ updater.httpPost(NodeFactory.createURI(graphUri), data.getGraph()) ;
}
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Sun Mar 17 17:48:00 2013
@@ -36,6 +36,7 @@ import org.apache.jena.riot.system.Strea
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
/**
@@ -182,7 +183,7 @@ public class REST_Quads extends SPARQL_R
if ( ! name.endsWith("/") )
name = name+ "/" ;
name = name+(++counter) ;
- Node gn = Node.createURI(name) ;
+ Node gn = NodeFactory.createURI(name) ;
Graph g = dsg.getGraph(gn) ;
StreamRDF dest = StreamRDFLib.graph(g) ;
LangRIOT parser = RiotReader.createParser(action.request.getInputStream(), lang, name , dest) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Sun Mar 17 17:48:00 2013
@@ -47,6 +47,7 @@ import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
@@ -63,7 +64,7 @@ public abstract class SPARQL_REST extend
HttpActionREST(long id, DatasetRef desc, String absUri, HttpServletRequest request, HttpServletResponse response, boolean verbose)
{
super(id, desc, request, response, verbose) ;
- Node gn = Node.createURI(absUri) ;
+ Node gn = NodeFactory.createURI(absUri) ;
_target = Target.createNamed(desc.dataset, absUri, gn) ;
}
@@ -426,7 +427,7 @@ public abstract class SPARQL_REST extend
base = base + "/" ;
String absUri = IRIResolver.resolveString(uri, base) ;
- Node gn = Node.createURI(absUri) ;
+ Node gn = NodeFactory.createURI(absUri) ;
return Target.createNamed(dsg, absUri, gn) ;
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Sun Mar 17 17:48:00 2013
@@ -45,6 +45,7 @@ import org.apache.jena.riot.system.IRIRe
import org.apache.jena.web.HttpSC ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.QueryParseException ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.modify.UsingList ;
@@ -301,7 +302,7 @@ public class SPARQL_Update extends SPARQ
{
try {
IRI iri = resolver.resolve(x) ;
- return Node.createURI(iri.toString()) ;
+ return NodeFactory.createURI(iri.toString()) ;
} catch (Exception ex)
{
errorBadRequest("SPARQL Update: bad IRI: "+x) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Sun Mar 17 17:48:00 2013
@@ -43,6 +43,7 @@ import org.apache.jena.web.HttpSC ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
@@ -101,7 +102,7 @@ public class SPARQL_Upload extends SPARQ
Node gn = graphName.equals(HttpNames.valueDefault)
? Quad.defaultGraphNodeGenerated
- : Node.createURI(graphName) ;
+ : NodeFactory.createURI(graphName) ;
FusekiLib.addDataInto(graphTmp, action.getActiveDSG(), gn) ;
tripleCount = graphTmp.size();
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java Sun Mar 17 17:48:00 2013
@@ -20,6 +20,7 @@ package org.apache.jena.fuseki;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -36,9 +37,9 @@ public class BaseServerTest extends Base
protected static final String gn2 = "http://graph/2" ;
protected static final String gn99 = "http://graph/99" ;
- protected static final Node n1 = Node.createURI("http://graph/1") ;
- protected static final Node n2 = Node.createURI("http://graph/2") ;
- protected static final Node n99 = Node.createURI("http://graph/99") ;
+ protected static final Node n1 = NodeFactory.createURI("http://graph/1") ;
+ protected static final Node n2 = NodeFactory.createURI("http://graph/2") ;
+ protected static final Node n99 = NodeFactory.createURI("http://graph/99") ;
protected static final Graph graph1 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 1)))") ;
protected static final Graph graph2 = SSE.parseGraph("(base <http://example/> (graph (<x> <p> 2)))") ;
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java Sun Mar 17 17:48:00 2013
@@ -64,7 +64,7 @@ public class GraphSDB extends GraphBase
public GraphSDB(Store store, String uri)
{
- this(store, Node.createURI(uri)) ;
+ this(store, NodeFactory.createURI(uri)) ;
}
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout1/CodecSimple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout1/CodecSimple.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout1/CodecSimple.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout1/CodecSimple.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
package com.hp.hpl.jena.sdb.layout1;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
@@ -51,7 +52,7 @@ public class CodecSimple implements Enco
System.err.println(s) ;
if ( s.startsWith("_:") )
- return Node.createAnon(new AnonId(s.substring(2))) ;
+ return NodeFactory.createAnon(new AnonId(s.substring(2))) ;
return stringToNode(s, prefixMapping) ;
}
Modified: jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java (original)
+++ jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java Sun Mar 17 17:48:00 2013
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.datatypes.RDFData
import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId;
import com.hp.hpl.jena.sdb.compiler.SqlBuilder;
import com.hp.hpl.jena.sdb.core.AliasesSql;
@@ -236,25 +237,25 @@ public class SQLBridge2 extends SQLBridg
switch (vType)
{
case BNODE:
- return Node.createAnon(new AnonId(lex)) ;
+ return NodeFactory.createAnon(new AnonId(lex)) ;
case URI:
- return Node.createURI(lex) ;
+ return NodeFactory.createURI(lex) ;
case STRING:
- return Node.createLiteral(lex, lang, false) ;
+ return NodeFactory.createLiteral(lex, lang, false) ;
case XSDSTRING:
- return Node.createLiteral(lex, null, XSDDatatype.XSDstring) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDstring) ;
case INTEGER:
- return Node.createLiteral(lex, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDinteger) ;
case DOUBLE:
- return Node.createLiteral(lex, null, XSDDatatype.XSDdouble) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdouble) ;
case DATETIME:
- return Node.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
case OTHER:
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(datatype);
- return Node.createLiteral(lex, null, dt) ;
+ return NodeFactory.createLiteral(lex, null, dt) ;
default:
log.warn("Unrecognized: ("+lex+", "+lang+", "+vType+")") ;
- return Node.createLiteral("UNRECOGNIZED") ;
+ return NodeFactory.createLiteral("UNRECOGNIZED") ;
}
}
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java Sun Mar 17 17:48:00 2013
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.tdb;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -245,12 +245,12 @@ public class TDBFactory
*/
@Deprecated
public static Graph createNamedGraph(String name, String location)
- { return createDatasetGraph(location).getGraph(Node.createURI(name)) ; }
+ { return createDatasetGraph(location).getGraph(NodeFactory.createURI(name)) ; }
/** Create a TDB graph for named graph
* @deprecated Create a DatasetGraph and get the name graph from that.
*/
@Deprecated
public static Graph createNamedGraph(String name, Location location)
- { return createDatasetGraph(location).getGraph(Node.createURI(name)) ; }
+ { return createDatasetGraph(location).getGraph(NodeFactory.createURI(name)) ; }
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java Sun Mar 17 17:48:00 2013
@@ -22,6 +22,7 @@ import org.apache.jena.atlas.lib.StrUtil
import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -54,7 +55,7 @@ public class NodecLib
//throw new TDBException("Space found in URI: "+node) ;
String x = StrUtils.encodeHex(node.getURI(), '_', invalidIRIChars) ;
if ( x != node.getURI() )
- node = Node.createURI(x) ;
+ node = NodeFactory.createURI(x) ;
}
return NodeFmtLib.serialize(node) ;
@@ -67,14 +68,14 @@ public class NodecLib
if ( s.startsWith("_:") )
{
s = s.substring(2) ;
- return Node.createAnon(new AnonId(s)) ;
+ return NodeFactory.createAnon(new AnonId(s)) ;
}
if ( s.startsWith("<") )
{
s = s.substring(1,s.length()-1) ;
s = StrUtils.decodeHex(s, MarkerChar) ;
- return Node.createURI(s) ;
+ return NodeFactory.createURI(s) ;
}
try {
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java Sun Mar 17 17:48:00 2013
@@ -29,6 +29,7 @@ import org.apache.jena.riot.tokens.Token
import org.apache.jena.riot.web.LangTag ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.tdb.TDBException ;
@@ -60,7 +61,7 @@ public class NodecSSE implements Nodec
// Pesky spaces etc
String x = StrUtils.encodeHex(node.getURI(), MarkerChar, invalidIRIChars) ;
if ( x != node.getURI() )
- node = Node.createURI(x) ;
+ node = NodeFactory.createURI(x) ;
}
if ( node.isLiteral() && node.getLiteralLanguage() != null )
@@ -102,7 +103,7 @@ public class NodecSSE implements Nodec
// In particular, bnode labels can contain ":" from Jena
// TokenizerText does not recognize these.
str = str.substring(2) ;
- return Node.createAnon(new AnonId(str)) ;
+ return NodeFactory.createAnon(new AnonId(str)) ;
}
if ( str.startsWith("<") )
@@ -112,7 +113,7 @@ public class NodecSSE implements Nodec
str = str.substring(1,str.length()-1) ;
str = StrUtils.unescapeString(str) ;
str = StrUtils.decodeHex(str, MarkerChar) ;
- return Node.createURI(str) ;
+ return NodeFactory.createURI(str) ;
}
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(str) ;