jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/2] jena git commit: JENA-778 : Depracte TripleMatch and fixup
Date Fri, 02 Jan 2015 16:03:23 GMT
Repository: jena
Updated Branches:
  refs/heads/master e3b6d4410 -> b6a4bbc91


JENA-778 : Depracte TripleMatch and fixup


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/707ddf66
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/707ddf66
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/707ddf66

Branch: refs/heads/master
Commit: 707ddf66ae327cb1c42cf60d489c4f8efcc053b6
Parents: 98e2c39
Author: Andy Seaborne <andy@apache.org>
Authored: Thu Jan 1 21:13:57 2015 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Thu Jan 1 21:13:57 2015 +0000

----------------------------------------------------------------------
 .../hp/hpl/jena/sparql/core/DatasetGraph.java   |  4 +--
 .../jena/sparql/core/DatasetGraphSimpleMem.java |  5 ++--
 .../com/hp/hpl/jena/sparql/core/GraphView.java  |  3 +-
 .../hp/hpl/jena/sparql/graph/GraphDataBag.java  |  5 ++--
 .../hp/hpl/jena/sparql/graph/GraphMemPlain.java |  5 ++--
 .../hp/hpl/jena/sparql/graph/GraphSPARQL.java   |  2 +-
 .../jena/sparql/graph/GraphSPARQLService.java   |  5 +---
 .../hpl/jena/sparql/graph/GraphUnionRead.java   |  3 +-
 .../hp/hpl/jena/sparql/graph/GraphWrapper.java  | 12 ++++++--
 .../hpl/jena/sparql/modify/GraphStoreNull.java  | 22 ++-------------
 .../hpl/jena/sparql/util/graph/GraphSink.java   |  3 +-
 .../assemblers/UnionModelAssembler.java         | 24 ++++++++--------
 .../java/com/hp/hpl/jena/graph/Factory.java     | 17 +++++++++++-
 .../main/java/com/hp/hpl/jena/graph/Graph.java  | 18 ++++++++++--
 .../main/java/com/hp/hpl/jena/graph/Triple.java | 12 ++++----
 .../java/com/hp/hpl/jena/graph/TripleMatch.java |  4 +++
 .../com/hp/hpl/jena/graph/compose/Delta.java    |  4 +--
 .../hp/hpl/jena/graph/compose/Difference.java   |  2 +-
 .../hpl/jena/graph/compose/DisjointUnion.java   |  3 +-
 .../com/hp/hpl/jena/graph/compose/Dyadic.java   |  4 +--
 .../hp/hpl/jena/graph/compose/Intersection.java |  2 +-
 .../hp/hpl/jena/graph/compose/MultiUnion.java   |  6 ++--
 .../com/hp/hpl/jena/graph/compose/Union.java    | 11 ++++----
 .../hp/hpl/jena/graph/impl/CollectionGraph.java | 29 +++++++++-----------
 .../com/hp/hpl/jena/graph/impl/GraphBase.java   | 21 ++++++++++++--
 .../com/hp/hpl/jena/graph/impl/TripleStore.java |  2 +-
 .../hp/hpl/jena/graph/impl/WrappedGraph.java    |  6 ++++
 .../main/java/com/hp/hpl/jena/mem/GraphMem.java |  4 +--
 .../hp/hpl/jena/mem/GraphTripleStoreBase.java   |  4 +--
 .../hp/hpl/jena/rdf/model/impl/ReifierStd.java  | 28 +++++++++++++++----
 .../com/hp/hpl/jena/reasoner/BaseInfGraph.java  |  6 ++--
 .../com/hp/hpl/jena/reasoner/TriplePattern.java | 16 ++++++-----
 .../rulesys/BasicForwardRuleInfGraph.java       |  2 +-
 .../jena/reasoner/rulesys/FBRuleInfGraph.java   |  2 +-
 .../reasoner/rulesys/Node_RuleVariable.java     |  2 +-
 .../jena/reasoner/rulesys/impl/SafeGraph.java   | 19 ++++++-------
 .../hp/hpl/jena/shared/RandomOrderGraph.java    |  4 +--
 .../hpl/jena/graph/compose/test/TestDyadic.java |  2 +-
 .../graph/compose/test/TestUnionStatistics.java |  2 +-
 .../jena/graph/test/TestGraphBaseToString.java  |  2 +-
 .../hp/hpl/jena/graph/test/TestGraphUtils.java  |  3 +-
 .../com/hp/hpl/jena/mem/test/TestGraphMem.java  |  2 +-
 .../rulesys/test/FRuleEngineIFactoryTest.java   | 14 ++++------
 .../jena/reasoner/rulesys/test/TestBasicLP.java | 12 ++++----
 .../reasoner/rulesys/test/TestLPDerivation.java |  2 +-
 .../com/hp/hpl/jena/sdb/graph/GraphSDB.java     |  5 ++--
 .../com/hp/hpl/jena/tdb/store/GraphTDB.java     |  6 ++--
 47 files changed, 207 insertions(+), 164 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java
index fc97851..bdc26b2 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java
@@ -24,7 +24,7 @@ import org.apache.jena.atlas.lib.Closeable ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.TripleMatch ;
+import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.shared.Lock ;
 import com.hp.hpl.jena.sparql.util.Context ;
@@ -93,7 +93,7 @@ public interface DatasetGraph extends Closeable
     public Iterator<Quad> find() ;
     
     /** Find matching quads in the dataset - may include wildcards, Node.ANY or null
-     * @see Graph#find(TripleMatch)
+     * @see Graph#find(Triple)
      */
     public Iterator<Quad> find(Quad quad) ;
     

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java
index 5d880d8..f5a4bf1 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java
@@ -28,7 +28,6 @@ import java.util.Set ;
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 import com.hp.hpl.jena.util.iterator.WrappedIterator ;
@@ -167,7 +166,7 @@ public class DatasetGraphSimpleMem extends DatasetGraphCaching
         public void performDelete(Triple t) { triples.remove(t) ; }
 
         @Override
-        protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+        protected ExtendedIterator<Triple> graphBaseFind(Triple m)
         {
             List<Triple> results = new ArrayList<>() ;
             for ( Triple t : triples )
@@ -194,7 +193,7 @@ public class DatasetGraphSimpleMem extends DatasetGraphCaching
         public void performDelete(Triple t) { Quad q = new Quad(graphName, t) ; quads.remove(q) ; }
 
         @Override
-        protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+        protected ExtendedIterator<Triple> graphBaseFind(Triple m)
         {
             List<Triple> results = new ArrayList<>() ;
             

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/GraphView.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/GraphView.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/GraphView.java
index 6686527..527fef3 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/GraphView.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/GraphView.java
@@ -26,7 +26,6 @@ import org.apache.jena.riot.other.GLib ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.shared.JenaException ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -98,7 +97,7 @@ public class GraphView extends GraphBase implements Sync
     }
 
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m) {
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m) {
         if ( m == null ) m = Triple.ANY ;
         Node s = m.getMatchSubject() ;
         Node p = m.getMatchPredicate() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
index 39bf3bf..47653f8 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphDataBag.java
@@ -23,7 +23,6 @@ import org.apache.jena.atlas.data.ThresholdPolicy ;
 
 import com.hp.hpl.jena.graph.Capabilities ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.TripleMatchIterator ;
 import com.hp.hpl.jena.graph.impl.TripleStore ;
 import com.hp.hpl.jena.mem.GraphMemBase ;
@@ -115,9 +114,9 @@ public abstract class GraphDataBag extends GraphMemBase
     }
 
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
-        return new TripleMatchIterator(m.asTriple(), db.iterator()) ;
+        return new TripleMatchIterator(m, db.iterator()) ;
     }
 
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
index 0bbed22..66b182a 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
@@ -27,7 +27,6 @@ import com.hp.hpl.jena.graph.Capabilities;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.graph.impl.SimpleEventManager ;
 import com.hp.hpl.jena.util.iterator.ClosableIterator ;
@@ -75,12 +74,12 @@ public class GraphMemPlain extends GraphBase
     }
     
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
         Iterator<Triple> iter = triples.iterator() ;
         return 
             SimpleEventManager.notifyingRemove( this, iter ) 
-            .filterKeep ( new TripleMatchFilterEquality( m.asTriple() ) );
+            .filterKeep ( new TripleMatchFilterEquality( m ) );
     }
     
     static boolean tripleContained(Triple patternTriple, Triple dataTriple)

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
index e1443ee..245c8cb 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
@@ -104,7 +104,7 @@ public class GraphSPARQL extends GraphBase implements Graph
     public DatasetGraph getDataset() { return dataset ; } 
 
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
         Node s = m.getMatchSubject() ;
         Var sVar = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQLService.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQLService.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQLService.java
index c0ad338..c2bf4ea 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQLService.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQLService.java
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory ;
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.sparql.algebra.Op ;
 import com.hp.hpl.jena.sparql.algebra.op.OpBGP ;
@@ -65,10 +64,8 @@ public class GraphSPARQLService extends GraphBase implements Graph
 //        return capabilities;
 //    }
     
-//    @SuppressWarnings("null")
-//    @Override
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
         Node s = m.getMatchSubject() ;
         Var sVar = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
index f1f5692..e94a624 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphUnionRead.java
@@ -26,7 +26,6 @@ import org.apache.jena.atlas.iterator.IteratorConcat ;
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
@@ -62,7 +61,7 @@ public class GraphUnionRead extends GraphBase
     }
 
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
         IteratorConcat<Triple> iter = new IteratorConcat<>() ;
         for ( Node gn : graphs )

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
index e8e0c64..724abeb 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphWrapper.java
@@ -87,10 +87,18 @@ public class GraphWrapper implements Graph
         graph.delete(t) ;
     }
 
+    /** @deprecated Use {@link #find(Triple)} */
+    @Deprecated
+    @Override
+    public ExtendedIterator<Triple> find(TripleMatch triple)
+    {
+        return graph.find(triple) ;
+    }
+
     @Override
-    public ExtendedIterator<Triple> find(TripleMatch m)
+    public ExtendedIterator<Triple> find(Triple triple)
     {
-        return graph.find(m) ;
+        return graph.find(triple) ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreNull.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreNull.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreNull.java
index 5baa599..ca83b70 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreNull.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreNull.java
@@ -22,34 +22,18 @@ import java.util.Iterator ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
-import com.hp.hpl.jena.graph.impl.GraphBase ;
+import com.hp.hpl.jena.graph.* ;
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.DatasetFactory ;
 import com.hp.hpl.jena.sparql.core.DatasetGraphQuad ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.update.GraphStore ;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
-import com.hp.hpl.jena.util.iterator.NullIterator ;
 
 /**
  * A black hole for Quads, add as many as you want and it will forget them all.  Useful for testing.
  */
 public class GraphStoreNull extends DatasetGraphQuad implements GraphStore
 {
-    // The baby brother
-    private static final Graph GRAPH_NULL = new GraphBase()
-    {
-        @Override
-        protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
-        {
-            return NullIterator.instance();
-        }
-    };
-
     @Override
     public Iterator<Quad> find(Node g, Node s, Node p, Node o)
     {
@@ -76,13 +60,13 @@ public class GraphStoreNull extends DatasetGraphQuad implements GraphStore
     @Override
     public Graph getDefaultGraph()
     {
-        return GRAPH_NULL ;
+        return Factory.empty() ;
     }
 
     @Override
     public Graph getGraph(Node graphNode)
     {
-        return GRAPH_NULL ;
+        return Factory.empty() ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphSink.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphSink.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphSink.java
index 8f03e8f..b9ec34c 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphSink.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphSink.java
@@ -19,7 +19,6 @@
 package com.hp.hpl.jena.sparql.util.graph;
 
 import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 import com.hp.hpl.jena.util.iterator.NullIterator ;
@@ -28,7 +27,7 @@ import com.hp.hpl.jena.util.iterator.NullIterator ;
 public class GraphSink extends GraphBase
 {
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple triple)
     { return NullIterator.instance() ; }
     
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/UnionModelAssembler.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/UnionModelAssembler.java b/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/UnionModelAssembler.java
index 5008cbc..99aed0a 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/UnionModelAssembler.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/UnionModelAssembler.java
@@ -18,21 +18,19 @@
 
 package com.hp.hpl.jena.assembler.assemblers;
 
-import com.hp.hpl.jena.assembler.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.compose.*;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.util.iterator.*;
+import com.hp.hpl.jena.assembler.Assembler ;
+import com.hp.hpl.jena.assembler.JA ;
+import com.hp.hpl.jena.assembler.Mode ;
+import com.hp.hpl.jena.graph.Factory ;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.compose.MultiUnion ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.rdf.model.StmtIterator ;
 
 public class UnionModelAssembler extends ModelAssembler implements Assembler
     {
-    private static final Graph immutable = new GraphBase() 
-        {
-        @Override
-        protected ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
-            { return NullIterator.instance(); }
-        };
     
     @Override
     protected Model openEmptyModel( Assembler a, Resource root, Mode mode )
@@ -47,7 +45,7 @@ public class UnionModelAssembler extends ModelAssembler implements Assembler
     private Graph getRootModel( Assembler a, Resource root, Mode mode )
         {
         Resource r = getUniqueResource( root, JA.rootModel );
-        return r == null ? immutable : a.openModel( r, mode ).getGraph();
+        return r == null ? Factory.empty() : a.openModel( r, mode ).getGraph();
         }
 
     private void addSubModels( Assembler a, Resource root, MultiUnion union, Mode mode )

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
index 3f27fba..1b51d42 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
@@ -18,7 +18,10 @@
 
 package com.hp.hpl.jena.graph;
 
+import com.hp.hpl.jena.graph.impl.GraphBase ;
 import com.hp.hpl.jena.mem.GraphMem ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
 
 /**
     A factory class for creating Graphs.
@@ -49,4 +52,16 @@ public class Factory
             };
         return g;
         }
-    }
+
+    private static Graph emptyGraph = new GraphBase() {
+
+        @Override
+        protected ExtendedIterator<Triple> graphBaseFind(Triple triplePattern) {
+            return NullIterator.instance() ;
+        }
+    } ;
+ 
+    /** Immutable graph with no triples */ 
+    public static Graph empty() { return emptyGraph ; }
+
+    }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
index cd7f50b..4247a79 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/Graph.java
@@ -23,6 +23,7 @@ import com.hp.hpl.jena.shared.AddDeniedException ;
 import com.hp.hpl.jena.shared.DeleteDeniedException ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
 
 /**
     The interface to be satisfied by implementations maintaining collections
@@ -38,7 +39,7 @@ public interface Graph
     */
     public static final Graph emptyGraph = new GraphBase()
         { @Override
-        public ExtendedIterator<Triple> graphBaseFind( TripleMatch tm ) { return Triple.None; } };
+        public ExtendedIterator<Triple> graphBaseFind( Triple tm ) { return NullIterator.instance(); } };
     	
     /** 
         true if this graph's content depends on the other graph. May be
@@ -100,10 +101,21 @@ public interface Graph
 	   
         @param m a Triple[Match] encoding the pattern to look for
         @return an iterator of all triples in this graph that match m
+        @deprecated Use {@link #find(Triple)}
     */
+	@Deprecated 
 	ExtendedIterator<Triple> find(TripleMatch m);
-    
-	  /** Returns an iterator over Triple.
+	
+	/** 
+        Returns an iterator over all the Triples that match the triple pattern.
+   
+        @param m a Triple[Match] encoding the pattern to look for
+        @return an iterator of all triples in this graph that match m
+	 */
+	ExtendedIterator<Triple> find(Triple m);
+
+
+/** Returns an iterator over Triple.
 	   */
 	ExtendedIterator<Triple> find(Node s,Node p,Node o);
     

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/Triple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/Triple.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/Triple.java
index 2816e85..0c8de44 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/Triple.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/Triple.java
@@ -19,16 +19,14 @@
 package com.hp.hpl.jena.graph;
 
 import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
-import com.hp.hpl.jena.util.iterator.Map1;
-import com.hp.hpl.jena.util.iterator.NiceIterator;
+import com.hp.hpl.jena.util.iterator.* ;
 
 /**
     Triples are the basis for RDF statements; they have a subject, predicate, and
     object field (all nodes) and express the notion that the relationship named
     by the predicate holds between the subject and the object.
  */
+@SuppressWarnings("deprecation")
 public class Triple implements TripleMatch 
     {    
 	private final Node subj, pred, obj;
@@ -45,8 +43,10 @@ public class Triple implements TripleMatch
 	
 	/**
 	    A triple-iterator with no elements.
+	    @deprecated Use {@link NullIterator#instance()}
 	*/
-	public static final ExtendedIterator<Triple> None = new NiceIterator<>();
+	@Deprecated
+	public static final ExtendedIterator<Triple> None = NullIterator.instance() ;
 	
     /**
         return a human-readable string "subject @predicate object" describing the triple
@@ -110,7 +110,9 @@ public class Triple implements TripleMatch
     private static Node nullToAny( Node n )
         { return n == null ? Node.ANY : n; }        
         
+    /** @deprecated Not needed. */
     @Override
+    @Deprecated
     public Triple asTriple()
         { return this; }
         

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/TripleMatch.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/TripleMatch.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/TripleMatch.java
index 96bf386..f95f9a3 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/TripleMatch.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/TripleMatch.java
@@ -22,7 +22,9 @@ package com.hp.hpl.jena.graph;
     Interface for triple matching; may become obsolete. <i>do not assume this is
     stable</i>. Triple matches are defined by subject, predicate, and object, and
     may be converted to triples [which in fact subsume the work of TripleMatch].
+    @deprecated Use {@link Triple} directly. This interface will be removed.
 */
+@Deprecated
 public interface TripleMatch {
     
     /** If it is known that all triples selected by this filter will
@@ -39,6 +41,8 @@ public interface TripleMatch {
 
     /**
         Answer a Triple capturing this match.
+        @eeprecated Use {@link Triple} directly. 
     */
+    @Deprecated
     Triple asTriple();
 }

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Delta.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Delta.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Delta.java
index b7451f6..480a462 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Delta.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Delta.java
@@ -89,9 +89,9 @@ public class Delta extends CompositionBase implements Graph
      * add the ones that have been added.
      */
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch tm)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple t)
     {
-        ExtendedIterator<Triple> iterator = base.find(tm).filterDrop(ifIn(GraphUtil.findAll(deletions))).andThen(additions.find(tm)) ;
+        ExtendedIterator<Triple> iterator = base.find(t).filterDrop(ifIn(GraphUtil.findAll(deletions))).andThen(additions.find(t)) ;
         return SimpleEventManager.notifyingRemove( this, iterator ) ;
     }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Difference.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Difference.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Difference.java
index 8aa9e72..eaf24d8 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Difference.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Difference.java
@@ -50,6 +50,6 @@ public class Difference extends Dyadic implements Graph
 	@Override public void performDelete( Triple t )
 		{ L.delete( t ); }
 
-	@Override public ExtendedIterator<Triple> _graphBaseFind( TripleMatch t ) 
+	@Override public ExtendedIterator<Triple> _graphBaseFind( Triple t ) 
 		{ return L.find( t ). filterDrop ( ifIn( R ) ); }
 	}

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/DisjointUnion.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/DisjointUnion.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/DisjointUnion.java
index b4848ed..b893b4f 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/DisjointUnion.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/DisjointUnion.java
@@ -20,7 +20,6 @@ package com.hp.hpl.jena.graph.compose;
 
 import com.hp.hpl.jena.graph.Graph;
 import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 
 /**
@@ -35,7 +34,7 @@ public class DisjointUnion extends Dyadic
     public DisjointUnion( Graph L, Graph R )
         { super( L, R ); }
 
-    @Override protected ExtendedIterator<Triple> _graphBaseFind( TripleMatch m )
+    @Override protected ExtendedIterator<Triple> _graphBaseFind( Triple m )
         { return L.find( m ) .andThen( R.find( m ) ); }
     
     @Override public boolean graphBaseContains( Triple t )

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Dyadic.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Dyadic.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Dyadic.java
index 05dbef6..b03832e 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Dyadic.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Dyadic.java
@@ -52,7 +52,7 @@ public abstract class Dyadic extends CompositionBase
 	 * a deletion occurs.
 	 */
 	@Override
-    protected final ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
+    protected final ExtendedIterator<Triple> graphBaseFind( Triple m )
     {
 		return SimpleEventManager.notifyingRemove( this, this._graphBaseFind( m ) );
     }
@@ -61,7 +61,7 @@ public abstract class Dyadic extends CompositionBase
 	 * The method that the overridden graphBaseFind( TripleMatch m ) calls to actually
 	 * do the work of finding.
 	 */
-	protected abstract ExtendedIterator<Triple> _graphBaseFind( TripleMatch m );
+	protected abstract ExtendedIterator<Triple> _graphBaseFind( Triple m );
 	
     @Override
     public void close()

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Intersection.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Intersection.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Intersection.java
index c917bc8..8abe054 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Intersection.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Intersection.java
@@ -49,7 +49,7 @@ public class Intersection extends Dyadic implements Graph
 		if (this.contains( t )) L.delete( t );
 		}
 		
-	@Override protected ExtendedIterator<Triple> _graphBaseFind( TripleMatch s )
+	@Override protected ExtendedIterator<Triple> _graphBaseFind( Triple s )
 		{
         return L.find( s ) .filterKeep(  ifIn( R ) );
 		}

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
index f657fb5..f80ea3b 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/MultiUnion.java
@@ -142,7 +142,7 @@ public class MultiUnion extends Polyadic
      * @param t The matcher to match against
      * @return An iterator of all triples matching t in the union of the graphs.
      */
-    @Override public ExtendedIterator<Triple> graphBaseFind( final TripleMatch t ) 
+    @Override public ExtendedIterator<Triple> graphBaseFind( final Triple t ) 
         { // optimise the case where there's only one component graph.
         ExtendedIterator<Triple> found = optimiseOne() ? singleGraphFind( t ) : multiGraphFind( t ); 
         return SimpleEventManager.notifyingRemove( MultiUnion.this, found );
@@ -152,14 +152,14 @@ public class MultiUnion extends Polyadic
          Answer the result of <code>find( t )</code> on the single graph in
          this union.
     */
-    private ExtendedIterator<Triple> singleGraphFind( final TripleMatch t )
+    private ExtendedIterator<Triple> singleGraphFind( final Triple t )
         { return (m_subGraphs.get( 0 )).find(  t  ); }
 
 
     /**
      * Answer the concatenation of all the iterators from a-subGraph.find( t ).
      */
-    private ExtendedIterator<Triple> multiGraphFind(final TripleMatch t)
+    private ExtendedIterator<Triple> multiGraphFind(final Triple t)
     {
         Set<Triple> seen = CollectionFactory.createHashedSet() ;
         ExtendedIterator<Triple> result = NullIterator.instance() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Union.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Union.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Union.java
index 4fab29a..8990351 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Union.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/compose/Union.java
@@ -18,11 +18,12 @@
 
 package com.hp.hpl.jena.graph.compose;
 
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.util.CollectionFactory;
-import com.hp.hpl.jena.util.iterator.*;
+import java.util.Set ;
 
-import java.util.*;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.util.CollectionFactory ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
 
 /**
     A class representing the dynamic union of two graphs. Addition only affects the left 
@@ -58,7 +59,7 @@ public class Union extends Dyadic implements Graph
         duplicates. That last is a performance penalty, but I see no way to remove it
         unless we know the graphs do not overlap.
     */
-	@Override protected ExtendedIterator<Triple> _graphBaseFind( final TripleMatch t ) 
+	@Override protected ExtendedIterator<Triple> _graphBaseFind( final Triple t ) 
 	    {
 	    Set<Triple> seen = CollectionFactory.createHashedSet();
         return recording( L.find( t ), seen ).andThen( rejecting( R.find( t ), seen ) ); 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
index 21f7f9f..9c35641 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/CollectionGraph.java
@@ -17,20 +17,18 @@
  */
 package com.hp.hpl.jena.graph.impl;
 
-import com.hp.hpl.jena.graph.Capabilities;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
-import com.hp.hpl.jena.util.iterator.WrappedIterator;
+import java.util.Collection ;
+import java.util.HashSet ;
+import java.util.Locale ;
+import java.util.Set ;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
+import com.hp.hpl.jena.graph.Capabilities ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
+import com.hp.hpl.jena.util.iterator.WrappedIterator ;
 
 /**
  * A simple graph implementation that wraps a collection of triples.
@@ -152,7 +150,7 @@ public class CollectionGraph extends GraphBase
 	}
 
 	@Override
-	protected ExtendedIterator<Triple> graphBaseFind( final TripleMatch m )
+	protected ExtendedIterator<Triple> graphBaseFind( final Triple m )
 	{
 		ExtendedIterator<Triple> iter =null;
 		if (iteratorDeleteAllowed)
@@ -165,8 +163,7 @@ public class CollectionGraph extends GraphBase
 		{
 			iter = WrappedIterator.createNoRemove( triples.iterator() );
 		}
-		return iter 
-	            .filterKeep ( new TripleMatchFilterEquality( m.asTriple() ) );
+		return iter.filterKeep ( new TripleMatchFilterEquality( m ) );
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
index 0ac6c5f..3515859 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/GraphBase.java
@@ -260,7 +260,9 @@ public abstract class GraphBase implements GraphWithPerform
          <code>m</code>. Subclasses cannot over-ride this, because it implements
          the appending of reification quadlets; instead they must implement
          graphBaseFind(TripleMatch).
+         @deprecated Use {@link #find(Triple)} 
 	*/
+	@Deprecated
     @Override
     public final ExtendedIterator<Triple> find(TripleMatch m)
     {
@@ -268,15 +270,28 @@ public abstract class GraphBase implements GraphWithPerform
         return graphBaseFind(m) ;
     }
 
+    @Override
+    public final ExtendedIterator<Triple> find(Triple m)
+    {
+        checkOpen() ;
+        return graphBaseFind(m) ;
+    }
+
     /**
         Answer an iterator over all the triples held in this graph's non-reified triple store
         that match <code>m</code>. Subclasses <i>must</i> override; it is the core
         implementation for <code>find(TripleMatch)</code>.
+        @deprecated Use/implement {@link #graphBaseFind(Triple)}
     */
-    protected abstract ExtendedIterator<Triple> graphBaseFind( TripleMatch m );
+    @Deprecated
+    protected ExtendedIterator<Triple> graphBaseFind( TripleMatch m ) {
+        return graphBaseFind( (Triple)m ) ;
+    }
+
+    protected abstract ExtendedIterator<Triple> graphBaseFind( Triple triplePattern );
 
-    public ExtendedIterator<Triple> forTestingOnly_graphBaseFind( TripleMatch tm )
-        { return graphBaseFind( tm ); }
+    public ExtendedIterator<Triple> forTestingOnly_graphBaseFind( Triple t )
+        { return graphBaseFind( t ); }
     
     /**
          

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/TripleStore.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/TripleStore.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/TripleStore.java
index 4c5faf1..f81e1c9 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/TripleStore.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/TripleStore.java
@@ -75,7 +75,7 @@ public interface TripleStore
          Answer an ExtendedIterator returning all the triples from this store that
          match the pattern <code>m = (S, P, O)</code>.
     */
-    public abstract ExtendedIterator<Triple> find( TripleMatch tm );
+    public abstract ExtendedIterator<Triple> find( Triple t );
 
     /**
         Clear this store, ie remove all triples from it.

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
index 1854374..b833f79 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
@@ -97,11 +97,17 @@ public class WrappedGraph implements GraphWithPerform
         getEventManager().notifyEvent(this, GraphEvents.remove(s, p, o) ) ;
     }
 
+    /** @depracted Use {@link #find(Triple)} */
     @Override
+    @Deprecated
     public ExtendedIterator<Triple> find( TripleMatch m )
     { return SimpleEventManager.notifyingRemove( this, base.find( m ) ); }
 
     @Override
+    public ExtendedIterator<Triple> find( Triple m )
+    { return SimpleEventManager.notifyingRemove( this, base.find( m ) ); }
+
+    @Override
     public ExtendedIterator<Triple> find( Node s, Node p, Node o )
     { return SimpleEventManager.notifyingRemove( this, base.find( s, p, o ) ); }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java b/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
index d59a447..8df4777 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphMem.java
@@ -133,8 +133,8 @@ public class GraphMem extends GraphMemBase
          Answer an ExtendedIterator over all the triples in this graph that match the
          triple-pattern <code>m</code>. Delegated to the store.
      */
-    @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch m ) 
-    { return store.find( m.asTriple() ); }
+    @Override public ExtendedIterator<Triple> graphBaseFind( Triple m ) 
+    { return store.find( m ); }
 
     /**
          Answer true iff this graph contains <code>t</code>. If <code>t</code>

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java b/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java
index d29f274..638b3ec 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
 import com.hp.hpl.jena.graph.Graph;
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
 import com.hp.hpl.jena.graph.impl.TripleStore;
 import com.hp.hpl.jena.util.iterator.*;
 
@@ -156,9 +155,8 @@ public abstract class GraphTripleStoreBase implements TripleStore
          dramatically - specifically on the not-galen.owl ontology.
      */
      @Override
-    public ExtendedIterator<Triple> find( TripleMatch tm )
+    public ExtendedIterator<Triple> find( Triple t )
          {
-         Triple t = tm.asTriple();
          Node pm = t.getPredicate();
          Node om = t.getObject();
          Node sm = t.getSubject();

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
index 23b3df3..abbe458 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
@@ -48,14 +48,22 @@ public class ReifierStd
 
     // All the methods of the old Reifier interface, converted to statics. 
     
+    /** @deprecated Use {@link #findEither(Graph, Triple, boolean)} */
+    @Deprecated
+    public static ExtendedIterator<Triple> findEither(Graph graph, TripleMatch match, boolean showHidden)
+    {
+        if ( showHidden )
+            return NullIterator.instance() ;
+        else
+            return graph.find(match) ;
+    }
+    
     /**
     Answer an iterator over the reification triples of this Reifier, or an empty 
     iterator - if showHidden is false, only the exposed triples, otherwise only
     the concealed ones.
      */
-
-    public static ExtendedIterator<Triple> findEither(Graph graph, TripleMatch match, boolean showHidden)
-    {
+    public static ExtendedIterator<Triple> findEither(Graph graph, Triple match, boolean showHidden) {
         if ( showHidden )
             return NullIterator.instance() ;
         else
@@ -70,13 +78,23 @@ public class ReifierStd
                    triple.getPredicate().equals(predicate) ||
                    triple.getPredicate().equals(object) ||
                    ( triple.getPredicate().equals(rdfType) && triple.getObject().equals(statement) ) ;
-        }} ; 
+        }
+    } ; 
+
+    /** @deprecated Use {@link #findExposed(Graph, Triple)} */
+    @Deprecated
+    public static ExtendedIterator<Triple> findExposed(Graph graph, TripleMatch match)
+    {
+        ExtendedIterator<Triple> it = graph.find(match) ;
+        it = it.filterKeep(filterReif) ;
+        return WrappedIterator.create(it) ;
+    }
 
     /**
         Answer an iterator over all the reification triples that this Reifier exposes
         (ie all if Standard, none otherwise) that match m.
     */
-    public static ExtendedIterator<Triple> findExposed(Graph graph, TripleMatch match)
+    public static ExtendedIterator<Triple> findExposed(Graph graph, Triple match)
     {
         ExtendedIterator<Triple> it = graph.find(match) ;
         it = it.filterKeep(filterReif) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java
index 9f42564..3309b1c 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/BaseInfGraph.java
@@ -367,8 +367,8 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph {
      * filter added to find(Node x 3) -- and test cases, of course.
      */
     @Override
-    public ExtendedIterator<Triple> graphBaseFind(TripleMatch m) {
-        return graphBaseFind(m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject())
+    protected ExtendedIterator<Triple> graphBaseFind(Triple triple) {
+        return graphBaseFind(triple.getMatchSubject(), triple.getMatchPredicate(), triple.getMatchObject())
              // .filterKeep(new TripleMatchFilter(m.asTriple()))
              ;
     }
@@ -379,7 +379,7 @@ public abstract class BaseInfGraph extends GraphBase implements InfGraph {
      * will have also consulted the raw data.
      */
     @Override
-    public ExtendedIterator<Triple> graphBaseFind(Node subject, Node property, Node object) {
+    protected ExtendedIterator<Triple> graphBaseFind(Node subject, Node property, Node object) {
         return findWithContinuation(new TriplePattern(subject, property, object), fdata);
     }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/TriplePattern.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/TriplePattern.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/TriplePattern.java
index 0d688e2..ce1313e 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/TriplePattern.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/TriplePattern.java
@@ -69,7 +69,9 @@ public class TriplePattern implements ClauseEntry {
      * Node that any filter part of the triple match will not be
      * represented within the pattern and will need to be checked
      * for separately.
+     * @deprecated Use {@link #TriplePattern(Triple)}
      */
+    @Deprecated
     public TriplePattern(TripleMatch match) {
         this.subject   = normalize(match.getMatchSubject());
         this.predicate = normalize(match.getMatchPredicate());
@@ -77,7 +79,7 @@ public class TriplePattern implements ClauseEntry {
     }
     
     /**
-     * Constructor - builds a dgenerate pattern from a simple triple.
+     * Constructor - builds a degenerate pattern from a simple triple.
      * This would be much easier if we merged Triples and TriplePatterns!
      */
     public TriplePattern(Triple match) {
@@ -111,12 +113,12 @@ public class TriplePattern implements ClauseEntry {
     }
 
     /**
-     * Return the triple pattern as a triple match
+     * Return the triple pattern as a triple match (concrete terms + Node.ANY) 
      */
-    public TripleMatch asTripleMatch() {
+    public Triple asTripleMatch() {
         return Triple.createMatch(toMatch(subject), 
-                                        toMatch(predicate), 
-                                        toMatch(object));
+                                  toMatch(predicate), 
+                                  toMatch(object));
     }
 
     /**
@@ -289,8 +291,8 @@ public class TriplePattern implements ClauseEntry {
      * Convert any null wildcards to Node_RuleVariable wildcards.
      */
     private static Node normalize(Node node) {
-        if (node == null || node == Node.ANY) return Node_RuleVariable.WILD;
-//        if (node == null) return Node.ANY;
+        if (node == null || node == Node.ANY) 
+            return Node_RuleVariable.WILD;
         return node;
     }
             

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
index e96014a..4fd34d1 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/BasicForwardRuleInfGraph.java
@@ -293,7 +293,7 @@ public class BasicForwardRuleInfGraph extends BaseInfGraph implements ForwardRul
      * will have also consulted the raw data.
      */
     @Override
-    public ExtendedIterator<Triple> graphBaseFind(Node subject, Node property, Node object) {
+    protected ExtendedIterator<Triple> graphBaseFind(Node subject, Node property, Node object) {
         return findWithContinuation(new TriplePattern(subject, property, object), null);
     }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
index 28196ff..d69edb6 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
@@ -427,7 +427,7 @@ public class FBRuleInfGraph  extends BasicForwardRuleInfGraph implements Backwar
                     // An axiom
                     for ( int j = 0; j < r.headLength(); j++ )
                     {
-                        Object head = r.getHeadElement( j );
+                        ClauseEntry head = r.getHeadElement( j );
                         if ( head instanceof TriplePattern )
                         {
                             TriplePattern h = (TriplePattern) head;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Node_RuleVariable.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Node_RuleVariable.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Node_RuleVariable.java
index c396951..a15cd1f 100755
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Node_RuleVariable.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Node_RuleVariable.java
@@ -42,7 +42,7 @@ public class Node_RuleVariable extends Node_Variable {
     /** A flag to indicate that the value is reference (pointer to a var) */
     protected boolean isRef = true;
     
-    /** A static wildcard - like Node.ANY but tests equl to other Node_RuleVariables */
+    /** A static wildcard - like Node.ANY but tests equal to other Node_RuleVariables */
     public static final Node_RuleVariable WILD = new Node_RuleVariable("*", -1);
          
     /**

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/SafeGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/SafeGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/SafeGraph.java
index 445b669..3caa631 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/SafeGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/SafeGraph.java
@@ -18,14 +18,13 @@
 
 package com.hp.hpl.jena.reasoner.rulesys.impl;
 
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
-import com.hp.hpl.jena.graph.impl.SimpleEventManager;
-import com.hp.hpl.jena.graph.impl.WrappedGraph;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.Filter;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.impl.SimpleEventManager ;
+import com.hp.hpl.jena.graph.impl.WrappedGraph ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Filter ;
 
 /**
  * A SafeGraph wraps a graph which might contain generalized RDF
@@ -40,8 +39,8 @@ public class SafeGraph extends WrappedGraph implements Graph {
     }
 
     @Override
-    public ExtendedIterator<Triple> find( TripleMatch m ) {
-        return find(m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject());
+    public ExtendedIterator<Triple> find( Triple triple ) {
+        return find(triple.getMatchSubject(), triple.getMatchPredicate(), triple.getMatchObject());
     }
     
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/main/java/com/hp/hpl/jena/shared/RandomOrderGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/shared/RandomOrderGraph.java b/jena-core/src/main/java/com/hp/hpl/jena/shared/RandomOrderGraph.java
index 6951a3c..8352085 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/shared/RandomOrderGraph.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/shared/RandomOrderGraph.java
@@ -50,8 +50,8 @@ public class RandomOrderGraph extends WrappedGraph {
 	}
 	
 	@Override
-    public ExtendedIterator<Triple> find( TripleMatch m )
-	{ return new RandomOrderIterator<>(bufsz,super.find( m ));
+    public ExtendedIterator<Triple> find( Triple triple )
+	{ return new RandomOrderIterator<>(bufsz,super.find( triple ));
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java
index bf802cd..9f66449 100755
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDyadic.java
@@ -69,7 +69,7 @@ public abstract class TestDyadic extends AbstractTestGraph
         Graph g = Factory.createGraphMem(), h = Factory.createGraphMem();
         Dyadic d = new Dyadic( g, h )
             {
-            @Override protected ExtendedIterator<Triple> _graphBaseFind( TripleMatch m ) { return null; }
+            @Override protected ExtendedIterator<Triple> _graphBaseFind( Triple m ) { return null; }
             };
         assertSame( g, d.getL() );
         assertSame( h, d.getR() );

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java
index b7bd7c9..e7d29ac 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java
@@ -95,7 +95,7 @@ public class TestUnionStatistics extends GraphTestBase
         {
         return new GraphBase() 
             {
-            @Override protected ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
+            @Override protected ExtendedIterator<Triple> graphBaseFind( Triple m )
                 {    
                 throw new RuntimeException( "should never be called" );
                 }

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java
index 75c367f..a428d1e 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphBaseToString.java
@@ -40,7 +40,7 @@ public class TestGraphBaseToString extends GraphTestBase
         @Override public void performAdd( Triple t )
             { triples.add( t ); }
         
-        @Override protected ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
+        @Override protected ExtendedIterator<Triple> graphBaseFind( Triple m )
             { return WrappedIterator.<Triple>create( triples.iterator() ); }
         }
 

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java
index 82ca4f1..1eb594c 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestGraphUtils.java
@@ -43,9 +43,8 @@ public class TestGraphUtils extends GraphTestBase
         final Bool foundAll = new Bool( false );
         Graph mock = new GraphBase() 
             {
-            @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
+            @Override public ExtendedIterator<Triple> graphBaseFind( Triple t )
                 { 
-                Triple t = m.asTriple();
                 assertEquals( Node.ANY, t.getSubject() ); 
                 assertEquals( Node.ANY, t.getPredicate() );
                 assertEquals( Node.ANY, t.getObject() );

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java b/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
index a6f4da0..177bdb0 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/mem/test/TestGraphMem.java
@@ -130,7 +130,7 @@ public class TestGraphMem extends AbstractTestGraph
 
     protected final class GraphMemWithoutFind extends GraphMem
         {
-        @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch t )
+        @Override public ExtendedIterator<Triple> graphBaseFind( Triple t )
             { throw new JenaException( "find is Not Allowed" ); }
         }
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/FRuleEngineIFactoryTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/FRuleEngineIFactoryTest.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/FRuleEngineIFactoryTest.java
index 8332555..fec409e 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/FRuleEngineIFactoryTest.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/FRuleEngineIFactoryTest.java
@@ -23,15 +23,7 @@ import java.util.Iterator;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.hp.hpl.jena.graph.BulkUpdateHandler;
-import com.hp.hpl.jena.graph.Capabilities;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphEventManager;
-import com.hp.hpl.jena.graph.GraphStatisticsHandler;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.TransactionHandler;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
+import com.hp.hpl.jena.graph.* ;
 import com.hp.hpl.jena.reasoner.Derivation;
 import com.hp.hpl.jena.reasoner.Reasoner;
 import com.hp.hpl.jena.reasoner.ValidityReport;
@@ -164,10 +156,14 @@ public class FRuleEngineIFactoryTest extends TestCase {
         @Override
         public void delete(Triple t) throws DeleteDeniedException {}
 
+        @SuppressWarnings("deprecation")
         @Override
         public ExtendedIterator<Triple> find(TripleMatch m) { return null; }
 
         @Override
+        public ExtendedIterator<Triple> find(Triple m) { return null; }
+
+        @Override
         public ExtendedIterator<Triple> find(Node s, Node p, Node o) { return null; }
 
         @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
index 9105ce2..db1e9f7 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
@@ -1315,10 +1315,10 @@ public class TestBasicLP  extends TestCase {
      * Generic test operation.
      * @param ruleSrc the source of the rules
      * @param triples a set of triples to insert in the graph before the query
-     * @param query the TripleMatch to search for
+     * @param query the Triple to search for
      * @param results the array of expected results
      */
-    private void doTest(String ruleSrc, Triple[] triples, TripleMatch query, Object[] results) {
+    private void doTest(String ruleSrc, Triple[] triples, Triple query, Object[] results) {
         List<Rule> rules = Rule.parseRules(ruleSrc);
         Graph data = Factory.createGraphMem();
         for ( Triple triple : triples )
@@ -1334,10 +1334,10 @@ public class TestBasicLP  extends TestCase {
      * @param ruleSrc the source of the rules
      * @param tabled the predicates that should be tabled
      * @param triples a set of triples to insert in the graph before the query
-     * @param query the TripleMatch to search for
+     * @param query the Triple to search for
      * @param results the array of expected results
      */
-    private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, TripleMatch query, Object[] results) {
+    private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, Triple query, Object[] results) {
         List<Rule> rules = Rule.parseRules(ruleSrc);
         Graph data = Factory.createGraphMem();
         for ( Triple triple : triples )
@@ -1352,10 +1352,10 @@ public class TestBasicLP  extends TestCase {
     /** 
      * Generic base test operation on a graph with the single triple (a, p, b)
      * @param ruleSrc the source of the rules
-     * @param query the TripleMatch to search for
+     * @param query the Triple to search for
      * @param results the array of expected results
      */
-    private void doBasicTest(String ruleSrc, TripleMatch query, Object[] results) {
+    private void doBasicTest(String ruleSrc, Triple query, Object[] results) {
         doTest(ruleSrc, new Triple[]{new Triple(a,p,b)}, query, results);
     }
     

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
index 37bede4..173f57c 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
@@ -94,7 +94,7 @@ public class TestLPDerivation extends TestCase {
      * @param matches the set of triple matches which should occur in the derivation
      * @param rulenumber the index of the rule in the rule list which should occur in the derivation
      */
-    private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, TripleMatch query, Triple[] matches, int rulenumber) {
+    private void doTest(String ruleSrc, Node[] tabled, Triple[] triples, Triple query, Triple[] matches, int rulenumber) {
         List<Rule> rules = Rule.parseRules(ruleSrc);
         Graph data = Factory.createGraphMem();
         for ( Triple triple : triples )

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
index a51b58a..1b8fee7 100644
--- a/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
+++ b/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
@@ -65,7 +65,6 @@ public class GraphSDB extends GraphBase implements Graph
     public GraphSDB(Store store, String uri)
     { 
         this(store, NodeFactory.createURI(uri)) ;
-        
     }
     
     public GraphSDB(Store store)
@@ -121,7 +120,7 @@ public class GraphSDB extends GraphBase implements Graph
         { log.warn("Failed to get prefixes: "+ex.getMessage()) ; return null ; }
     }
 
-    private Quad quad(TripleMatch m)
+    private Quad quad(Triple m)
     {
         Node s = m.getMatchSubject() ;
         Var sVar = null ;
@@ -151,7 +150,7 @@ public class GraphSDB extends GraphBase implements Graph
     }
 
     @Override
-    protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
+    protected ExtendedIterator<Triple> graphBaseFind(Triple m)
     {
         // Fake a query.
         SDBRequest cxt = new SDBRequest(getStore(), new Query()) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/707ddf66/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
index f0f6524..3429fbf 100644
--- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
+++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
@@ -106,8 +106,8 @@ public class GraphTDB extends GraphView implements Closeable, Sync {
         super.close() ;
     }
 
-    protected static ExtendedIterator<Triple> graphBaseFindDft(DatasetGraphTDB dataset, TripleMatch m) {
-        Iterator<Quad> iterQuads = dataset.find(Quad.defaultGraphIRI, m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject()) ;
+    protected static ExtendedIterator<Triple> graphBaseFindDft(DatasetGraphTDB dataset, Triple triple) {
+        Iterator<Quad> iterQuads = dataset.find(Quad.defaultGraphIRI, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
         if ( iterQuads == null )
             return com.hp.hpl.jena.util.iterator.NullIterator.instance() ;
         // Can't be duplicates - fixed graph node..
@@ -115,7 +115,7 @@ public class GraphTDB extends GraphView implements Closeable, Sync {
         return WrappedIterator.createNoRemove(iterTriples) ;
     }
 
-    protected static ExtendedIterator<Triple> graphBaseFindNG(DatasetGraphTDB dataset, Node graphNode, TripleMatch m) {
+    protected static ExtendedIterator<Triple> graphBaseFindNG(DatasetGraphTDB dataset, Node graphNode, Triple m) {
         Node gn = graphNode ;
         // Explicitly named union graph.
         if ( isUnionGraph(gn) )


Mime
View raw message