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 5bd67b1ac6 GH-1277: Deprecate GraphMem as signal of future change.
new 7be194cdaf Merge pull request #1278 from afs/graph-mem
5bd67b1ac6 is described below
commit 5bd67b1ac6e7520d062350b9161f6b9d3501c9b9
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Apr 30 19:26:47 2022 +0100
GH-1277: Deprecate GraphMem as signal of future change.
---
.../java/org/apache/jena/graph/Capabilities.java | 5 +++--
.../main/java/org/apache/jena/graph/Factory.java | 6 ++++--
.../main/java/org/apache/jena/mem/GraphMem.java | 5 +++++
.../java/org/apache/jena/graph/test/TestGraph.java | 25 +++++++++++-----------
.../apache/jena/graph/test/TestGraphListener.java | 13 +++++------
.../org/apache/jena/graph/test/TestGraphPlain.java | 18 ++++++++--------
.../org/apache/jena/graph/test/TestReifier.java | 24 ++++++++++-----------
.../test/java/org/apache/jena/mem/GraphMem_CS.java | 1 +
.../org/apache/jena/mem/test/TestGraphMem.java | 17 ++++++++-------
.../rulesys/impl/TestRestartableLBRule.java | 8 +++----
10 files changed, 67 insertions(+), 55 deletions(-)
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java
b/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java
index b7c0dcb662..b81abc0876 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Capabilities.java
@@ -23,6 +23,7 @@ import org.apache.jena.mem.GraphMem;
/**
* Interface for expressing capabilities.
*/
+@SuppressWarnings("deprecation")
public interface Capabilities {
/**
* Answer true iff Graph::size() is accurate.
@@ -30,13 +31,13 @@ public interface Capabilities {
boolean sizeAccurate();
/**
- * Answer true if Graph::add() can be used to add at least some triples to
the
+ * Answer true iff {@link Graph#add} can be used to add at least some
triples to the
* graph.
*/
boolean addAllowed();
/**
- * Answer true iff Graph::delete() can be used to remove at least some
triples
+ * Answer true iff {@link Graph#delete} can be used to remove at least
some triples
* from the graph.
*/
boolean deleteAllowed();
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Factory.java
b/jena-core/src/main/java/org/apache/jena/graph/Factory.java
index 21692de320..4930db792e 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Factory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Factory.java
@@ -28,6 +28,7 @@ import org.apache.jena.util.iterator.NullIterator ;
*/
+@SuppressWarnings("deprecation")
public class Factory
{
private Factory()
@@ -42,6 +43,8 @@ public class Factory
public static Graph createGraphMem()
{ return new GraphMem(); }
+ /** @deprecated To be removed */
+ @Deprecated
public static Graph createGraphMemWithTransactionHandler( final
TransactionHandler th )
{
Graph g = new GraphMem()
@@ -53,8 +56,7 @@ public class Factory
return g;
}
- private static Graph emptyGraph = new GraphBase() {
-
+ private final static Graph emptyGraph = new GraphBase() {
@Override
protected ExtendedIterator<Triple> graphBaseFind(Triple triplePattern)
{
return NullIterator.instance() ;
diff --git a/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
b/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
index 3e86fbdf0f..3b4ddf2d8d 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/GraphMem.java
@@ -22,6 +22,11 @@ import org.apache.jena.graph.* ;
import org.apache.jena.graph.impl.TripleStore ;
import org.apache.jena.util.iterator.ExtendedIterator ;
+/** @deprecated This implementation of GraphMem will be replaced by a new
implementation at Jena 4.6.0.
+ * Application should be using {@link Factory#createDefaultGraph()} for a
general purpose graph or {@link Factory#createGraphMem()}
+ * to specific this style of implementation.
+*/
+@Deprecated
public class GraphMem extends GraphMemBase
{
public GraphMem()
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 7591b6894b..70e4ad7ff9 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
@@ -30,17 +30,18 @@ import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.impl.WrappedGraph ;
import org.apache.jena.mem.GraphMem ;
+@SuppressWarnings("deprecation")
public class TestGraph extends GraphTestBase
- {
+ {
public TestGraph( String name )
{ super( name ); }
-
+
/**
Answer a test suite that runs the Graph tests on GraphMem and on
WrappedGraphMem, the latter standing in for testing WrappedGraph.
*/
public static TestSuite suite()
- {
+ {
TestSuite result = new TestSuite( TestGraph.class );
result.addTest( suite( MetaTestGraph.class, GraphMem.class ) );
result.addTest( suite( TestReifier.class, GraphMem.class ) );
@@ -50,13 +51,13 @@ public class TestGraph extends GraphTestBase
result.addTestSuite( TestRegisterGraphListener.class );
return result;
}
-
+
public static TestSuite suite( Class<? extends Test> classWithTests,
Class<? extends Graph> graphClass )
{ return MetaTestGraph.suite( classWithTests, graphClass ); }
-
+
/**
Trivial [incomplete] test that a Wrapped graph pokes through to the
underlying
- graph. Really want something using mock classes. Will think about it.
+ graph. Really want something using mock classes. Will think about it.
*/
public void testWrappedSame()
{
@@ -66,14 +67,14 @@ public class TestGraph extends GraphTestBase
assertIsomorphic( m, w );
graphAdd( w, "i write this; you read that" );
assertIsomorphic( w, m );
- }
-
+ }
+
/**
- Class to provide a constructor that produces a wrapper round a
GraphMem.
+ Class to provide a constructor that produces a wrapper round a
GraphMem.
*/
public static class WrappedGraphMem extends WrappedGraph
{
- public WrappedGraphMem( )
- { super( Factory.createGraphMem( ) ); }
- }
+ public WrappedGraphMem( )
+ { super( Factory.createGraphMem( ) ); }
+ }
}
diff --git
a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
index 0713cd161b..7ba7d9ac9f 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestGraphListener.java
@@ -32,13 +32,14 @@ import org.apache.jena.mem.GraphMem ;
* and verifies that after every notification modified graph
* and original are isomorphic.
*/
+@SuppressWarnings("deprecation")
public class TestGraphListener extends MetaTestGraph {
public TestGraphListener(String name) {
super(name);
}
- public TestGraphListener( Class<? extends Graph> graphClass, String name)
+ public TestGraphListener( Class<? extends Graph> graphClass, String name)
{ super( graphClass, name); }
-
+
public static TestSuite suite()
{ return MetaTestGraph.suite( TestGraphListener.class, GraphMem.class ); }
/**
@@ -65,7 +66,7 @@ public class TestGraphListener extends MetaTestGraph {
@Override
public void notifyAddIterator(Graph g, Iterator<Triple> it) {
while (it.hasNext()) copy.add(it.next());
- verify();
+ verify();
}
@Override
@@ -143,10 +144,10 @@ public class TestGraphListener extends MetaTestGraph {
}
@Override
- public Graph getGraph() {
+ public Graph getGraph() {
Graph g = Factory.createGraphMem();
-
+
g.getEventManager().register(new CheckChanges("simple tracking",g));
- return g;
+ return g;
}
}
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 daaf984db3..fac09f854f 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
@@ -31,20 +31,20 @@ import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.GraphPlain ;
-import org.apache.jena.mem.GraphMem ;
import org.apache.jena.util.iterator.ExtendedIterator ;
import org.junit.BeforeClass ;
import org.junit.Test ;
public class TestGraphPlain {
-
+
private static Graph graph;
-
+
+ @SuppressWarnings("deprecation")
@BeforeClass public static void setUp() {
- graph = new GraphMem();
+ graph = new org.apache.jena.mem.GraphMem();
if ( ! graph.getCapabilities().handlesLiteralTyping() )
- throw new IllegalArgumentException("Test graph does not do the
value thing");
+ throw new IllegalArgumentException("Test graph does not do the
value thing");
graphAdd(graph, "s p o ; s p 1 ; s p 01");
}
@@ -54,7 +54,7 @@ public class TestGraphPlain {
Graph plain = GraphPlain.plain(graph);
assertFalse(plain.contains(triple));
}
-
+
@Test public void contains2() {
Triple triple = triple("s p 1");
assertTrue(graph.contains(triple));
@@ -73,12 +73,12 @@ public class TestGraphPlain {
Node s = node("s");
Node p = node("p");
Node x = node("001");
-
+
assertTrue(graph.contains(s,p,x));
Graph plain = GraphPlain.plain(graph);
assertFalse(plain.contains(s,p,x));
}
-
+
@Test public void find1() {
find_test(graph, 2);
Graph plain = GraphPlain.plain(graph);
@@ -102,7 +102,7 @@ public class TestGraphPlain {
List<Triple> list = plain.find(s,p,x).toList();
assertEquals(3, list.size());
}
-
+
private static void find_test(Graph testGraph, int n) {
Triple triple = triple("?? p 1");
ExtendedIterator<Triple> iter = testGraph.find(triple);
diff --git
a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
index ca490172a6..63da057781 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestReifier.java
@@ -27,31 +27,31 @@ import org.apache.jena.shared.JenaException ;
/**
This class tests the reifiers of ordinary GraphMem graphs.
- Old test suite - kept to ensure compatibility for teh one and only
Standard mode
+ Old test suite - kept to ensure compatibility for the one and only
Standard mode
*/
-
+@SuppressWarnings("deprecation")
public class TestReifier extends AbstractTestReifier
{
public TestReifier( String name )
{ super( name ); graphClass = null; }
-
+
protected final Class<? extends Graph> graphClass;
-
- public TestReifier( Class<? extends Graph> graphClass, String name)
+
+ public TestReifier( Class<? extends Graph> graphClass, String name)
{
super( name );
this.graphClass = graphClass;
}
-
+
public static TestSuite suite()
- {
+ {
TestSuite result = new TestSuite();
result.addTest( MetaTestGraph.suite( TestReifier.class, GraphMem.class
) );
result.setName(TestReifier.class.getSimpleName());
- return result;
- }
-
- @Override public Graph getGraph( )
+ return result;
+ }
+
+ @Override public Graph getGraph( )
{
try
{
@@ -65,5 +65,5 @@ public class TestReifier extends AbstractTestReifier
{ throw e; }
catch (Exception e)
{ throw new JenaException( e ); }
- }
+ }
}
diff --git a/jena-core/src/test/java/org/apache/jena/mem/GraphMem_CS.java
b/jena-core/src/test/java/org/apache/jena/mem/GraphMem_CS.java
index b56770b383..5cab0cc1c2 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/GraphMem_CS.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/GraphMem_CS.java
@@ -43,6 +43,7 @@ import org.xenei.junit.contract.IProducer;
@RunWith(ContractSuite.class)
@ContractImpl(GraphMem.class)
+@SuppressWarnings("deprecation")
public class GraphMem_CS {
protected IProducer<GraphMem> graphProducer = new
AbstractGraphProducer<GraphMem>() {
diff --git a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java
b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java
index 4a05161b2e..3594bc9da2 100644
--- a/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java
+++ b/jena-core/src/test/java/org/apache/jena/mem/test/TestGraphMem.java
@@ -25,25 +25,26 @@ import org.apache.jena.mem.GraphMem ;
import org.apache.jena.shared.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
+@SuppressWarnings("deprecation")
public class TestGraphMem extends AbstractTestGraph
{
public TestGraphMem( String name )
{ super( name ); }
-
+
public static TestSuite suite()
{ return new TestSuite( TestGraphMem.class ); }
-
+
@Override public Graph getGraph()
- { return new GraphMem(); }
+ { return new GraphMem(); }
- public void testSizeAfterRemove()
+ public void testSizeAfterRemove()
{
Graph g = getGraphWith( "x p y" );
ExtendedIterator<Triple> it = g.find( triple( "x ?? ??" ) );
it.removeNext();
- assertEquals( 0, g.size() );
+ assertEquals( 0, g.size() );
}
-
+
public void testContainsConcreteDoesntUseFind()
{
Graph g = new GraphMemWithoutFind();
@@ -52,8 +53,8 @@ public class TestGraphMem extends AbstractTestGraph
assertTrue( g.contains( triple( "a Q b" ) ) );
assertFalse( g.contains( triple( "a P y" ) ) );
assertFalse( g.contains( triple( "y R b" ) ) );
- }
-
+ }
+
protected final class GraphMemWithoutFind extends GraphMem
{
@Override public ExtendedIterator<Triple> graphBaseFind( Triple t )
diff --git
a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java
b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java
index 67215f47ca..450751cde9 100644
---
a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java
+++
b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/impl/TestRestartableLBRule.java
@@ -18,14 +18,16 @@
package org.apache.jena.reasoner.rulesys.impl;
+import java.util.Iterator;
+
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.jena.graph.Factory;
import org.apache.jena.graph.Graph;
import org.apache.jena.graph.TransactionHandler;
import org.apache.jena.graph.Triple;
import org.apache.jena.graph.impl.GraphBase;
import org.apache.jena.graph.impl.TransactionHandlerBase;
-import org.apache.jena.mem.GraphMem;
import org.apache.jena.rdf.model.*;
import org.apache.jena.reasoner.rulesys.GenericRuleReasoner;
import org.apache.jena.reasoner.rulesys.Rule;
@@ -35,8 +37,6 @@ import org.apache.jena.util.iterator.WrappedIterator;
import org.apache.jena.vocabulary.RDF;
import org.junit.Test;
-import java.util.Iterator;
-
public class TestRestartableLBRule extends TestCase {
public static TestSuite suite() {
@@ -107,7 +107,7 @@ public class TestRestartableLBRule extends TestCase {
class DummyTxnGraph extends GraphBase implements Graph {
TransactionHandler th = new DummyTxnHandler();
- Graph base = new GraphMem();
+ Graph base = Factory.createGraphMem();
@Override
public void performAdd( Triple t ) { base.add(t); }
