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 2025/11/14 11:12:05 UTC
(jena) 10/11: GH-3580: Rename GraphMem as GraphMemValue
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
commit ba1fb886fb8734da1fe99a6f8b11a82911acd52c
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue Nov 11 16:53:53 2025 +0000
GH-3580: Rename GraphMem as GraphMemValue
---
.../test/java/org/apache/jena/system/GTest.java | 4 +-
.../org/apache/jena/mem/graph/helper/Context.java | 6 +--
.../mem/graph/helper/GraphTripleNodeHelper480.java | 2 +-
.../graph/helper/GraphTripleNodeHelperCurrent.java | 6 +--
.../org/apache/jena/graph/GraphMemFactory.java | 6 +--
.../org/apache/jena/graph/impl/GraphPlain.java | 6 +--
.../jena/mem/{GraphMem.java => GraphMemValue.java} | 5 +-
.../java/org/apache/jena/mem2/GraphMem2Legacy.java | 4 +-
.../java/org/apache/jena/graph/test/TestGraph.java | 6 +--
.../org/apache/jena/graph/test/TestGraphPlain.java | 2 +-
.../apache/jena/mem/test/TestGraphMemModel.java | 4 +-
.../org/apache/jena/ontapi/GraphUtilsTest.java | 55 +++++++++++-----------
12 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/jena-arq/src/test/java/org/apache/jena/system/GTest.java b/jena-arq/src/test/java/org/apache/jena/system/GTest.java
index d340b7a518..b46c0c605b 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/GTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/GTest.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import org.apache.jena.atlas.lib.Copyable;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.Triple;
-import org.apache.jena.mem.GraphMem;
+import org.apache.jena.mem.GraphMemValue;
import org.apache.jena.mem2.GraphMem2Fast;
import org.apache.jena.sparql.sse.SSE;
@@ -43,7 +43,7 @@ public class GTest {
// Test graph which does not implement Copyable<>
{
@SuppressWarnings("deprecation")
- GraphMem notCopyableGraph = new GraphMem();
+ GraphMemValue notCopyableGraph = new GraphMemValue();
assertFalse(notCopyableGraph instanceof Copyable<?>);
test(notCopyableGraph);
}
diff --git a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/Context.java b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/Context.java
index 4be3724ed7..573a83de7e 100644
--- a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/Context.java
+++ b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/Context.java
@@ -30,7 +30,7 @@ public class Context {
public Context(String graphImplementation) {
switch (graphImplementation) {
case "GraphMem (current)":
- this.graphClass = GraphClass.GraphMem;
+ this.graphClass = GraphClass.GraphMemValue;
this.jenaVersion = JenaVersion.CURRENT;
break;
case "GraphMem2Fast (current)":
@@ -66,7 +66,7 @@ public class Context {
this.jenaVersion = JenaVersion.CURRENT;
break;
case "GraphMem (Jena 4.8.0)":
- this.graphClass = GraphClass.GraphMem;
+ this.graphClass = GraphClass.GraphMemValue;
this.jenaVersion = JenaVersion.JENA_4_8_0;
break;
default:
@@ -84,7 +84,7 @@ public class Context {
public enum GraphClass {
- GraphMem,
+ GraphMemValue,
GraphMem2Fast,
GraphMem2Legacy,
GraphMem2RoaringEager,
diff --git a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
index f3e08ade0d..d9cf6807cf 100644
--- a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
+++ b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelper480.java
@@ -33,7 +33,7 @@ public class GraphTripleNodeHelper480 implements GraphTripleNodeHelper<Graph, Tr
@SuppressWarnings("deprecation")
@Override
public Graph createGraph(Context.GraphClass graphClass) {
- if (Objects.requireNonNull(graphClass) == Context.GraphClass.GraphMem) {
+ if (Objects.requireNonNull(graphClass) == Context.GraphClass.GraphMemValue) {
return new GraphMem();
}
throw new IllegalArgumentException("Unknown graph class: " + graphClass);
diff --git a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelperCurrent.java b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelperCurrent.java
index d19c693f21..e699c5d5c2 100644
--- a/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelperCurrent.java
+++ b/jena-benchmarks/jena-benchmarks-jmh/src/test/java/org/apache/jena/mem/graph/helper/GraphTripleNodeHelperCurrent.java
@@ -36,8 +36,8 @@ public class GraphTripleNodeHelperCurrent implements GraphTripleNodeHelper<Graph
@Override
public Graph createGraph(Context.GraphClass graphClass) {
switch (graphClass) {
- case GraphMem:
- return new org.apache.jena.mem.GraphMem();
+ case GraphMemValue:
+ return new org.apache.jena.mem.GraphMemValue();
case GraphMem2Fast:
return new GraphMem2Fast();
case GraphMem2Legacy:
@@ -61,7 +61,7 @@ public class GraphTripleNodeHelperCurrent implements GraphTripleNodeHelper<Graph
public List<Triple> readTriples(String graphUri) {
var list = new ArrayList<Triple>();
@SuppressWarnings("deprecation")
- var g1 = new org.apache.jena.mem.GraphMem() {
+ var g1 = new org.apache.jena.mem.GraphMemValue() {
@Override
public void add(Triple t) {
list.add(t);
diff --git a/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java b/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java
index 6712c72169..be2b097157 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/GraphMemFactory.java
@@ -67,7 +67,7 @@ public class GraphMemFactory
*/
public static Graph createGraphMemForModel() {
@SuppressWarnings("deprecation")
- Graph g = new org.apache.jena.mem.GraphMem();
+ Graph g = new org.apache.jena.mem.GraphMemValue();
return g;
}
@@ -80,7 +80,7 @@ public class GraphMemFactory
*/
public static Graph createDefaultGraphSameValue() {
@SuppressWarnings("deprecation")
- Graph g = new org.apache.jena.mem.GraphMem();
+ Graph g = new org.apache.jena.mem.GraphMemValue();
return g;
}
@@ -100,7 +100,7 @@ public class GraphMemFactory
* <li>Iterator over this graph does not provide Iterator.remove</li>
* </ul>
* <p>
- * It has improved performance compared to {@link org.apache.jena.mem.GraphMem}
+ * It has improved performance compared to {@link org.apache.jena.mem.GraphMemValue}
* with a simpler implementation, primarily due to not providing support for {@link Iterator#remove}.
* <p>
* See {@link GraphMem2Legacy} for details.
diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/GraphPlain.java b/jena-core/src/main/java/org/apache/jena/graph/impl/GraphPlain.java
index 33922e0700..89308ea4e4 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/impl/GraphPlain.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/impl/GraphPlain.java
@@ -21,7 +21,7 @@ package org.apache.jena.graph.impl;
import java.util.function.Predicate;
import org.apache.jena.graph.* ;
-import org.apache.jena.mem.GraphMem;
+import org.apache.jena.mem.GraphMemValue;
import org.apache.jena.rdf.model.impl.Util ;
import org.apache.jena.util.iterator.ExtendedIterator ;
@@ -44,7 +44,7 @@ public class GraphPlain extends WrappedGraph
*/
@Deprecated
public static Graph plain(Graph base) {
- if ( ! GraphMem.class.isInstance(base) )
+ if ( ! GraphMemValue.class.isInstance(base) )
// No need to do anything.
return base;
return new GraphPlain(base);
@@ -53,7 +53,7 @@ public class GraphPlain extends WrappedGraph
/**
* Return a graph that only has term-equality.
* @deprecated From Jena5, graphs are all "same term",
- * except {@link GraphMem} which is only used in the Model API.
+ * except {@link GraphMemValue} which is only used in the Model API.
*/
@Deprecated
public static Graph plain() {
diff --git a/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java b/jena-core/src/main/java/org/apache/jena/mem/GraphMemValue.java
similarity index 96%
rename from jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
rename to jena-core/src/main/java/org/apache/jena/mem/GraphMemValue.java
index 00eb41bf6e..477a127f60 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/GraphMemValue.java
@@ -35,15 +35,14 @@ import java.util.stream.Stream;
* implementation.
*/
@Deprecated
-public class GraphMem extends GraphMemBase {
- // Rename as GraphMemValue.
+public class GraphMemValue extends GraphMemBase {
/**
This Graph's TripleStore.
*/
private final TripleStore store;
- public GraphMem() {
+ public GraphMemValue() {
super();
store = new GraphTripleStoreMem(this);
}
diff --git a/jena-core/src/main/java/org/apache/jena/mem2/GraphMem2Legacy.java b/jena-core/src/main/java/org/apache/jena/mem2/GraphMem2Legacy.java
index 4557a16cde..771b93e767 100644
--- a/jena-core/src/main/java/org/apache/jena/mem2/GraphMem2Legacy.java
+++ b/jena-core/src/main/java/org/apache/jena/mem2/GraphMem2Legacy.java
@@ -27,7 +27,7 @@ import org.apache.jena.mem2.store.legacy.LegacyTripleStore;
* Purpose: Use this graph implementation if you want to maintain the 'old' behavior of GraphMem or if your memory
* constraints prevent you from utilizing more memory-intensive solutions.
* <p>
- * Slightly improved performance compared to {@link org.apache.jena.mem.GraphMem}
+ * Slightly improved performance compared to {@link org.apache.jena.mem.GraphMemValue}
* Simplified implementation, primarily due to lack of support for Iterator#remove
* <p>
* The heritage of GraphMem:
@@ -37,7 +37,7 @@ import org.apache.jena.mem2.store.legacy.LegacyTripleStore;
* <li>Also based on HashCommon
* </ul>
* <p>
- * This implementation is based on the original {@link org.apache.jena.mem.GraphMem} implementation.
+ * This implementation is based on the original {@link org.apache.jena.mem.GraphMemValue} implementation.
* The main difference is that it strictly uses term equality for all nodes.
* The inner workings of the used structures like ArrayBunch and HashedBunchMap are not changed.
*/
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java
index 15ebacb9a4..c335371378 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraph.java
@@ -28,7 +28,7 @@ import junit.framework.TestSuite;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.GraphMemFactory;
import org.apache.jena.graph.impl.WrappedGraph;
-import org.apache.jena.mem.GraphMem;
+import org.apache.jena.mem.GraphMemValue;
import org.apache.jena.mem2.GraphMem2Fast;
import org.apache.jena.mem2.GraphMem2Legacy;
import org.apache.jena.mem2.GraphMem2Roaring;
@@ -46,8 +46,8 @@ public class TestGraph extends GraphTestBase {
public static TestSuite suite() {
TestSuite result = new TestSuite(TestGraph.class);
- result.addTest(suite(MetaTestGraph.class, GraphMem.class));
- result.addTest(suite(TestReifier.class, GraphMem.class));
+ result.addTest(suite(MetaTestGraph.class, GraphMemValue.class));
+ result.addTest(suite(TestReifier.class, GraphMemValue.class));
result.addTest(suite(MetaTestGraph.class, WrappedGraphMem.class));
result.addTest(suite(TestReifier.class, WrappedGraphMem.class));
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java
index 3a062416f7..9774880186 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphPlain.java
@@ -44,7 +44,7 @@ public class TestGraphPlain {
public static void setUp() {
// GraphMem is the old in-memory graph which has value-based indexing.
// It is not the default graph implementation.
- graph = new org.apache.jena.mem.GraphMem();
+ graph = new org.apache.jena.mem.GraphMemValue();
graphAdd(graph, "s p o; s p 1; s p 01");
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java
index 984cd9c581..f53083cf3a 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMemModel.java
@@ -31,7 +31,7 @@ import org.apache.jena.atlas.iterator.Iter;
import org.apache.jena.graph.*;
import org.apache.jena.graph.impl.LiteralLabelFactory;
import org.apache.jena.graph.test.AbstractTestGraph;
-import org.apache.jena.mem.GraphMem;
+import org.apache.jena.mem.GraphMemValue;
import org.apache.jena.testing_framework.NodeCreateUtils;
import org.apache.jena.util.iterator.ExtendedIterator;
import org.junit.Test;
@@ -41,7 +41,7 @@ import org.junit.Test;
* <p>
* This is used by the Model API.
* <p>
- * Jena5+ : Only {@link GraphMem} supports this. Other graph are "same term", not
+ * Jena5+ : Only {@link GraphMemValue} supports this. Other graph are "same term", not
* "same value" and language tags are held in canonical form.
*/
public class TestGraphMemModel extends AbstractTestGraph {
diff --git a/jena-ontapi/src/test/java/org/apache/jena/ontapi/GraphUtilsTest.java b/jena-ontapi/src/test/java/org/apache/jena/ontapi/GraphUtilsTest.java
index 050d851504..46419ce246 100644
--- a/jena-ontapi/src/test/java/org/apache/jena/ontapi/GraphUtilsTest.java
+++ b/jena-ontapi/src/test/java/org/apache/jena/ontapi/GraphUtilsTest.java
@@ -18,14 +18,21 @@
package org.apache.jena.ontapi;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import com.github.andrewoma.dexx.collection.Sets;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.GraphMemFactory;
import org.apache.jena.graph.Triple;
import org.apache.jena.graph.compose.MultiUnion;
import org.apache.jena.graph.impl.GraphBase;
import org.apache.jena.graph.impl.WrappedGraph;
-import org.apache.jena.mem.GraphMem;
import org.apache.jena.ontapi.impl.UnionGraphImpl;
import org.apache.jena.ontapi.testutils.ModelTestUtils;
import org.apache.jena.ontapi.utils.Graphs;
@@ -37,23 +44,17 @@ import org.apache.jena.sparql.graph.GraphWrapper;
import org.apache.jena.util.iterator.ExtendedIterator;
import org.apache.jena.vocabulary.OWL2;
import org.apache.jena.vocabulary.RDF;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* To test {@link Graphs} utility class.
*/
-@SuppressWarnings("deprecation")
public class GraphUtilsTest {
+ // The test graph implementation choice.
+ private static Graph createGraph() {
+ return GraphMemFactory.createGraphMemForModel();
+ }
+
private static Stream<Graph> flat(Graph graph) {
if (graph == null) return Stream.empty();
return Stream.concat(Stream.of(Graphs.unwrap(graph)), Graphs.directSubGraphs(graph).flatMap(GraphUtilsTest::flat));
@@ -77,11 +78,11 @@ public class GraphUtilsTest {
@Test
public void testIsSized() {
- Assertions.assertTrue(Graphs.isSized(new GraphMem()));
- Assertions.assertTrue(Graphs.isSized(new UnionGraphImpl(new GraphMem())));
- Assertions.assertFalse(Graphs.isSized(new UnionGraphImpl(new GraphWrapper(new GraphMem()))));
+ Assertions.assertTrue(Graphs.isSized(createGraph()));
+ Assertions.assertTrue(Graphs.isSized(new UnionGraphImpl(createGraph())));
+ Assertions.assertFalse(Graphs.isSized(new UnionGraphImpl(new GraphWrapper(createGraph()))));
- UnionGraph u1 = new UnionGraphImpl(new GraphMem());
+ UnionGraph u1 = new UnionGraphImpl(createGraph());
u1.addSubGraph(u1);
Assertions.assertFalse(Graphs.isSized(u1));
@@ -96,14 +97,14 @@ public class GraphUtilsTest {
@Test
public void testIsDistinct() {
- Assertions.assertTrue(Graphs.isDistinct(new GraphMem()));
- Assertions.assertTrue(Graphs.isDistinct(new UnionGraphImpl(new GraphMem())));
- Assertions.assertTrue(Graphs.isDistinct(new UnionGraphImpl(new GraphWrapper(new GraphMem()))));
+ Assertions.assertTrue(Graphs.isDistinct(createGraph()));
+ Assertions.assertTrue(Graphs.isDistinct(new UnionGraphImpl(createGraph())));
+ Assertions.assertTrue(Graphs.isDistinct(new UnionGraphImpl(new GraphWrapper(createGraph()))));
- UnionGraph u1 = new UnionGraphImpl(new GraphMem(), false);
+ UnionGraph u1 = new UnionGraphImpl(createGraph(), false);
Assertions.assertTrue(Graphs.isDistinct(u1));
- u1.addSubGraph(new GraphMem());
+ u1.addSubGraph(createGraph());
Assertions.assertFalse(Graphs.isDistinct(u1));
Graph g = new GraphBase() {
@@ -125,7 +126,7 @@ public class GraphUtilsTest {
MultiUnion b = new MultiUnion();
b.addGraph(g);
- b.addGraph(new GraphMem());
+ b.addGraph(createGraph());
Assertions.assertTrue(Graphs.isSameBase(a, b));
UnionGraph c1 = new UnionGraphImpl(new GraphWrapper(g));
@@ -140,19 +141,19 @@ public class GraphUtilsTest {
Graph d = new UnionGraphImpl(new WrappedGraph(new WrappedGraph(g)));
Assertions.assertTrue(Graphs.isSameBase(a, d));
- Assertions.assertFalse(Graphs.isSameBase(new UnionGraphImpl(g), new UnionGraphImpl(new GraphMem())));
+ Assertions.assertFalse(Graphs.isSameBase(new UnionGraphImpl(g), new UnionGraphImpl(createGraph())));
MultiUnion e = new MultiUnion();
- e.addGraph(new GraphMem());
+ e.addGraph(createGraph());
e.addGraph(g);
Assertions.assertFalse(Graphs.isSameBase(b, e));
}
@Test
public void testCollectPrefixes() {
- Graph a = new GraphMem();
- Graph b = new GraphMem();
- Graph c = new GraphMem();
+ Graph a = createGraph();
+ Graph b = createGraph();
+ Graph c = createGraph();
a.getPrefixMapping().setNsPrefix("a1", "x1").setNsPrefix("a2", "x2");
b.getPrefixMapping().setNsPrefix("b1", "x3");
c.getPrefixMapping().setNsPrefix("b2", "x4");