diff --git a/src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java b/src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java index 986e4d6..fbb5304 100644 --- a/src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java +++ b/src/main/java/edu/jhuapl/tinkerpop/AccumuloGraph.java @@ -557,7 +557,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { scan.fetchColumnFamily(new Text(x)); } } - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Vertex next(PeekingIterator> iterator) { @@ -586,7 +586,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { s.setRange(new Range(tVal, tVal)); s.fetchColumnFamily(new Text(key)); - return new ScannerIterable(this, s) { + return new ScannerIterable(s) { @Override public Vertex next(PeekingIterator> iterator) { @@ -620,7 +620,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { RegExFilter.setRegexs(is, null, null, null, Pattern.quote(new String(val)), false); scan.addScanIterator(is); - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Vertex next(PeekingIterator> iterator) { @@ -838,7 +838,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { } } - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Edge next(PeekingIterator> iterator) { @@ -876,7 +876,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { s.setRange(new Range(tVal, tVal)); s.fetchColumnFamily(new Text(key)); - return new ScannerIterable(this, s) { + return new ScannerIterable(s) { @Override public Edge next(PeekingIterator> iterator) { AccumuloEdge e = null; @@ -908,7 +908,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { RegExFilter.setRegexs(is, null, null, null, Pattern.quote(new String(val)), false); scan.addScanIterator(is); - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Edge next(PeekingIterator> iterator) { @@ -1134,7 +1134,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { applyRegexValueFilter(scan, labels); } - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Edge next(PeekingIterator> iterator) { @@ -1186,7 +1186,7 @@ public class AccumuloGraph implements Graph, KeyIndexableGraph, IndexableGraph { applyRegexValueFilter(scan, labels); } - return new ScannerIterable(this, scan) { + return new ScannerIterable(scan) { @Override public Vertex next(PeekingIterator> iterator) { diff --git a/src/main/java/edu/jhuapl/tinkerpop/AccumuloIndex.java b/src/main/java/edu/jhuapl/tinkerpop/AccumuloIndex.java index d44761e..fe49952 100644 --- a/src/main/java/edu/jhuapl/tinkerpop/AccumuloIndex.java +++ b/src/main/java/edu/jhuapl/tinkerpop/AccumuloIndex.java @@ -144,7 +144,7 @@ public class AccumuloIndex implements Index { @Override public Iterator iterator() { if (!isClosed) { - return new ScannerIterable(parent, scan) { + return new ScannerIterable(scan) { @Override public T next(PeekingIterator> iterator) { diff --git a/src/main/java/edu/jhuapl/tinkerpop/ScannerIterable.java b/src/main/java/edu/jhuapl/tinkerpop/ScannerIterable.java index 67b2249..5792baa 100644 --- a/src/main/java/edu/jhuapl/tinkerpop/ScannerIterable.java +++ b/src/main/java/edu/jhuapl/tinkerpop/ScannerIterable.java @@ -27,11 +27,9 @@ import com.tinkerpop.blueprints.Element; public abstract class ScannerIterable implements Iterable, Closeable { - AccumuloGraph parent; ScannerBase scanner; - ScannerIterable(AccumuloGraph parent, ScannerBase scanner) { - this.parent = parent; + ScannerIterable(ScannerBase scanner) { this.scanner = scanner; }