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 fe084c9c82f887be64f2af3bbbfb25c4c894f714 Author: Andy Seaborne <[email protected]> AuthorDate: Tue Jun 3 10:37:56 2025 +0100 GH-3237: jena-ontapi - use default memory graph --- .../java/org/apache/jena/ontapi/OntModelFactory.java | 2 +- .../org/apache/jena/ontapi/impl/OntGraphModelImpl.java | 2 +- .../java/org/apache/jena/ontapi/GraphUtilsTest.java | 5 +++-- .../test/java/org/apache/jena/ontapi/OntListTest.java | 2 +- .../org/apache/jena/ontapi/OntPersonalityTest.java | 2 +- .../java/org/apache/jena/ontapi/UnionGraphTest.java | 18 +++++++++--------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/jena-ontapi/src/main/java/org/apache/jena/ontapi/OntModelFactory.java b/jena-ontapi/src/main/java/org/apache/jena/ontapi/OntModelFactory.java index 8e916a4e07..73001f7c00 100644 --- a/jena-ontapi/src/main/java/org/apache/jena/ontapi/OntModelFactory.java +++ b/jena-ontapi/src/main/java/org/apache/jena/ontapi/OntModelFactory.java @@ -78,7 +78,7 @@ public class OntModelFactory { * @return {@code Graph} */ public static Graph createDefaultGraph() { - return GraphMemFactory.createGraphMem(); + return GraphMemFactory.createDefaultGraph(); } /** diff --git a/jena-ontapi/src/main/java/org/apache/jena/ontapi/impl/OntGraphModelImpl.java b/jena-ontapi/src/main/java/org/apache/jena/ontapi/impl/OntGraphModelImpl.java index c6747bfe92..c5cd5892be 100644 --- a/jena-ontapi/src/main/java/org/apache/jena/ontapi/impl/OntGraphModelImpl.java +++ b/jena-ontapi/src/main/java/org/apache/jena/ontapi/impl/OntGraphModelImpl.java @@ -1763,7 +1763,7 @@ public class OntGraphModelImpl extends ModelCom implements OntModel, OntEnhGraph public StmtIterator listStatements(Resource subject, Property predicate, RDFNode object, Model posit) { InfGraph graph = getInfGraph(); if (graph != null) { - Graph gp = posit == null ? GraphMemFactory.createGraphMem() : posit.getGraph(); + Graph gp = posit == null ? GraphMemFactory.createDefaultGraph() : posit.getGraph(); Iterator<Triple> iter = graph.find(asNode(subject), asNode(predicate), asNode(object), gp); return IteratorFactory.asStmtIterator(iter, this); } else { 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 fd3f7802b7..050d851504 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 @@ -117,7 +117,7 @@ public class GraphUtilsTest { @Test public void testIsSame() { - Graph g = GraphMemFactory.createGraphMem(); + Graph g = GraphMemFactory.createDefaultGraph(); Assertions.assertTrue(Graphs.isSameBase(g, g)); Graph a = new UnionGraphImpl(g); @@ -134,7 +134,8 @@ public class GraphUtilsTest { UnionGraph c2 = new UnionGraphImpl(new WrappedGraph(g)); Assertions.assertTrue(Graphs.isSameBase(a, c2)); - Assertions.assertFalse(Graphs.isSameBase(g, new GraphMem())); + Graph g2 = GraphMemFactory.createDefaultGraph(); + Assertions.assertFalse(Graphs.isSameBase(g, g2)); Graph d = new UnionGraphImpl(new WrappedGraph(new WrappedGraph(g))); Assertions.assertTrue(Graphs.isSameBase(a, d)); diff --git a/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntListTest.java b/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntListTest.java index 0174523f28..7280d9238b 100644 --- a/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntListTest.java +++ b/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntListTest.java @@ -336,7 +336,7 @@ public class OntListTest { @Test public void testTypedList() { OntGraphModelImpl m = new OntGraphModelImpl( - OntModelFactory.createUnionGraph(GraphMemFactory.createGraphMem()), + OntModelFactory.createUnionGraph(GraphMemFactory.createDefaultGraph()), OntSpecification.OWL2_DL_MEM_BUILTIN_RDFS_INF.getPersonality() ); m.setNsPrefixes(OntModelFactory.STANDARD); diff --git a/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntPersonalityTest.java b/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntPersonalityTest.java index 78ebfc52dc..c8bb465c0f 100644 --- a/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntPersonalityTest.java +++ b/jena-ontapi/src/test/java/org/apache/jena/ontapi/OntPersonalityTest.java @@ -153,7 +153,7 @@ public class OntPersonalityTest { @Test public void testPersonalityPunnings() { String ns = "http://x#";; - OntModel m1 = OntModelFactory.createModel(GraphMemFactory.createGraphMem(), TestOntPersonalities.OWL2_PERSONALITY_STRICT_PUNNS) + OntModel m1 = OntModelFactory.createModel(GraphMemFactory.createDefaultGraph(), TestOntPersonalities.OWL2_PERSONALITY_STRICT_PUNNS) .setNsPrefixes(OntModelFactory.STANDARD) .setNsPrefix("x", ns); OntClass.Named c1 = m1.createOntClass(ns + "C1"); diff --git a/jena-ontapi/src/test/java/org/apache/jena/ontapi/UnionGraphTest.java b/jena-ontapi/src/test/java/org/apache/jena/ontapi/UnionGraphTest.java index c8d7c8b39d..375537109e 100644 --- a/jena-ontapi/src/test/java/org/apache/jena/ontapi/UnionGraphTest.java +++ b/jena-ontapi/src/test/java/org/apache/jena/ontapi/UnionGraphTest.java @@ -159,11 +159,11 @@ public class UnionGraphTest { @Test public void testCloseRecursiveGraph() { - UnionGraph a = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraph b = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraph c = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraph d = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraph e = new UnionGraphImpl(GraphMemFactory.createGraphMem()); + UnionGraph a = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraph b = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraph c = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraph d = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraph e = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); assertClosed(a, false); assertClosed(b, false); assertClosed(c, false); @@ -185,9 +185,9 @@ public class UnionGraphTest { @Test public void testCloseHierarchyGraph() { - UnionGraphImpl a = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraphImpl b = new UnionGraphImpl(GraphMemFactory.createGraphMem()); - UnionGraphImpl c = new UnionGraphImpl(GraphMemFactory.createGraphMem()); + UnionGraphImpl a = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraphImpl b = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); + UnionGraphImpl c = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); assertClosed(a, false); assertClosed(b, false); assertClosed(c, false); @@ -199,7 +199,7 @@ public class UnionGraphTest { assertClosed(c, true); assertClosed(a, false); - UnionGraphImpl d = new UnionGraphImpl(GraphMemFactory.createGraphMem()); + UnionGraphImpl d = new UnionGraphImpl(GraphMemFactory.createDefaultGraph()); try { b.addSubGraph(d); Assertions.fail("Possible to add a sub-graph");
