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 [4/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-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java Sun Mar 17 17:48:00 2013
@@ -39,7 +39,7 @@ import com.hp.hpl.jena.sparql.engine.opt
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
import com.hp.hpl.jena.sparql.sse.ItemWriter ;
-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.tdb.index.TupleIndex ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
@@ -50,7 +50,7 @@ import com.hp.hpl.jena.tdb.sys.Names ;
public class Stats
{
- static Item ZERO = Item.createNode(NodeFactory.intToNode(0)) ;
+ static Item ZERO = Item.createNode(NodeFactoryExtra.intToNode(0)) ;
/** Write statistics */
static public void write(String filename, StatsCollector stats)
@@ -180,10 +180,10 @@ public class Stats
// System.out.println("Nodes") ;
Item meta = createTagged(StatsMatcher.META) ;
- addPair(meta.getList(), "timestamp", NodeFactory.nowAsDateTime()) ;
+ addPair(meta.getList(), "timestamp", NodeFactoryExtra.nowAsDateTime()) ;
addPair(meta.getList(), "run@", Utils.nowAsString()) ;
if ( count >= 0 )
- addPair(meta.getList(), StatsMatcher.COUNT, NodeFactory.intToNode((int)count)) ;
+ addPair(meta.getList(), StatsMatcher.COUNT, NodeFactoryExtra.intToNode((int)count)) ;
statsList.add(meta) ;
for ( Entry<Node, Integer> entry : predicates.entrySet() )
@@ -192,7 +192,7 @@ public class Stats
// Skip these - they just clog things up!
if ( node.getURI().startsWith("http://www.w3.org/1999/02/22-rdf-syntax-ns#_") )
continue ;
- addPair(statsList, node, NodeFactory.intToNode(entry.getValue())) ;
+ addPair(statsList, node, NodeFactoryExtra.intToNode(entry.getValue())) ;
}
// Add a default rule.
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java Sun Mar 17 17:48:00 2013
@@ -30,6 +30,7 @@ import org.apache.jena.atlas.lib.ColumnM
import org.apache.jena.atlas.lib.Tuple ;
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.sparql.core.DatasetPrefixStorage ;
import com.hp.hpl.jena.sparql.graph.GraphPrefixesProjection ;
@@ -114,9 +115,9 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized void insertPrefix(String graphName, String prefix, String uri)
{
- Node g = Node.createURI(graphName) ;
- Node p = Node.createLiteral(prefix) ;
- Node u = Node.createURI(uri) ;
+ Node g = NodeFactory.createURI(graphName) ;
+ Node p = NodeFactory.createLiteral(prefix) ;
+ Node u = NodeFactory.createURI(uri) ;
nodeTupleTable.addRow(g,p,u) ;
}
@@ -135,8 +136,8 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized String readPrefix(String graphName, String prefix)
{
- Node g = Node.createURI(graphName) ;
- Node p = Node.createLiteral(prefix) ;
+ Node g = NodeFactory.createURI(graphName) ;
+ Node p = NodeFactory.createLiteral(prefix) ;
Iterator<Tuple<Node>> iter = nodeTupleTable.find(g, p, null) ;
try {
@@ -151,8 +152,8 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized String readByURI(String graphName, String uriStr)
{
- Node g = Node.createURI(graphName) ;
- Node u = Node.createURI(uriStr) ;
+ Node g = NodeFactory.createURI(graphName) ;
+ Node u = NodeFactory.createURI(uriStr) ;
Iterator<Tuple<Node>> iter = nodeTupleTable.find(g, null, u) ;
if ( ! iter.hasNext() )
return null ;
@@ -164,7 +165,7 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized Map<String, String> readPrefixMap(String graphName)
{
- Node g = Node.createURI(graphName) ;
+ Node g = NodeFactory.createURI(graphName) ;
Iterator<Tuple<Node>> iter = nodeTupleTable.find(g, null, null) ;
Map<String, String> map = new HashMap<String, String>() ;
for ( ; iter.hasNext() ; )
@@ -181,7 +182,7 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized void loadPrefixMapping(String graphName, PrefixMapping pmap)
{
- Node g = Node.createURI(graphName) ;
+ Node g = NodeFactory.createURI(graphName) ;
Iterator<Tuple<Node>> iter = nodeTupleTable.find(g, null, null) ;
for ( ; iter.hasNext() ; )
{
@@ -196,8 +197,8 @@ public class DatasetPrefixesTDB implemen
@Override
public synchronized void removeFromPrefixMap(String graphName, String prefix)
{
- Node g = Node.createURI(graphName) ;
- Node p = Node.createLiteral(prefix) ;
+ Node g = NodeFactory.createURI(graphName) ;
+ Node p = NodeFactory.createLiteral(prefix) ;
Iterator<Tuple<Node>> iter = nodeTupleTable.find(g, p, null) ;
List<Tuple<Node>> list = Iter.toList(iter) ; // Materialize.
Iter.close(iter) ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java Sun Mar 17 17:48:00 2013
@@ -27,6 +27,7 @@ import org.apache.jena.atlas.logging.Log
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.graph.impl.LiteralLabel ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.tdb.TDBException ;
@@ -312,27 +313,27 @@ public class NodeId
case INTEGER:
{
long val = IntegerNode.unpack(v) ;
- Node n = Node.createLiteral(Long.toString(val), null, XSDDatatype.XSDinteger) ;
+ Node n = NodeFactory.createLiteral(Long.toString(val), null, XSDDatatype.XSDinteger) ;
return n ;
}
case DECIMAL:
{
BigDecimal d = DecimalNode.unpackAsBigDecimal(v) ;
String x = d.toEngineeringString() ;
- return Node.createLiteral(x, null, XSDDatatype.XSDdecimal) ;
+ return NodeFactory.createLiteral(x, null, XSDDatatype.XSDdecimal) ;
}
case DATETIME:
{
long val = BitsLong.clear(v, 56, 64) ;
String lex = DateTimeNode.unpackDateTime(val) ;
- return Node.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
}
case DATE:
{
long val = BitsLong.clear(v, 56, 64) ;
String lex = DateTimeNode.unpackDate(val) ;
- return Node.createLiteral(lex, null, XSDDatatype.XSDdate) ;
+ return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate) ;
}
case BOOLEAN:
{
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java Sun Mar 17 17:48:00 2013
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory ;
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.* ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.Statement ;
@@ -564,10 +565,10 @@ public class T_TransSystem
int n2 = (int)Math.round(Math.random()*10000) ;
Node g = Quad.defaultGraphNodeGenerated ; // urn:x-arq:DefaultGraphNode
- Node s = Node.createURI("S") ;
- Node p = Node.createURI("P"+value) ;
+ Node s = NodeFactory.createURI("S") ;
+ Node p = NodeFactory.createURI("P"+value) ;
// Integer - that gets inlined.
- Node o = Node.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
+ Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
return new Quad(g,s,p,o) ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java Sun Mar 17 17:48:00 2013
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory ;
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.ReadWrite ;
import com.hp.hpl.jena.shared.Lock ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -512,9 +513,9 @@ public class T_TransSystemMultiDatasets
Node g1 = q.getGraph() ;
Node g = Quad.defaultGraphNodeGenerated ; // urn:x-arq:DefaultGraphNode
- Node s = Node.createURI("S") ;
- Node p = Node.createURI("P") ;
- Node o = Node.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
+ Node s = NodeFactory.createURI("S") ;
+ Node p = NodeFactory.createURI("P") ;
+ Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ;
return new Quad(g,s,p,o) ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java Sun Mar 17 17:48:00 2013
@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.Atomi
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.query.ReadWrite ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.tdb.StoreConnection ;
@@ -81,13 +82,13 @@ public class T_TxnDeadlockTest {
DatasetGraphTxn txnGraph =
storeConnection.begin(ReadWrite.WRITE);
txnGraph.add(new Quad(
- Node.createURI("http://openjena.org/"
+ NodeFactory.createURI("http://openjena.org/"
+ numberGenerator.nextInt()),
- Node.createURI("http://openjena.org/"
+ NodeFactory.createURI("http://openjena.org/"
+ numberGenerator.nextInt()),
- Node.createURI("http://openjena.org/"
+ NodeFactory.createURI("http://openjena.org/"
+ numberGenerator.nextInt()),
- Node.createURI("http://openjena.org/"
+ NodeFactory.createURI("http://openjena.org/"
+ numberGenerator.nextInt())));
txnGraph.commit();
txnGraph.end();
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java Sun Mar 17 17:48:00 2013
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.sparql.sse.SSE;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.tdb.TDBFactory;
@SuppressWarnings("deprecation")
@@ -38,9 +38,9 @@ public class TestBulkUpdateTDB extends B
private static String graphName = "http://graph/";
- private static Node n0 = NodeFactory.parseNode("<http://example/n0>") ;
- private static Node n1 = NodeFactory.parseNode("<http://example/n1>") ;
- private static Node n2 = NodeFactory.parseNode("<http://example/n2>") ;
+ private static Node n0 = NodeFactoryExtra.parseNode("<http://example/n0>") ;
+ private static Node n1 = NodeFactoryExtra.parseNode("<http://example/n1>") ;
+ private static Node n2 = NodeFactoryExtra.parseNode("<http://example/n2>") ;
private static Triple t1 = SSE.parseTriple("(<x> <y> <z>)") ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java Sun Mar 17 17:48:00 2013
@@ -23,30 +23,30 @@ import org.apache.jena.atlas.junit.BaseT
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 TestNodeLib extends BaseTest
{
// Tests of TDBs NodeLib
@Test public void hash1()
{
- Node x1 = NodeFactory.parseNode("<http://example/x>") ;
- Node x2 = NodeFactory.parseNode("<http://example/x>") ;
+ Node x1 = NodeFactoryExtra.parseNode("<http://example/x>") ;
+ Node x2 = NodeFactoryExtra.parseNode("<http://example/x>") ;
assertEquals(hash(x1), hash(x2)) ;
}
@Test public void hash2()
{
- Node x1 = NodeFactory.parseNode("<http://example/x1>") ;
- Node x2 = NodeFactory.parseNode("<http://example/x2>") ;
+ Node x1 = NodeFactoryExtra.parseNode("<http://example/x1>") ;
+ Node x2 = NodeFactoryExtra.parseNode("<http://example/x2>") ;
assertNotEquals(hash(x1), hash(x2)) ;
}
@Test public void hash3()
{
- Node x1 = NodeFactory.parseNode("<lex>") ;
- Node x2 = NodeFactory.parseNode("'lex'") ;
- Node x3 = NodeFactory.parseNode("_:lex") ;
+ Node x1 = NodeFactoryExtra.parseNode("<lex>") ;
+ Node x2 = NodeFactoryExtra.parseNode("'lex'") ;
+ Node x3 = NodeFactoryExtra.parseNode("_:lex") ;
assertNotEquals(hash(x1), hash(x2)) ;
assertNotEquals(hash(x2), hash(x3)) ;
assertNotEquals(hash(x3), hash(x1)) ;
@@ -54,16 +54,16 @@ public class TestNodeLib extends BaseTes
@Test public void hash4()
{
- Node x1 = NodeFactory.parseNode("123") ;
- Node x2 = NodeFactory.parseNode("'123'") ;
+ Node x1 = NodeFactoryExtra.parseNode("123") ;
+ Node x2 = NodeFactoryExtra.parseNode("'123'") ;
assertNotEquals(hash(x1), hash(x2)) ;
}
@Test public void hash5()
{
- Node x1 = NodeFactory.parseNode("123") ;
- Node x2 = NodeFactory.parseNode("123.0") ;
- Node x3 = NodeFactory.parseNode("123e0") ;
+ Node x1 = NodeFactoryExtra.parseNode("123") ;
+ Node x2 = NodeFactoryExtra.parseNode("123.0") ;
+ Node x3 = NodeFactoryExtra.parseNode("123e0") ;
assertNotEquals(hash(x1), hash(x2)) ;
assertNotEquals(hash(x2), hash(x3)) ;
assertNotEquals(hash(x3), hash(x1)) ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java Sun Mar 17 17:48:00 2013
@@ -31,7 +31,7 @@ import org.junit.runners.Parameterized.P
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 ;
@RunWith(Parameterized.class)
public class TestCodec extends BaseTest
@@ -97,13 +97,13 @@ public class TestCodec extends BaseTest
@Test public void nodec_uri_02() { test ("<http://example/>") ; }
// Jena anon ids can have a string form including ":"
- @Test public void nodec_blank_01() { test (Node.createAnon(new AnonId("a"))) ; }
- @Test public void nodec_blank_02() { test (Node.createAnon(new AnonId("a:b:c-d"))) ; }
- @Test public void nodec_blank_03() { test (Node.createAnon()) ; }
+ @Test public void nodec_blank_01() { test (com.hp.hpl.jena.graph.NodeFactory.createAnon(new AnonId("a"))) ; }
+ @Test public void nodec_blank_02() { test (com.hp.hpl.jena.graph.NodeFactory.createAnon(new AnonId("a:b:c-d"))) ; }
+ @Test public void nodec_blank_03() { test (com.hp.hpl.jena.graph.NodeFactory.createAnon()) ; }
private void test(String sseString)
{
- Node n = NodeFactory.parseNode(sseString) ;
+ Node n = NodeFactoryExtra.parseNode(sseString) ;
test(n) ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java Sun Mar 17 17:48:00 2013
@@ -22,7 +22,7 @@ import org.apache.jena.atlas.junit.BaseT
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 ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.store.NodeId ;
@@ -30,12 +30,12 @@ public abstract class TestNodeTableBase
{
protected abstract NodeTable createEmptyNodeTable() ;
- static protected final Node n1 = NodeFactory.parseNode("<http://example/x>") ;
- static protected final Node n2 = NodeFactory.parseNode("1") ;
+ static protected final Node n1 = NodeFactoryExtra.parseNode("<http://example/x>") ;
+ static protected final Node n2 = NodeFactoryExtra.parseNode("1") ;
protected void testNode(String str)
{
- testNode(NodeFactory.parseNode(str)) ;
+ testNode(NodeFactoryExtra.parseNode(str)) ;
}
protected void testNode(Node n)
@@ -46,7 +46,7 @@ public abstract class TestNodeTableBase
protected static void writeNode(NodeTable nt, String str)
{
- writeNode(nt, NodeFactory.parseNode(str)) ;
+ writeNode(nt, NodeFactoryExtra.parseNode(str)) ;
}
protected static void writeNode(NodeTable nt, Node n)
@@ -81,7 +81,7 @@ public abstract class TestNodeTableBase
@Test public void nodetable_05() { testNode("'x'@en") ; }
@Test public void nodetable_06() { testNode("'x'^^<http://example/dt>") ; }
- static Node badNode1 = Node.createLiteral("abc", "99bad", null) ;
+ static Node badNode1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc", "99bad", null) ;
@Test public void nodetable_bad_01() { testNodeBad(badNode1) ; }
@Test public void nodetable_bad_02()
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java Sun Mar 17 17:48:00 2013
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.tdb.ConfigTest ;
import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.base.file.Location ;
@@ -45,9 +45,9 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
/** Testing persistence */
public class TestDatasetTDBPersist extends BaseTest
{
- static Node n0 = NodeFactory.parseNode("<http://example/n0>") ;
- static Node n1 = NodeFactory.parseNode("<http://example/n1>") ;
- static Node n2 = NodeFactory.parseNode("<http://example/n2>") ;
+ static Node n0 = NodeFactoryExtra.parseNode("<http://example/n0>") ;
+ static Node n1 = NodeFactoryExtra.parseNode("<http://example/n1>") ;
+ static Node n2 = NodeFactoryExtra.parseNode("<http://example/n2>") ;
static boolean nonDeleteableMMapFiles = SystemTDB.isWindows ;
// To avoid the problems on MS Windows whereby memory mapped files
@@ -112,7 +112,7 @@ public class TestDatasetTDBPersist exten
{
String graphName = "http://example/" ;
Triple triple = SSE.parseTriple("(<x> <y> <z>)") ;
- Node gn = Node.createURI(graphName) ;
+ Node gn = com.hp.hpl.jena.graph.NodeFactory.createURI(graphName) ;
Dataset ds = graphLocation.getDataset() ;
// ?? See TupleLib.
@@ -140,7 +140,7 @@ public class TestDatasetTDBPersist exten
String graphName = "http://example/" ;
Triple triple = SSE.parseTriple("(<x> <y> <z>)") ;
Dataset ds = graphLocation.getDataset() ;
- Graph g2 = ds.asDatasetGraph().getGraph(Node.createURI(graphName)) ;
+ Graph g2 = ds.asDatasetGraph().getGraph(com.hp.hpl.jena.graph.NodeFactory.createURI(graphName)) ;
// Graphs only exists if they have a triple in them
g2.add(triple) ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphNamedTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphNamedTDB.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphNamedTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphNamedTDB.java Sun Mar 17 17:48:00 2013
@@ -22,13 +22,13 @@ import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.graph.AbstractTestGraph2 ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.tdb.TDBFactory ;
/** Programmatic tests on persistent graph */
public class TestGraphNamedTDB extends AbstractTestGraph2
{
- Node graphNode = NodeFactory.parseNode("<http://example/namedGraph>") ;
+ Node graphNode = NodeFactoryExtra.parseNode("<http://example/namedGraph>") ;
@Override
protected Graph emptyGraph()
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java Sun Mar 17 17:48:00 2013
@@ -30,6 +30,7 @@ import org.junit.BeforeClass ;
import org.junit.Test ;
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.sparql.core.Quad ;
@@ -41,10 +42,10 @@ import com.hp.hpl.jena.tdb.sys.TDBMaker
public class TestLoader extends BaseTest
{
private static final String DIR = "testing/Loader/" ;
- private static final Node g = Node.createURI("g") ;
- private static final Node s = Node.createURI("s") ;
- private static final Node p = Node.createURI("p") ;
- private static final Node o = Node.createURI("o") ;
+ private static final Node g = NodeFactory.createURI("g") ;
+ private static final Node s = NodeFactory.createURI("s") ;
+ private static final Node p = NodeFactory.createURI("p") ;
+ private static final Node o = NodeFactory.createURI("o") ;
@BeforeClass static public void beforeClass() { Log.disable(ARQ.logExecName) ; Log.disable(TDB.logLoaderName) ; }
@AfterClass static public void afterClass() { Log.enable(ARQ.logExecName) ; Log.enable(TDB.logLoaderName) ; }
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java Sun Mar 17 17:48:00 2013
@@ -24,7 +24,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.sparql.expr.NodeValue ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestNodeId extends BaseTest
{
@@ -43,28 +43,28 @@ public class TestNodeId extends BaseTest
// Inlines
@Test public void nodeId_int_01()
- { test("1", NodeFactory.parseNode("1")) ; }
+ { test("1", NodeFactoryExtra.parseNode("1")) ; }
@Test public void nodeId_int_02()
- { test("2", NodeFactory.parseNode("2")) ; }
+ { test("2", NodeFactoryExtra.parseNode("2")) ; }
@Test public void nodeId_int_03()
- { test("'3'^^xsd:int", NodeFactory.parseNode("3")) ; }
+ { test("'3'^^xsd:int", NodeFactoryExtra.parseNode("3")) ; }
@Test public void nodeId_int_04()
{ test("'3'", (Node)null) ; }
@Test public void nodeId_int_05()
- { test("-1", NodeFactory.parseNode("-1")) ; }
+ { test("-1", NodeFactoryExtra.parseNode("-1")) ; }
@Test public void nodeId_int_06()
- { test("-180", NodeFactory.parseNode("-180")) ; }
+ { test("-180", NodeFactoryExtra.parseNode("-180")) ; }
@Test public void nodeId_int_07()
- { test("01", NodeFactory.parseNode("1")) ; }
+ { test("01", NodeFactoryExtra.parseNode("1")) ; }
@Test public void nodeId_int_08()
- { test("+01", NodeFactory.parseNode("1")) ; }
+ { test("+01", NodeFactoryExtra.parseNode("1")) ; }
@Test public void nodeId_int_09()
// More than Long.MAX_VALUE
@@ -98,17 +98,17 @@ public class TestNodeId extends BaseTest
@Test public void nodeId_decimal_1()
- { test("3.14", NodeFactory.parseNode("3.14")) ; }
+ { test("3.14", NodeFactoryExtra.parseNode("3.14")) ; }
@Test public void nodeId_decimal_2()
{ test("123456789.123456789", (Node)null) ; }
// Just this once, directly create the Node.
@Test public void nodeId_decimal_3()
- { test("12.89", Node.createLiteral("12.89", null, XSDDatatype.XSDdecimal)) ; }
+ { test("12.89", com.hp.hpl.jena.graph.NodeFactory.createLiteral("12.89", null, XSDDatatype.XSDdecimal)) ; }
@Test public void nodeId_decimal_4()
- { test("-1.0", NodeFactory.parseNode("-1.0")) ; }
+ { test("-1.0", NodeFactoryExtra.parseNode("-1.0")) ; }
// This number has > 47 bits of value : 2412.80478192688
@Test public void nodeId_decimal_5()
@@ -180,16 +180,16 @@ public class TestNodeId extends BaseTest
{ test("'2012-07-29T20:39:11.100Z'^^xsd:dateTime", "'2012-07-29T20:39:11.1Z'^^xsd:dateTime") ; }
@Test public void nodeId_date_1()
- { test("'2008-04-28Z'^^xsd:date", NodeFactory.parseNode("'2008-04-28Z'^^xsd:date")) ; }
+ { test("'2008-04-28Z'^^xsd:date", NodeFactoryExtra.parseNode("'2008-04-28Z'^^xsd:date")) ; }
@Test public void nodeId_date_2()
- { test("'2008-04-28+00:00'^^xsd:date", NodeFactory.parseNode("'2008-04-28+00:00'^^xsd:date")) ; }
+ { test("'2008-04-28+00:00'^^xsd:date", NodeFactoryExtra.parseNode("'2008-04-28+00:00'^^xsd:date")) ; }
@Test public void nodeId_date_3()
- { test("'2008-04-28-05:00'^^xsd:date", NodeFactory.parseNode("'2008-04-28-05:00'^^xsd:date")) ; }
+ { test("'2008-04-28-05:00'^^xsd:date", NodeFactoryExtra.parseNode("'2008-04-28-05:00'^^xsd:date")) ; }
@Test public void nodeId_date_4()
- { test("'2008-04-28+02:00'^^xsd:date", NodeFactory.parseNode("'2008-04-28+02:00'^^xsd:date")) ; }
+ { test("'2008-04-28+02:00'^^xsd:date", NodeFactoryExtra.parseNode("'2008-04-28+02:00'^^xsd:date")) ; }
@Test public void nodeId_date_5()
{ test("'8008-04-28'^^xsd:date", (Node)null) ; }
@@ -201,16 +201,16 @@ public class TestNodeId extends BaseTest
{ test("'2012-07-29-06:30'^^xsd:date", "'2012-07-29-06:30'^^xsd:date") ; }
@Test public void nodeId_boolean_1()
- { test("'true'^^xsd:boolean", NodeFactory.parseNode("'true'^^xsd:boolean")) ; }
+ { test("'true'^^xsd:boolean", NodeFactoryExtra.parseNode("'true'^^xsd:boolean")) ; }
@Test public void nodeId_boolean_2()
- { test("'false'^^xsd:boolean", NodeFactory.parseNode("'false'^^xsd:boolean")) ; }
+ { test("'false'^^xsd:boolean", NodeFactoryExtra.parseNode("'false'^^xsd:boolean")) ; }
@Test public void nodeId_boolean_3()
- { test("'1'^^xsd:boolean", NodeFactory.parseNode("'true'^^xsd:boolean")) ; }
+ { test("'1'^^xsd:boolean", NodeFactoryExtra.parseNode("'true'^^xsd:boolean")) ; }
@Test public void nodeId_boolean_4()
- { test("'0'^^xsd:boolean", NodeFactory.parseNode("'false'^^xsd:boolean")) ; }
+ { test("'0'^^xsd:boolean", NodeFactoryExtra.parseNode("'false'^^xsd:boolean")) ; }
private void test(String x)
{
@@ -219,12 +219,12 @@ public class TestNodeId extends BaseTest
private void test(String x, String expected)
{
- test(x, NodeFactory.parseNode(expected)) ;
+ test(x, NodeFactoryExtra.parseNode(expected)) ;
}
private void test(String x, Node correct)
{
- Node n = NodeFactory.parseNode(x) ;
+ Node n = NodeFactoryExtra.parseNode(x) ;
NodeId nodeId = NodeId.inline(n) ;
if ( correct == null )
{
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java Sun Mar 17 17:48:00 2013
@@ -25,7 +25,7 @@ import org.junit.AfterClass ;
import org.junit.BeforeClass ;
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.Query ;
import com.hp.hpl.jena.query.QueryExecution ;
@@ -79,7 +79,7 @@ public class TestQuadFilter extends Base
{
DatasetGraphTDB dsg = (DatasetGraphTDB)(ds.asDatasetGraph()) ;
final NodeTable nodeTable = dsg.getQuadTable().getNodeTupleTable().getNodeTable() ;
- final NodeId target = nodeTable.getNodeIdForNode(Node.createURI(graphToHide)) ;
+ final NodeId target = nodeTable.getNodeIdForNode(NodeFactory.createURI(graphToHide)) ;
Filter<Tuple<NodeId>> filter = new Filter<Tuple<NodeId>>() {
@Override
public boolean accept(Tuple<NodeId> item)
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.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.graph.Triple ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
@@ -67,12 +67,12 @@ public class TestTripleTable extends Bas
assertFalse(iter.hasNext()) ;
}
- static Node n1 = NodeFactory.parseNode("<http://example/n1>") ;
- static Node n2 = NodeFactory.parseNode("<http://example/n2>") ;
- static Node n3 = NodeFactory.parseNode("<http://example/n3>") ;
- static Node n4 = NodeFactory.parseNode("<http://example/n4>") ;
- static Node n5 = NodeFactory.parseNode("<http://example/n5>") ;
- static Node n6 = NodeFactory.parseNode("<http://example/n6>") ;
+ static Node n1 = NodeFactoryExtra.parseNode("<http://example/n1>") ;
+ static Node n2 = NodeFactoryExtra.parseNode("<http://example/n2>") ;
+ static Node n3 = NodeFactoryExtra.parseNode("<http://example/n3>") ;
+ static Node n4 = NodeFactoryExtra.parseNode("<http://example/n4>") ;
+ static Node n5 = NodeFactoryExtra.parseNode("<http://example/n5>") ;
+ static Node n6 = NodeFactoryExtra.parseNode("<http://example/n6>") ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java Sun Mar 17 17:48:00 2013
@@ -23,7 +23,7 @@ import org.apache.jena.atlas.lib.StrUtil
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.* ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -56,7 +56,7 @@ public class Test_SPARQL_TDB extends Bas
String graphName = "http://example/" ;
Triple triple = SSE.parseTriple("(<x> <y> 123)") ;
Dataset ds = create() ;
- Graph g2 = ds.asDatasetGraph().getGraph(Node.createURI(graphName)) ;
+ Graph g2 = ds.asDatasetGraph().getGraph(NodeFactory.createURI(graphName)) ;
// Graphs only exists if they have a triple in them
g2.add(triple) ;
@@ -74,7 +74,7 @@ public class Test_SPARQL_TDB extends Bas
String graphName = "http://example/" ;
Triple triple = SSE.parseTriple("(<x> <y> 123)") ;
Dataset ds = create() ;
- Graph g2 = ds.asDatasetGraph().getGraph(Node.createURI(graphName)) ;
+ Graph g2 = ds.asDatasetGraph().getGraph(NodeFactory.createURI(graphName)) ;
// Graphs only exists if they have a triple in them
g2.add(triple) ;
@@ -104,7 +104,7 @@ public class Test_SPARQL_TDB extends Bas
String graphName = "http://example/" ;
Triple triple = SSE.parseTriple("(<x> <y> 123)") ;
- Graph g2 = dataset.asDatasetGraph().getGraph(Node.createURI(graphName)) ;
+ Graph g2 = dataset.asDatasetGraph().getGraph(NodeFactory.createURI(graphName)) ;
// Graphs only exists if they have a triple in them
g2.add(triple) ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java Sun Mar 17 17:48:00 2013
@@ -23,7 +23,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
@@ -56,9 +56,9 @@ public abstract class AbstractTestNodeTa
return ntt ;
}
- protected static Node node1 = NodeFactory.parseNode("<x>") ;
- protected static Node node2 = NodeFactory.parseNode("<y>") ;
- protected static Node node3 = NodeFactory.parseNode("<z>") ;
+ protected static Node node1 = NodeFactoryExtra.parseNode("<x>") ;
+ protected static Node node2 = NodeFactoryExtra.parseNode("<y>") ;
+ protected static Node node3 = NodeFactoryExtra.parseNode("<z>") ;
static void contains(NodeTable nt, Node...nodes)
{