Removed createGraph, createDatasetGraph. FactoryRDF is for system-wide items - RDFTerms, Triples and Quads.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bd3e012f Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bd3e012f Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bd3e012f Branch: refs/heads/master Commit: bd3e012f38da2abac05cdade73511006a51914dc Parents: cf8373e Author: Andy Seaborne <[email protected]> Authored: Sun Mar 13 16:21:48 2016 +0000 Committer: Andy Seaborne <[email protected]> Committed: Sun Mar 13 16:21:48 2016 +0000 ---------------------------------------------------------------------- .../org/apache/jena/riot/system/FactoryRDF.java | 41 ++++++++++---------- .../apache/jena/riot/system/FactoryRDFStd.java | 14 ------- .../apache/jena/riot/system/TestFactoryRDF.java | 15 ------- 3 files changed, 21 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/bd3e012f/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java index d2ba8f8..b895a5c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java @@ -19,38 +19,39 @@ package org.apache.jena.riot.system; import org.apache.jena.datatypes.RDFDatatype ; -import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; -import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.core.Quad ; /** * Create core RDF objects: {@link Node}s, {@link Triple}s, {@link Quad}s, - * {@link Graph}, {@link DatasetGraph}s. - * <p> + * which are system-wide. */ public interface FactoryRDF { - // ?? Are these too varied? - public Graph createGraph() ; - // ?? Are these too varied? - public DatasetGraph createDatasetGraph() ; - public Triple createTriple(Node subject, Node predicate, Node object) ; - public Quad createQuad(Node graph, Node subject, Node predicate, Node object) ; - public Node createURI(String uriStr) ; - public Node createTypedLiteral(String lexical, RDFDatatype datatype) ; - public Node createLangLiteral(String lexical, String langTag) ; - public Node createStringLiteral(String lexical) ; - /** Create a blank node */ + public Triple createTriple(Node subject, Node predicate, Node object); + + public Quad createQuad(Node graph, Node subject, Node predicate, Node object); + + public Node createURI(String uriStr); + + public Node createTypedLiteral(String lexical, RDFDatatype datatype); + + public Node createLangLiteral(String lexical, String langTag); + + public Node createStringLiteral(String lexical); + + /** Create a blank node which is completely new and used nowhere else. */ public Node createBlankNode() ; + /** Create a blank node with the given string as internal system id */ public Node createBlankNode(String label) ; + /** Create a blank with the internal system id taken from 128 bit number provided. + * This must be compatible with {@link java.util.UUID} so the variant and version + * bits must agree with <a href="http://www.ietf.org/rfc/rfc4122.txt";>RFC 4122</a>. + * + * @See java.util.UUID + * @See <a href="http://www.ietf.org/rfc/rfc4122.txt"; ><i>RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace</i></a> */ public Node createBlankNode(long mostSigBits, long leastSigBits) ; - -// // Object for scope better? -// public Node createBlankNode(Node scope, String label) ; -// // Object for scope better? -// public Node createBlankNode(Node scope) ; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/bd3e012f/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java index 4d0ca87..28246f7 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java @@ -19,15 +19,11 @@ package org.apache.jena.riot.system; import org.apache.jena.datatypes.RDFDatatype ; -import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.NodeFactory ; import org.apache.jena.graph.Triple ; import org.apache.jena.riot.lang.LabelToNode ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.core.DatasetGraphFactory ; import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.graph.GraphFactory ; public class FactoryRDFStd implements FactoryRDF { // Needs reset? @@ -42,16 +38,6 @@ public class FactoryRDFStd implements FactoryRDF { } @Override - public Graph createGraph() { - return GraphFactory.createDefaultGraph() ; - } - - @Override - public DatasetGraph createDatasetGraph() { - return DatasetGraphFactory.create(); // createTxnMem() ; - } - - @Override public Triple createTriple(Node subject, Node predicate, Node object) { return Triple.create(subject, predicate, object); } http://git-wip-us.apache.org/repos/asf/jena/blob/bd3e012f/jena-arq/src/test/java/org/apache/jena/riot/system/TestFactoryRDF.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestFactoryRDF.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestFactoryRDF.java index 75ae5f4..f2b2285 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestFactoryRDF.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestFactoryRDF.java @@ -20,17 +20,12 @@ package org.apache.jena.riot.system; import static org.junit.Assert.assertEquals ; import static org.junit.Assert.assertNotEquals ; -import static org.junit.Assert.assertNotNull ; import static org.junit.Assert.assertTrue ; import org.apache.jena.datatypes.xsd.XSDDatatype ; -import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.riot.lang.LabelToNode ; -import org.apache.jena.riot.system.FactoryRDF ; -import org.apache.jena.riot.system.FactoryRDFStd ; -import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.core.Quad ; import org.apache.jena.vocabulary.RDF ; import org.junit.Test ; @@ -118,15 +113,5 @@ public class TestFactoryRDF { assertEquals(p, quad.getPredicate()) ; assertEquals(o, quad.getObject()) ; } - - @Test public void factoryRDF_graph_01() { - Graph graph = factory.createGraph() ; - assertNotNull(graph) ; - } - - @Test public void factoryRDF_dataset_01() { - DatasetGraph dsg = factory.createDatasetGraph() ; - assertNotNull(dsg) ; - } }
