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 2015/11/29 22:01:45 UTC
[1/3] jena git commit: DatasetGraphCopyAdd - a wrapper that ensures
"addGraph" is a copy.
Repository: jena
Updated Branches:
refs/heads/master 16f7f7da9 -> 0b2a74028
DatasetGraphCopyAdd - a wrapper that ensures "addGraph" is a copy.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ad3b9101
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ad3b9101
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ad3b9101
Branch: refs/heads/master
Commit: ad3b9101f7c5bda1975ca923d910a930bcbf5b4d
Parents: 16f7f7d
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Nov 28 21:56:13 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Nov 28 21:56:40 2015 +0000
----------------------------------------------------------------------
.../jena/sparql/core/DatasetGraphCopyAdd.java | 39 ++++++++++++++++++
.../sparql/core/TestDatasetGraphCopyAdd.java | 42 ++++++++++++++++++++
2 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ad3b9101/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
new file mode 100644
index 0000000..445daa5
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.core;
+
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
+
+/** Override {@link DatasetGraph#addGraph} so that it always copies
+ * content from the added graph data.
+ */
+
+/*package*/ class DatasetGraphCopyAdd extends DatasetGraphWrapper {
+ public DatasetGraphCopyAdd(DatasetGraph dsg) {
+ super(dsg);
+ }
+ @Override
+ public void addGraph(Node graphName, Graph graph) {
+ graph.find(null,null,null).forEachRemaining(t-> {
+ Quad q = Quad.create(graphName, t) ;
+ super.add(q) ;
+ }) ;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/ad3b9101/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphCopyAdd.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphCopyAdd.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphCopyAdd.java
new file mode 100644
index 0000000..481eca0
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphCopyAdd.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.core;
+
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.sparql.sse.SSE ;
+import static org.junit.Assert.* ;
+import org.junit.Test ;
+
+public class TestDatasetGraphCopyAdd extends AbstractDatasetGraphTests
+{
+ @Override
+ protected DatasetGraph emptyDataset() { return DatasetGraphFactory.create() ; }
+
+
+ @Test public void copyAdd_01() {
+ Graph graph = SSE.parseGraph("(graph (:s :p :o))") ;
+ Node g = SSE.parseNode(":g") ;
+ DatasetGraph dsg = emptyDataset() ;
+ dsg.addGraph(g, graph);
+ graph.clear();
+ assertTrue(graph.isEmpty()) ;
+ assertFalse(dsg.getGraph(g).isEmpty()) ;
+ }
+}
[3/3] jena git commit: DatasetGraphFactory .createMem() split into
.create()/.createGeneral()
Posted by an...@apache.org.
DatasetGraphFactory .createMem() split into .create()/.createGeneral()
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0b2a7402
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0b2a7402
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0b2a7402
Branch: refs/heads/master
Commit: 0b2a74028631e3a06953e7bd5a70a7c38db61627
Parents: 0a6b7d9
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 29 17:58:46 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 29 17:58:46 2015 +0000
----------------------------------------------------------------------
.../java/arq/cmdline/ModDatasetGeneral.java | 9 +--
jena-arq/src/main/java/arq/update.java | 2 +-
.../org/apache/jena/query/DatasetFactory.java | 64 ++++++++++++---
.../jena/sparql/core/DatasetGraphCopyAdd.java | 4 +-
.../jena/sparql/core/DatasetGraphFactory.java | 82 +++++++++++++++-----
.../jena/sparql/core/DatasetGraphMaker.java | 7 ++
.../apache/jena/sparql/core/DatasetImpl.java | 1 +
.../jena/sparql/core/DynamicDatasets.java | 2 +-
.../sparql/core/assembler/DatasetAssembler.java | 9 +--
.../core/assembler/DatasetNullAssembler.java | 2 +-
.../apache/jena/sparql/graph/GraphSPARQL.java | 2 +-
.../jena/sparql/modify/UpdateEngineWorker.java | 2 +-
.../jena/sparql/sse/builders/BuilderGraph.java | 4 +-
.../apache/jena/sparql/util/DatasetUtils.java | 2 +-
.../src/main/java/riotcmd/CmdLangParse.java | 2 +-
.../jena/riot/lang/ParserTestBaseLib.java | 6 +-
.../apache/jena/riot/lang/TestTriXReader.java | 2 +-
.../jena/riot/langsuite/UnitTestEval.java | 4 +-
.../jena/riot/thrift/TestStreamRDFThrift.java | 4 +-
.../apache/jena/riot/writer/TestTriXWriter.java | 2 +-
.../org/apache/jena/sparql/api/TestAPI.java | 14 ++--
.../sparql/api/TestQueryExecutionTimeout1.java | 2 +-
.../sparql/api/TestQueryExecutionTimeout2.java | 2 +-
.../jena/sparql/core/AbstractTestDataset.java | 13 ++--
.../org/apache/jena/sparql/core/TS_Core.java | 1 +
.../jena/sparql/core/TestDatasetGeneral.java | 2 +-
.../sparql/core/TestDatasetGraphWithLock.java | 8 +-
.../jena/sparql/core/TestDatasetMonitor.java | 12 +--
.../sparql/core/TestGraphOverDatasetMem.java | 2 +-
.../journaling/TestDatasetGraphWithRecord.java | 18 ++---
.../core/mem/TestDatasetGraphInMemoryBasic.java | 2 +-
.../core/mem/TestDatasetGraphInMemoryLock.java | 2 +-
.../apache/jena/sparql/graph/TestGraphsMem.java | 2 +-
.../apache/jena/sparql/junit/UpdateTest.java | 2 +-
.../sparql/transaction/TestTransactionMem.java | 2 +-
.../org/apache/jena/sdb/store/DatasetStore.java | 2 +-
.../java/org/apache/jena/tdb/TDBFactory.java | 2 +-
.../jena/tdb/assembler/DatasetAssemblerTDB.java | 2 +-
.../apache/jena/tdb/extra/T_TransSystem.java | 4 +-
.../apache/jena/tdb/junit/GraphLocation.java | 4 +-
.../jena/tdb/transaction/TransTestLib.java | 4 +-
41 files changed, 199 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java b/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
index 328f00d..5960f02 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
@@ -24,14 +24,11 @@ import jena.cmd.ArgDecl;
import jena.cmd.CmdArgModule;
import jena.cmd.CmdException;
import jena.cmd.CmdGeneral;
-
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.query.LabelExistsException ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.shared.JenaException ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.util.DatasetUtils ;
/** ModDataset: arguments to build a dataset -
@@ -84,9 +81,7 @@ public class ModDatasetGeneral extends ModDataset
(namedGraphURLs == null || namedGraphURLs.size() == 0 ) )
return null ;
- // This can auto-add graphs.
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
- Dataset ds = DatasetFactory.create(dsg) ;
+ Dataset ds = DatasetFactory.createTxnMem() ;
addGraphs(ds) ;
dataset = ds ;
return dataset ;
@@ -95,7 +90,7 @@ public class ModDatasetGeneral extends ModDataset
protected void addGraphs(Dataset ds)
{
try {
- if ( dataURLs != null )
+ if ( dataURLs != null )
{
for ( String url : dataURLs )
RDFDataMgr.read(ds, url) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/update.java b/jena-arq/src/main/java/arq/update.java
index 650104b..a1704f5 100644
--- a/jena-arq/src/main/java/arq/update.java
+++ b/jena-arq/src/main/java/arq/update.java
@@ -121,6 +121,6 @@ public class update extends CmdUpdate
@Override
protected DatasetGraph dealWithNoDataset() {
- return DatasetGraphFactory.createMem() ;
+ return DatasetGraphFactory.create() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java b/jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java
index 15b80c0..06a039e 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java
@@ -38,13 +38,31 @@ import org.apache.jena.util.FileManager;
*/
public class DatasetFactory {
- /**
- * @return an in-memory, modifiable Dataset
- * @deprecated Prefer {@link #createGeneral()} or {@link #createTxnMem()}
+ /** Create an in-memory, non-transactional Dataset.
+ * <p>
+ * See also {@link #createTxnMem()} for a transactional dataset.
+ * <p>
+ * This implementation copies models when {@link Dataset#addNamedModel(String, Model)} is called.
+ */
+ public static Dataset create() {
+ return wrap(DatasetGraphFactory.create()) ;
+ }
+
+ /** Create an in-memory, non-transactional Dataset.
+ * <p>
+ * See also {@link #createTxnMem()} for a transactional dataset.
+ * <p>
+ * Use {@link #createGeneral()} when needing to add graphs with mixed charcateristics,
+ * e.g. inference graphs, specific graphs from TDB.
+ * <p>
+ * <em>This operation is marked "deprecated" because the general purpose "add named graph of any implementation"
+ * feature will be removed; this feature is now provided by {@link #createGeneral()}.
+ * </em>
+ * @deprecated Prefer {@link #createGeneral()} or {@link #createTxnMem()} or {@link #create()}
*/
@Deprecated
public static Dataset createMem() {
- return create(DatasetGraphFactory.createMem());
+ return createGeneral() ;
}
/**
@@ -60,24 +78,34 @@ public class DatasetFactory {
*
*/
public static Dataset createTxnMem() {
- return create(DatasetGraphFactory.createTxnMem());
+ return wrap(DatasetGraphFactory.createTxnMem());
}
/**
- * @return a general-purpose, in-memory, modifiable Dataset
+ * Create a general-purpose Dataset.<br/>
+ * Any graphs needed are in-memory unless explciitly added with {@link Dataset#addNamedModel}.
+ * </p>
+ * This dataset can contain graphs from any source when added via {@link Dataset#addNamedModel}.
+ * These are held as links to the supplied graph and not copied.
+ * <p>
+ * This dataset does not support transactions.
+ * <p>
+ *
+ * @return a general-purpose Dataset
*/
public static Dataset createGeneral() {
- return createMem();
+ return wrap(DatasetGraphFactory.createGeneral());
}
/**
- * @return an in-memory, modifiable Dataset. New graphs must be explicitly added using .addGraph.
+ * @deprecated This operation may be removed.
*/
+ @Deprecated
public static Dataset createMemFixed() {
- return create(DatasetGraphFactory.createMemFixed());
+ return wrap(DatasetGraphFactory.createMemFixed());
}
- /**
+ /**
* @param model The model for the default graph
* @return a dataset with the given model as the default graph
*/
@@ -94,16 +122,28 @@ public class DatasetFactory {
}
/**
- * Wrap a {@link DatasetGraph} to make a mutable dataset
+ * Wrap a {@link DatasetGraph} to make a dataset
*
* @param dataset DatasetGraph
* @return Dataset
*/
- public static Dataset create(final DatasetGraph dataset) {
+ public static Dataset wrap(final DatasetGraph dataset) {
return DatasetImpl.wrap(dataset);
}
/**
+ * Wrap a {@link DatasetGraph} to make a dataset
+ *
+ * @param dataset DatasetGraph
+ * @return Dataset
+ * @dprecated Use {@link #wrap}
+ */
+ @Deprecated
+ public static Dataset create(final DatasetGraph dataset) {
+ return DatasetImpl.wrap(dataset);
+ }
+
+ /**
* @param uriList URIs merged to form the default dataset
* @return a dataset based on a list of URIs : these are merged into the default graph of the dataset.
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
index 445daa5..6f4757f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphCopyAdd.java
@@ -25,10 +25,12 @@ import org.apache.jena.graph.Node ;
* content from the added graph data.
*/
-/*package*/ class DatasetGraphCopyAdd extends DatasetGraphWrapper {
+/*package*/ class DatasetGraphCopyAdd extends DatasetGraphWrapper
+{
public DatasetGraphCopyAdd(DatasetGraph dsg) {
super(dsg);
}
+
@Override
public void addGraph(Node graphName, Graph graph) {
graph.find(null,null,null).forEachRemaining(t-> {
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
index d456bd5..f846ab5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphFactory.java
@@ -22,25 +22,63 @@ import java.util.Iterator ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
+import org.apache.jena.query.Dataset ;
import org.apache.jena.sparql.core.mem.DatasetGraphInMemory;
import org.apache.jena.sparql.graph.GraphFactory ;
public class DatasetGraphFactory
{
+ /** Create an in-memory, non-transaction {@link DatasetGraph}.
+ * The implementation
+ *
+ * See also {@link #createTxnMem()}
+ *
+ * See also {@link #createGeneral()}
+ *
+ * @see #createTxnMem
+ * @see #createGeneral
+ */
+
+ public static DatasetGraph create() {
+ return new DatasetGraphCopyAdd(createGeneral()) ;
+ }
+
+ /**
+ * @return a DatasetGraph which features transactional in-memory operation
+ */
+ public static DatasetGraph createTxnMem() { return new DatasetGraphInMemory(); }
+
+ /** Create an in-memory, non-transactional DatasetGraph.
+ * <p>
+ * See also {@link #createTxnMem()} for a transactional dataset.
+ * <p>
+ * Use {@link #createGeneral()} when needing to add graphs with mixed characteristics,
+ * e.g. inference graphs, specific graphs from TDB.
+ * <p>
+ * <em>This operation is marked "deprecated" because the general purpose
+ * "add named graph of any implementation"
+ * feature will be removed; this feature is now provided by {@link #createGeneral()}.
+ * </em>
+ * @deprecated Prefer {@link #createGeneral()} or {@link #createTxnMem()}
+ */
+ @Deprecated
+ public static DatasetGraph createMem() { return createGeneral() ; }
+
/** Create a DatasetGraph based on an existing one;
* this is a structure copy of the dataset struture
* but graphs are shared
+ * @deprecated Use {@link #cloneStructure}
*/
- public static DatasetGraph create(final DatasetGraph dsg)
- {
- // Fixed - requires explicit "add graph"
- return new DatasetGraphMap(dsg) ;
-// DatasetGraph dsg2 = createMem() ;
-// copyOver(dsg2, dsg2) ;
-// return dsg2 ;
+ @Deprecated
+ public static DatasetGraph create(DatasetGraph dsg) {
+ return cloneStructure(dsg) ;
+ }
+
+ public static DatasetGraph cloneStructure(DatasetGraph dsg) {
+ return new DatasetGraphMaker(dsg, memGraphMaker) ;
}
- private static void copyOver(final DatasetGraph dsgDest, final DatasetGraph dsgSrc)
+ private static void copyOver(DatasetGraph dsgDest, DatasetGraph dsgSrc)
{
dsgDest.setDefaultGraph(dsgSrc.getDefaultGraph()) ;
for ( final Iterator<Node> names = dsgSrc.listGraphNodes() ; names.hasNext() ; )
@@ -54,7 +92,7 @@ public class DatasetGraphFactory
* Create a DatasetGraph starting with a single graph.
* New graphs must be explicitly added.
*/
- public static DatasetGraph create(final Graph graph)
+ public static DatasetGraph create(Graph graph)
{
final DatasetGraph dsg2 = createMemFixed() ;
dsg2.setDefaultGraph(graph) ;
@@ -64,9 +102,9 @@ public class DatasetGraphFactory
/**
* Create a DatasetGraph which only ever has a single default graph.
*/
- public static DatasetGraph createOneGraph(final Graph graph) { return new DatasetGraphOne(graph) ; }
+ public static DatasetGraph createOneGraph(Graph graph) { return new DatasetGraphOne(graph) ; }
- /** Interface for makign graphs when a dataset needs to add a new graph.
+ /** Interface for making graphs when a dataset needs to add a new graph.
* Return null for no graph created.
*/
public interface GraphMaker { public Graph create() ; }
@@ -77,15 +115,21 @@ public class DatasetGraphFactory
private static GraphMaker memGraphMaker = () -> GraphFactory.createDefaultGraph() ;
/**
- * @return a DatasetGraph which features transactional in-memory operation
- */
- public static DatasetGraph createTxnMem() { return new DatasetGraphInMemory(); }
-
- /**
- * Create a DatasetGraph which has all graphs in memory.
+ * Create a general-purpose, non-transactional Dataset.<br/>
+ *
+ * This dataset can contain graphs from any source when added via {@link Dataset#addNamedModel}.
+ * Any graphs needed are in-memory unless explicitly added with {@link DatasetGraph#addGraph}.
+ * </p>
+ * These are held as links to the supplied graph and not copied.
+ * <p>
+ * This dataset does not support transactions.
+ * <p>
+ *
+ * @return a general-purpose DatasetGraph
*/
+ public static DatasetGraph createGeneral() { return new DatasetGraphMaker(memGraphMaker) ; }
- public static DatasetGraph createMem() { return new DatasetGraphMaker(memGraphMaker) ; }
-
+
+ //@Deprecated
public static DatasetGraph createMemFixed() { return new DatasetGraphMap(GraphFactory.createDefaultGraph()) ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMaker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMaker.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMaker.java
index 39d124b..703998f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMaker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMaker.java
@@ -29,12 +29,19 @@ public class DatasetGraphMaker extends DatasetGraphMap
{
private GraphMaker graphMaker ;
+ public DatasetGraphMaker(DatasetGraph dsg, GraphMaker graphMaker)
+ {
+ super(dsg) ;
+ this.graphMaker = graphMaker ;
+ }
+
public DatasetGraphMaker(GraphMaker graphMaker)
{
super(graphMaker.create()) ;
this.graphMaker = graphMaker ;
}
+ @Deprecated
public DatasetGraphMaker(Graph graph)
{
super(graph) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
index 95fc9aa..831d509 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetImpl.java
@@ -85,6 +85,7 @@ public class DatasetImpl implements Dataset
/** Create a Dataset with a copy of the structure of another one,
* while sharing the graphs themselves.
*/
+ @SuppressWarnings("deprecation")
public DatasetImpl(Dataset ds)
{
this(DatasetGraphFactory.create(ds.asDatasetGraph())) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
index 8599aba..e283fca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
@@ -41,7 +41,7 @@ public class DynamicDatasets
DatasetGraph dsg2 = dynamicDataset(description, dsg, defaultUnionGraph) ;
if ( dsg == dsg2 )
return ds ;
- return DatasetFactory.create(dsg2) ;
+ return DatasetFactory.wrap(dsg2) ;
}
/** Given a DatasetGraph and a query, form a DatasetGraph that
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
index b38ab83..8cd1ba6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java
@@ -29,8 +29,6 @@ import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphFactory ;
import org.apache.jena.sparql.graph.GraphFactory ;
import org.apache.jena.sparql.util.FmtUtils ;
import org.apache.jena.sparql.util.graph.GraphUtils ;
@@ -47,11 +45,8 @@ public class DatasetAssembler extends AssemblerBase implements Assembler {
}
public Dataset createDataset(Assembler a, Resource root, Mode mode) {
- // Expanding version.
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
- AssemblerUtils.setContext(root, dsg.getContext()) ;
-
- Dataset ds = DatasetFactory.create(dsg) ;
+ Dataset ds = DatasetFactory.createGeneral() ;
+ AssemblerUtils.setContext(root, ds.getContext()) ;
// -------- Default graph
// Can use ja:graph or ja:defaultGraph
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java
index 116f5c5..f923302 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java
@@ -56,6 +56,6 @@ public class DatasetNullAssembler extends AssemblerBase implements Assembler
DatasetGraph dsg = transactional ? new GraphStoreNullTransactional() : new GraphStoreNull();
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java
index 0fd1859..dc31cf3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java
@@ -65,7 +65,7 @@ public class GraphSPARQL extends GraphBase implements Graph
public GraphSPARQL(DatasetGraph dsg, Node gn)
{
- this.dataset = DatasetGraphFactory.create(dsg) ;
+ this.dataset = DatasetGraphFactory.cloneStructure(dsg) ;
dataset.setDefaultGraph(dsg.getGraph(gn)) ;
factory = null ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
index 7f8e853..4f7b33c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateEngineWorker.java
@@ -165,7 +165,7 @@ public class UpdateEngineWorker implements UpdateVisitor
// Quads
if ( dest != null )
throw new UpdateException("Attempt to load quads into a graph") ;
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
StreamRDF stream = StreamRDFLib.dataset(dsg) ;
RDFDataMgr.parse(stream, s, source) ;
Iterator<Quad> iter = dsg.find() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderGraph.java
index 23766b7..4962359 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderGraph.java
@@ -94,12 +94,12 @@ public class BuilderGraph
public static DatasetGraph buildDataset(Item item)
{
- return buildDataset(DatasetGraphFactory.createMem(), item) ;
+ return buildDataset(DatasetGraphFactory.createTxnMem(), item) ;
}
public static DatasetGraph buildDataset(ItemList list)
{
- return buildDataset(DatasetGraphFactory.createMem(), list) ;
+ return buildDataset(DatasetGraphFactory.createTxnMem(), list) ;
}
public static DatasetGraph buildDataset(DatasetGraph dsg, Item item)
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java
index 20f2352..b875760 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java
@@ -197,7 +197,7 @@ public class DatasetUtils
}
public static DatasetGraph createDatasetGraph(List<String> uriList, List<String> namedSourceList, String baseURI) {
- DatasetGraph dsg = DatasetGraphFactory.createMem();
+ DatasetGraph dsg = DatasetGraphFactory.createGeneral();
return addInGraphs(dsg, uriList, namedSourceList, baseURI);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index 064ff3b..86756e7 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -315,7 +315,7 @@ public abstract class CmdLangParse extends CmdGeneral
/** Create an accumulating output stream for later pretty printing */
protected Pair<StreamRDF, PostParseHandler> createAccumulateSink() {
- final DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ final DatasetGraph dsg = DatasetGraphFactory.create() ;
StreamRDF sink = StreamRDFLib.dataset(dsg) ;
final RDFFormat fmt = modLangOutput.getOutputFormatted() ;
PostParseHandler handler = new PostParseHandler() {
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/riot/lang/ParserTestBaseLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/ParserTestBaseLib.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/ParserTestBaseLib.java
index c31c16d..054b823 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/ParserTestBaseLib.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/ParserTestBaseLib.java
@@ -45,15 +45,15 @@ class ParserTestBaseLib {
return graph ;
}
- /** Parse for a language - convert errors.wranigns to ErrorHandlerEx */
+ /** Parse for a language - convert errors and warning to ErrorHandlerEx */
static DatasetGraph parseDataset(Lang lang, String ...strings) {
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
StreamRDF dest = StreamRDFLib.dataset(dsg) ;
parse(lang, dest, strings) ;
return dsg ;
}
- /** Parse strings to destination (chekcing on, URI resolution off) */
+ /** Parse strings to destination (checking on, URI resolution off) - convert errors and warning to ErrorHandlerEx */
static void parse(Lang lang, StreamRDF dest, String... strings) {
String string = StrUtils.strjoin("\n", strings) ;
StringReader reader = new StringReader(string) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
index b818b8b..c1ef2c3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
@@ -79,7 +79,7 @@ public class TestTriXReader extends BaseTest {
public void trix_direct() {
ReaderRIOT r = new ReaderTriX() ;
InputStream in = IO.openFile(fInput) ;
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
//StreamRDF stream = StreamRDFLib.writer(System.out) ;
StreamRDF stream = StreamRDFLib.dataset(dsg) ;
stream.start();
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
index 0f9c4fc..2101a47 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
@@ -65,7 +65,7 @@ public class UnitTestEval extends LangTestCase
}
private void run4() {
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
try {
if ( baseIRI != null )
RDFDataMgr.read(dsg, input, baseIRI, lang) ;
@@ -74,7 +74,7 @@ public class UnitTestEval extends LangTestCase
Lang outLang = RDFLanguages.filenameToLang(output, Lang.NQUADS) ;
- DatasetGraph results = DatasetGraphFactory.createMem() ;
+ DatasetGraph results = DatasetGraphFactory.create() ;
try {
RDFDataMgr.read(results, output, outLang) ;
} catch (RiotException ex) {
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
index 2fbc3fe..ee69691 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestStreamRDFThrift.java
@@ -118,7 +118,7 @@ public class TestStreamRDFThrift extends BaseTest {
byte[] bytes = out.toByteArray() ;
ByteArrayInputStream in = new ByteArrayInputStream(bytes) ;
- DatasetGraph dsg2 = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg2 = DatasetGraphFactory.create() ;
StreamRDF stream2 = StreamRDFLib.dataset(dsg2) ;
BinRDF.inputStreamToStream(in, stream2) ;
@@ -136,7 +136,7 @@ public class TestStreamRDFThrift extends BaseTest {
byte[] bytes = out.toByteArray() ;
ByteArrayInputStream in = new ByteArrayInputStream(bytes) ;
- DatasetGraph dsg2 = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg2 = DatasetGraphFactory.create() ;
StreamRDF stream2 = StreamRDFLib.dataset(dsg2) ;
BinRDF.inputStreamToStream(in, stream2) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTriXWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTriXWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTriXWriter.java
index 21d0e2f..6349c61 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTriXWriter.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestTriXWriter.java
@@ -68,7 +68,7 @@ public class TestTriXWriter extends BaseTest {
ByteArrayOutputStream bout = new ByteArrayOutputStream() ;
RDFDataMgr.write(bout, dsg, Lang.TRIX) ;
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()) ;
- DatasetGraph dsg2 = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg2 = DatasetGraphFactory.create() ;
RDFDataMgr.read(dsg2, bin, Lang.TRIX) ;
boolean b = IsoMatcher.isomorphic(dsg, dsg2) ;
assertTrue("Not isomorphic", b) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
index 18f2580..0e4ac71 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
@@ -362,7 +362,7 @@ public class TestAPI extends BaseTest
QueryExecution qExec = QueryExecutionFactory.create(q, d);
Iterator<Quad> ts = qExec.execConstructQuads();
- DatasetGraph result = DatasetGraphFactory.createMem();
+ DatasetGraph result = DatasetGraphFactory.create();
long count = 0;
while (ts.hasNext()) {
count++;
@@ -370,7 +370,7 @@ public class TestAPI extends BaseTest
result.add(qd);
}
- DatasetGraph expected = DatasetGraphFactory.createMem();
+ DatasetGraph expected = DatasetGraphFactory.create();
expected.add(g1.asNode(), s.asNode(), p.asNode(), o.asNode());
assertEquals(1, count);
@@ -386,13 +386,13 @@ public class TestAPI extends BaseTest
QueryExecution qExec = QueryExecutionFactory.create(q, d);
Iterator<Quad> ts = qExec.execConstructQuads();
- DatasetGraph result = DatasetGraphFactory.createMem();
+ DatasetGraph result = DatasetGraphFactory.create();
long count = 0;
while (ts.hasNext()) {
count++;
result.add( ts.next() );
}
- DatasetGraph expected = DatasetGraphFactory.createMem();
+ DatasetGraph expected = DatasetGraphFactory.create();
expected.add(Quad.defaultGraphNodeGenerated, s.asNode(), p.asNode(), o.asNode());
assertEquals(1, count);
assertTrue(IsoMatcher.isomorphic( expected, result) );
@@ -446,7 +446,7 @@ public class TestAPI extends BaseTest
Dataset result = qExec.execConstructDataset();
- DatasetGraph expected = DatasetGraphFactory.createMem();
+ DatasetGraph expected = DatasetGraphFactory.create();
expected.add(g1.asNode(), s.asNode(), p.asNode(), o.asNode());
assertEquals(1, result.asDatasetGraph().size());
assertTrue(IsoMatcher.isomorphic( expected, result.asDatasetGraph()) );
@@ -478,7 +478,7 @@ public class TestAPI extends BaseTest
QueryExecution qExec = QueryExecutionFactory.create(q, d);
Iterator<Quad> quads = qExec.execConstructQuads();
- DatasetGraph result = DatasetGraphFactory.createMem();
+ DatasetGraph result = DatasetGraphFactory.create();
long count = 0;
while (quads.hasNext()) {
count++;
@@ -486,7 +486,7 @@ public class TestAPI extends BaseTest
result.add(qd);
}
- DatasetGraph expected = DatasetGraphFactory.createMem();
+ DatasetGraph expected = DatasetGraphFactory.create();
expected.add(g1.asNode(), s.asNode(), p.asNode(), o.asNode());
assertEquals(1, count);
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
index 9eae9f2..c6fa162 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
@@ -39,7 +39,7 @@ public class TestQueryExecutionTimeout1 extends BaseTest
{
static Graph g = SSE.parseGraph("(graph (<s> <p> <o1>) (<s> <p> <o2>) (<s> <p> <o3>))") ;
static DatasetGraph dsg = DatasetGraphFactory.createOneGraph(g) ;
- static Dataset ds = DatasetFactory.create(dsg) ;
+ static Dataset ds = DatasetFactory.wrap(dsg) ;
private static final String ns = "http://example/ns#" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
index c4d1e67..49d562d 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
@@ -52,7 +52,7 @@ public class TestQueryExecutionTimeout2
" (<s> <p> 12)" +
")") ;
static DatasetGraph dsg = DatasetGraphFactory.createOneGraph(g) ;
- static Dataset ds = DatasetFactory.create(dsg) ;
+ static Dataset ds = DatasetFactory.wrap(dsg) ;
private static void noException(ResultSet rs)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java
index 7ec849b..0ac1dee 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractTestDataset.java
@@ -31,8 +31,7 @@ import org.junit.Test ;
public abstract class AbstractTestDataset extends BaseTest
{
- // Assumes a dadatset which need explicit add graph
- protected abstract Dataset createFixed() ;
+ protected abstract Dataset createDataset() ;
static Model model1 = ModelFactory.createDefaultModel() ;
static Model model2 = ModelFactory.createDefaultModel() ;
@@ -53,21 +52,21 @@ public abstract class AbstractTestDataset extends BaseTest
@Test public void dataset_01()
{
- Dataset ds = createFixed() ;
+ Dataset ds = createDataset() ;
assertNotNull(ds.getDefaultModel()) ;
assertNotNull(ds.asDatasetGraph()) ;
}
@Test public void dataset_02()
{
- Dataset ds = createFixed() ;
+ Dataset ds = createDataset() ;
ds.getDefaultModel().add(s1,p1,o1) ;
assertTrue(model1.isIsomorphicWith(ds.getDefaultModel())) ;
}
@Test public void dataset_03()
{
- Dataset ds = createFixed() ;
+ Dataset ds = createDataset() ;
ds.setDefaultModel(model2) ;
assertTrue(model2.isIsomorphicWith(ds.getDefaultModel())) ;
}
@@ -75,7 +74,7 @@ public abstract class AbstractTestDataset extends BaseTest
@Test public void dataset_04()
{
String graphName = "http://example/" ;
- Dataset ds = createFixed() ;
+ Dataset ds = createDataset() ;
ds.addNamedModel(graphName, model1) ;
assertTrue(ds.containsNamedModel(graphName)) ;
@@ -97,7 +96,7 @@ public abstract class AbstractTestDataset extends BaseTest
@Test public void dataset_05()
{
String graphName = "http://example/" ;
- Dataset ds = createFixed() ;
+ Dataset ds = createDataset() ;
ds.addNamedModel(graphName, model1) ;
ds.replaceNamedModel(graphName, model2) ;
assertTrue(ds.containsNamedModel(graphName)) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
index 62bd1a9..f561773 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
@@ -29,6 +29,7 @@ import org.junit.runners.Suite ;
, TestDatasetGeneral.class
// Not ready , TestDynamicDatasetMem.class
, TestDatasetGraphsRegular.class
+ , TestDatasetGraphCopyAdd.class
, TestGraphOverDatasetMem.class
, TestDatasetGraphViewGraphs.class
, TestDatasetMonitor.class
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
index 2a3aa82..4626de8 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
@@ -24,5 +24,5 @@ import org.apache.jena.query.DatasetFactory ;
public class TestDatasetGeneral extends AbstractTestDataset
{
@Override
- protected Dataset createFixed() { return DatasetFactory.createGeneral() ; }
+ protected Dataset createDataset() { return DatasetFactory.createGeneral() ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
index e2f678f..5204e3f 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java
@@ -39,8 +39,8 @@ import org.junit.Test;
public class TestDatasetGraphWithLock extends AbstractTestDataset {
@Override
- protected Dataset createFixed() {
- return DatasetFactory.create(new DatasetGraphWithLock(DatasetGraphFactory.createMem()));
+ protected Dataset createDataset() {
+ return DatasetFactory.wrap(new DatasetGraphWithLock(DatasetGraphFactory.create()));
}
@Test
@@ -48,7 +48,7 @@ public class TestDatasetGraphWithLock extends AbstractTestDataset {
ExecutorService executor = Executors.newFixedThreadPool(2);
try {
- final DatasetGraphWithLock dsg = new DatasetGraphWithLock(DatasetGraphFactory.createMem());
+ final DatasetGraphWithLock dsg = new DatasetGraphWithLock(DatasetGraphFactory.create());
Callable<Boolean> callable = new Callable<Boolean>() {
@@ -84,7 +84,7 @@ public class TestDatasetGraphWithLock extends AbstractTestDataset {
ExecutorService executor = Executors.newCachedThreadPool();
try {
- final DatasetGraphWithLock dsg = new DatasetGraphWithLock(DatasetGraphFactory.createMem());
+ final DatasetGraphWithLock dsg = new DatasetGraphWithLock(DatasetGraphFactory.create());
Callable<Boolean> callable = new Callable<Boolean>() {
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMonitor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMonitor.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMonitor.java
index 5bcb356..af0b407 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMonitor.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMonitor.java
@@ -38,7 +38,7 @@ public class TestDatasetMonitor extends BaseTest
static Quad quad4 = SSE.parseQuad("(<g> <s> <p> 4)") ;
@Test public void countChanges_01() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCounter dsgChanges = new DatasetChangesCounter() ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgChanges) ;
@@ -48,7 +48,7 @@ public class TestDatasetMonitor extends BaseTest
}
@Test public void countChanges_02() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCounter dsgChanges = new DatasetChangesCounter() ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgChanges) ;
@@ -59,7 +59,7 @@ public class TestDatasetMonitor extends BaseTest
}
@Test public void countChanges_03() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCounter dsgChanges = new DatasetChangesCounter() ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgChanges) ;
@@ -72,7 +72,7 @@ public class TestDatasetMonitor extends BaseTest
}
@Test public void countChanges_04() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCounter dsgChanges = new DatasetChangesCounter() ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgChanges) ;
@@ -85,7 +85,7 @@ public class TestDatasetMonitor extends BaseTest
}
@Test public void captureChanges_01() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCapture dsgCapture = new DatasetChangesCapture() ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgCapture) ;
@@ -103,7 +103,7 @@ public class TestDatasetMonitor extends BaseTest
}
@Test public void captureChanges_02() {
- DatasetGraph dsgBase = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsgBase = DatasetGraphFactory.create() ;
DatasetChangesCapture dsgCapture = new DatasetChangesCapture(true) ;
DatasetGraph dsg = new DatasetGraphMonitor(dsgBase, dsgCapture) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/TestGraphOverDatasetMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestGraphOverDatasetMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestGraphOverDatasetMem.java
index 9dce0a6..b36f74e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestGraphOverDatasetMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestGraphOverDatasetMem.java
@@ -30,7 +30,7 @@ public class TestGraphOverDatasetMem extends AbstractTestGraphOverDataset
@Override
protected DatasetGraph createBaseDSG()
{
- DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
return new DatasetGraphViewGraphs(dsg) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/journaling/TestDatasetGraphWithRecord.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/journaling/TestDatasetGraphWithRecord.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/journaling/TestDatasetGraphWithRecord.java
index f3654e6..fb1b663 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/journaling/TestDatasetGraphWithRecord.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/journaling/TestDatasetGraphWithRecord.java
@@ -76,7 +76,7 @@ public class TestDatasetGraphWithRecord {
graph.add(q1.asTriple());
graph.add(q2.asTriple());
- final Dataset dataset = DatasetFactory.create(emptyDataset());
+ final Dataset dataset = DatasetFactory.wrap(emptyDataset());
final DatasetGraph dsg = dataset.asDatasetGraph();
dataset.begin(WRITE);
@@ -101,7 +101,7 @@ public class TestDatasetGraphWithRecord {
*/
@Test
public void testSimpleAbort() {
- final Dataset dataset = DatasetFactory.create(emptyDataset());
+ final Dataset dataset = DatasetFactory.wrap(emptyDataset());
final DatasetGraph dsg = dataset.asDatasetGraph();
dataset.begin(WRITE);
@@ -134,7 +134,7 @@ public class TestDatasetGraphWithRecord {
@Test
public void testRecordShouldBeCompact() {
final List<QuadOperation<?, ?>> record = new ArrayList<>();
- final Dataset dataset = DatasetFactory.create(new DatasetGraphWithRecord(
+ final Dataset dataset = DatasetFactory.wrap(new DatasetGraphWithRecord(
new DatasetGraphMap(createGraphMem()), new ListBackedOperationRecord<>(record)));
final DatasetGraph dsg = dataset.asDatasetGraph();
@@ -166,7 +166,7 @@ public class TestDatasetGraphWithRecord {
*/
@Test(expected = JenaTransactionException.class)
public void testDatasetGraphWithRecordIsWriteTransactionalOnlyForGraphWrites() {
- final Dataset dataset = DatasetFactory.create(emptyDataset());
+ final Dataset dataset = DatasetFactory.wrap(emptyDataset());
final DatasetGraph dsg = dataset.asDatasetGraph();
dataset.begin(READ);
@@ -183,7 +183,7 @@ public class TestDatasetGraphWithRecord {
*/
@Test(expected = JenaTransactionException.class)
public void testDatasetGraphWithRecordIsWriteTransactionalOnlyForTupleWrites() {
- final Dataset dataset = DatasetFactory.create(emptyDataset());
+ final Dataset dataset = DatasetFactory.wrap(emptyDataset());
final DatasetGraph dsg = dataset.asDatasetGraph();
dataset.begin(READ);
@@ -200,7 +200,7 @@ public class TestDatasetGraphWithRecord {
@Test
public void testRemoveGraph() {
final List<QuadOperation<?, ?>> record = new ArrayList<>();
- final Dataset dataset = DatasetFactory.create(new DatasetGraphWithRecord(
+ final Dataset dataset = DatasetFactory.wrap(new DatasetGraphWithRecord(
new DatasetGraphMap(createGraphMem()), new ListBackedOperationRecord<>(record)));
final DatasetGraph dsg = dataset.asDatasetGraph();
@@ -235,7 +235,7 @@ public class TestDatasetGraphWithRecord {
@Test
public void testClear() {
final List<QuadOperation<?, ?>> record = new ArrayList<>();
- final Dataset dataset = DatasetFactory.create(new DatasetGraphWithRecord(
+ final Dataset dataset = DatasetFactory.wrap(new DatasetGraphWithRecord(
new DatasetGraphMap(createGraphMem()), new ListBackedOperationRecord<>(record)));
final DatasetGraph dsg = dataset.asDatasetGraph();
@@ -264,8 +264,8 @@ public class TestDatasetGraphWithRecord {
public static class TestDatasetGraphWithRecordConcurrency extends TestDatasetGraphWithLock {
@Override
- protected Dataset createFixed() {
- return DatasetFactory.create(new DatasetGraphWithRecord(createMem()));
+ protected Dataset createDataset() {
+ return DatasetFactory.wrap(new DatasetGraphWithRecord(createMem()));
}
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryBasic.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryBasic.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryBasic.java
index 816ef8f..3eff49e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryBasic.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryBasic.java
@@ -76,7 +76,7 @@ public class TestDatasetGraphInMemoryBasic extends AbstractDatasetGraphTests {
final Node graphName = createURI("http://example/g");
final DatasetGraph dsg = emptyDataset();
dsg.addGraph(graphName, createGraphMem());
- final Dataset dataset = DatasetFactory.create(dsg);
+ final Dataset dataset = DatasetFactory.wrap(dsg);
Model model = dataset.getNamedModel(graphName.getURI());
final String testPrefix = "example";
final String testURI = "http://example/";
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryLock.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryLock.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryLock.java
index 37623b0..27daed4 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryLock.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/mem/TestDatasetGraphInMemoryLock.java
@@ -24,7 +24,7 @@ import org.apache.jena.sparql.core.TestDatasetGraphWithLock ;
public class TestDatasetGraphInMemoryLock extends TestDatasetGraphWithLock {
@Override
- protected Dataset createFixed() {
+ protected Dataset createDataset() {
return DatasetFactory.createTxnMem();
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphsMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphsMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphsMem.java
index dcad7b1..3df14de 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphsMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/graph/TestGraphsMem.java
@@ -37,7 +37,7 @@ public class TestGraphsMem extends GraphsTests
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) ;
+ return DatasetFactory.wrap(dsg) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
index 20dffe7..c0d19e9 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java
@@ -169,7 +169,7 @@ public class UpdateTest extends EarlTestCase
//DataSource ds = DatasetFactory.create() ;
DatasetGraph dsg = DatasetGraphFactory.createMem() ;
// Growing. dataset.
- Dataset ds = DatasetFactory.create(dsg) ;
+ Dataset ds = DatasetFactory.wrap(dsg) ;
List<String> dftData = getAll(r, TestManifestUpdate_11.data) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionMem.java
index d6e7715..b2f95cf 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionMem.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/transaction/TestTransactionMem.java
@@ -33,7 +33,7 @@ public class TestTransactionMem extends AbstractTestTransaction
{
DatasetGraph dsg = DatasetGraphFactory.createMem() ;
DatasetGraphWithLock dsgl = new DatasetGraphWithLock(dsg) ;
- return DatasetFactory.create(dsgl) ;
+ return DatasetFactory.wrap(dsgl) ;
}
// Tests that don't make sense because they abort a write transaction.
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetStore.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetStore.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetStore.java
index 6e5f741..c59cf76 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetStore.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/DatasetStore.java
@@ -31,7 +31,7 @@ public class DatasetStore
public static Dataset create(Store store)
{
DatasetGraph dsg = createDatasetGraph(store) ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
public static DatasetGraph createDatasetGraph(Store store)
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-tdb/src/main/java/org/apache/jena/tdb/TDBFactory.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/TDBFactory.java b/jena-tdb/src/main/java/org/apache/jena/tdb/TDBFactory.java
index 8b5021b..6d30381 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/TDBFactory.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/TDBFactory.java
@@ -60,7 +60,7 @@ public class TDBFactory
/** Create a dataset around a DatasetGraphTDB */
private static Dataset createDataset(DatasetGraph datasetGraph)
- { return DatasetFactory.create(datasetGraph) ; }
+ { return DatasetFactory.wrap(datasetGraph) ; }
/** Create or connect to a TDB-backed dataset (graph-level) */
public static DatasetGraph createDatasetGraph(String directory)
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
index c302c32..dca79ca 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/DatasetAssemblerTDB.java
@@ -72,7 +72,7 @@ public class DatasetAssemblerTDB extends DatasetAssembler
tdb:unionGraph true ; # or "true"
*/
AssemblerUtils.setContext(root, dsg.getContext());
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
index 9fd8dfe..3c3bb2e 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
@@ -263,7 +263,7 @@ public class T_TransSystem
{
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg))) {
qExec.setTimeout(abortTime);
ResultSet rs = qExec.execSelect() ;
for (; rs.hasNext() ; )
@@ -279,7 +279,7 @@ public class T_TransSystem
{
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg))) {
qExec.setTimeout(abortTime);
Model model = qExec.execDescribe();
//ResultSet rs = qExec.execSelect() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-tdb/src/test/java/org/apache/jena/tdb/junit/GraphLocation.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/junit/GraphLocation.java b/jena-tdb/src/test/java/org/apache/jena/tdb/junit/GraphLocation.java
index 8dbc40c..0882325 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/junit/GraphLocation.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/junit/GraphLocation.java
@@ -57,7 +57,7 @@ public class GraphLocation
public Dataset getDataset()
{
if ( dsg == null ) return null ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
public Dataset createDataset()
@@ -65,7 +65,7 @@ public class GraphLocation
if ( dsg != null )
throw new TDBTestException("dataset already in use") ;
dsg = TDBFactory.createDatasetGraph(loc) ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
public Graph createGraph()
http://git-wip-us.apache.org/repos/asf/jena/blob/0b2a7402/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TransTestLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TransTestLib.java b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TransTestLib.java
index a2fc846..36711e8 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TransTestLib.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/transaction/TransTestLib.java
@@ -32,7 +32,7 @@ public class TransTestLib {
public static int count(String queryStr, DatasetGraph dsg) {
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
+ try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg))) {
ResultSet rs = qExec.execSelect() ;
for ( ; rs.hasNext() ; ) {
rs.nextBinding() ;
@@ -46,7 +46,7 @@ public class TransTestLib {
public static List<Node> query(String queryStr, String var, DatasetGraphTxn dsg) {
Var v = Var.alloc(var) ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
+ try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.wrap(dsg))) {
List<Node> nodes = new ArrayList<>() ;
ResultSet rs = qExec.execSelect() ;
for ( ; rs.hasNext() ; ) {
[2/3] jena git commit: Notes for TriG templates in CONSTRUCT quads
Posted by an...@apache.org.
Notes for TriG templates in CONSTRUCT quads
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0a6b7d99
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0a6b7d99
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0a6b7d99
Branch: refs/heads/master
Commit: 0a6b7d99ccac65147f8467ad6bb01ba2f7d3bf0b
Parents: ad3b910
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 29 15:04:57 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 29 15:04:57 2015 +0000
----------------------------------------------------------------------
jena-arq/Grammar/arq.jj | 4 ++--
jena-arq/Grammar/master.jj | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0a6b7d99/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 459ed7c..acae4fd 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -501,11 +501,11 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
}
void ConstructQuads(QuadAcc acc) : {}
{
- (TriplesTemplate(acc))?
+ ( TriplesTemplate(acc))?
(
ConstructQuadsNotTriples(acc)
(<DOT>)?
- (TriplesTemplate(acc))?
+ ( TriplesTemplate(acc))?
)*
}
void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/0a6b7d99/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index 043f745..c1f7ef8 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -741,20 +741,21 @@ void QuadsNotTriples(QuadAccSink acc) : {Node gn ; Node prev = acc.getGraph() ;
}
#ifdef ARQ
+// See "/* TriG template :: ..... */" below.
void ConstructQuads(QuadAcc acc) : {}
{
- (TriplesTemplate(acc))?
+ (/* TriG template: LOOKAHEAD(2) */TriplesTemplate(acc))?
(
ConstructQuadsNotTriples(acc)
(<DOT>)?
- (TriplesTemplate(acc))?
+ (/* TriG template: LOOKAHEAD(2) */TriplesTemplate(acc))?
)*
}
void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
{
(
- <GRAPH>
+ <GRAPH> /* TriG template :: (<GRAPH>)?*/
gn = VarOrIri()
)?
@@ -1178,7 +1179,7 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
void PropertyList(Node s, TripleCollector acc) : { }
{
- ( PropertyListNotEmpty(s, acc) ) ?
+ ( /* TriG template: LOOKAHEAD(2) */ PropertyListNotEmpty(s, acc) ) ?
}
void PropertyListNotEmpty(Node s, TripleCollector acc) :
@@ -1187,7 +1188,7 @@ void PropertyListNotEmpty(Node s, TripleCollector acc) :
p = Verb()
ObjectList(s, p, null, acc)
( <SEMICOLON>
- (
+ ( /* TriG template: LOOKAHEAD(2) */
p = Verb()
ObjectList(s, p, null, acc)
)?