apacheGH-3237: jena-ontapi - use default memory graph

Author: afs

jena-ontapi/src/main/java/org/apache/jena/ontapi/OntModelFactory.java

@@ -78,7 +78,7 @@ public static void init() {
      * @return {@code Graph}
      */
     public static Graph createDefaultGraph() {
-        return GraphMemFactory.createGraphMem();
+        return GraphMemFactory.createDefaultGraph();
     }
 
     /**

jena-ontapi/src/main/java/org/apache/jena/ontapi/impl/OntGraphModelImpl.java

@@ -1763,7 +1763,7 @@ public ValidityReport validate() {
     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 {

jena-ontapi/src/test/java/org/apache/jena/ontapi/GraphUtilsTest.java

@@ -117,7 +117,7 @@ protected ExtendedIterator<Triple> graphBaseFind(Triple tp) {
 
     @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 void testIsSame() {
         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));

jena-ontapi/src/test/java/org/apache/jena/ontapi/OntListTest.java

@@ -336,7 +336,7 @@ public void testListSpec() {
     @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);

jena-ontapi/src/test/java/org/apache/jena/ontapi/OntPersonalityTest.java

@@ -153,7 +153,7 @@ public void testPersonalityReserved() {
     @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");

jena-ontapi/src/test/java/org/apache/jena/ontapi/UnionGraphTest.java

@@ -159,11 +159,11 @@ public void testWrapAsUnmodified() {
 
     @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 void testCloseRecursiveGraph() {
 
     @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 void testCloseHierarchyGraph() {
         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");