This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 178f2348ba GH-3418: DatasetGraphFactory.createWithGraphMaker
178f2348ba is described below
commit 178f2348ba9259557a4839b18b9b32bd1467c119
Author: Andy Seaborne <[email protected]>
AuthorDate: Thu Sep 4 14:22:29 2025 +0100
GH-3418: DatasetGraphFactory.createWithGraphMaker
---
.../jena/sparql/core/DatasetGraphFactory.java | 9 +++-
.../apache/jena/sparql/core/DatasetGraphMap.java | 15 ++++--
.../jena/sparql/core/DatasetGraphMapLink.java | 9 +++-
.../org/apache/jena/sparql/core/TS_SparqlCore.java | 1 +
.../jena/sparql/core/TestDatasetGraphFactory.java | 63 ++++++++++++++++++++++
5 files changed, 90 insertions(+), 7 deletions(-)
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 e4a865ce7e..0345abf51e 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
@@ -112,12 +112,19 @@ public class DatasetGraphFactory
/**
* Create a DatasetGraph starting with a single graph.
- * New graphs must be explicitly added.
+ * New graphs that are explicitly added are held by reference.
*/
public static DatasetGraph create(Graph dftGraph) {
return new DatasetGraphMapLink(dftGraph);
}
+ /**
+ * Create a DatasetGraph using the {@link GraphMaker} for all graphs.
+ */
+ public static DatasetGraph createWithGraphMaker(GraphMaker graphMaker) {
+ return new DatasetGraphMap(graphMaker);
+ }
+
/**
* Create a DatasetGraph which only ever has a single default graph.
*/
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
index cc93aeab1b..dfec6317b2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMap.java
@@ -63,14 +63,16 @@ public class DatasetGraphMap extends
DatasetGraphTriplesQuads
this(defaultGraph, DatasetGraphFactory.graphMakerMem);
}
- private DatasetGraphMap(Graph baseDefaultGraph, GraphMaker baseGraphMaker)
{
+ DatasetGraphMap(GraphMaker graphMaker) {
+ this(null, graphMaker);
+ }
+
+ DatasetGraphMap(Graph baseDefaultGraph, GraphMaker baseGraphMaker) {
this.graphMaker = namedGraphMaker(baseGraphMaker);
if ( baseDefaultGraph == null )
this.defaultGraph = this.graphMaker.create(null);
- else if ( baseDefaultGraph instanceof NamedGraph )
- this.defaultGraph = baseDefaultGraph;
else
- this.defaultGraph = graphMaker.create(null);
+ this.defaultGraph = baseDefaultGraph;
this.prefixes = Prefixes.adapt(defaultGraph);
}
@@ -104,7 +106,10 @@ public class DatasetGraphMap extends
DatasetGraphTriplesQuads
@Override
public Iterator<Node> listGraphNodes() {
// Hide empty graphs.
- return
graphs.entrySet().stream().filter(e->!e.getValue().isEmpty()).map(Entry::getKey).iterator();
+ return graphs.entrySet().stream()
+ .filter(e->!e.getValue().isEmpty())
+ .map(Entry::getKey)
+ .iterator();
}
@Override
diff --git
a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java
b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java
index 938966ee28..8a52d97fc4 100644
---
a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java
+++
b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetGraphMapLink.java
@@ -86,8 +86,15 @@ public class DatasetGraphMapLink extends
DatasetGraphCollection
this(dftGraph, dftGraphMaker);
}
+ /** A {@code DatasetGraph} that uses the given graph for the default graph
+ * and create in-memory graphs for named graphs as needed
+ */
+ public DatasetGraphMapLink(GraphMaker graphMaker) {
+ this(graphMaker.create(null), graphMaker);
+ }
+
// This is the root constructor.
- /*package*/DatasetGraphMapLink(Graph dftGraph, GraphMaker graphMaker) {
+ /*package*/ DatasetGraphMapLink(Graph dftGraph, GraphMaker graphMaker) {
if ( dftGraph == null )
// Always have a default graph of some kind.
dftGraph = GraphZero.instance();
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_SparqlCore.java
b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_SparqlCore.java
index afd4437b62..3ea561bfb4 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_SparqlCore.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_SparqlCore.java
@@ -34,6 +34,7 @@ import org.junit.platform.suite.api.Suite;
, TestDatasetGraphMap.class
, TestDatasetGraphCopyAdd.class
, TestDatasetGraphViewGraphs.class
+ , TestDatasetGraphFactory.class
, TestGraphView.class
, TestDatasetGraphBaseFind_General.class
diff --git
a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphFactory.java
b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphFactory.java
new file mode 100644
index 0000000000..9dd4ac53f8
--- /dev/null
+++
b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphFactory.java
@@ -0,0 +1,63 @@
+/*
+ * 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 static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.atlas.iterator.Iter;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.sparql.graph.NodeConst;
+
+public class TestDatasetGraphFactory {
+ // Not covered elsewhere.
+
+ @Test public void withGraphMaker() {
+ AtomicInteger makerCount = new AtomicInteger(0);
+
+ DatasetGraphFactory.GraphMaker graphMaker = (name) -> {
+ makerCount.incrementAndGet();
+ return DatasetGraphFactory.graphMakerMem.create(name);
+ };
+ DatasetGraph dsg =
DatasetGraphFactory.createWithGraphMaker(graphMaker);
+ // Default graph.
+ assertEquals(1, makerCount.get());
+
+ Node gn = NodeFactory.createURI("http://example/";);
+ Node x = NodeFactory.createURI("http://example/x";);
+ dsg.add(gn,x,x,NodeConst.TRUE);
+ assertEquals(2, makerCount.get());
+ long c1 = Iter.count(dsg.find());
+ assertEquals(1, c1);
+
+ Node gn2 = dsg.listGraphNodes().next();
+ assertEquals(gn, gn2);
+
+ dsg.add(gn,x,x,NodeConst.FALSE);
+ dsg.add(gn,x,x,NodeConst.nodeOne);
+ assertEquals(2, makerCount.get());
+
+ long c2 = Iter.count(dsg.find());
+ assertEquals(3, c2);
+ }
+}
