Clean up using Iter on iterables. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0c9237bc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0c9237bc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0c9237bc
Branch: refs/heads/jena3 Commit: 0c9237bc901aa6c2ecc30916507016fb7eb7a395 Parents: aa77052 Author: Andy Seaborne <[email protected]> Authored: Sun Apr 26 00:15:55 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Sun Apr 26 00:15:55 2015 +0100 ---------------------------------------------------------------------- .../org/apache/jena/atlas/lib/ListUtils.java | 2 +- .../java/org/apache/jena/atlas/lib/Tuple.java | 2 +- .../ReorderTransformationSubstitution.java | 2 +- .../apache/jena/sparql/resultset/CSVInput.java | 2 +- .../jena/sparql/resultset/ResultSetCompare.java | 6 ++--- .../apache/jena/atlas/iterator/TestIter.java | 26 ++++++++++---------- .../apache/jena/fuseki/mgt/MgtFunctions.java | 2 +- .../java/org/apache/jena/fuseki/ServerTest.java | 2 +- .../org/apache/jena/sdb/compiler/QuadBlock.java | 2 +- .../org/apache/jena/sdb/compiler/SDB_QC.java | 4 +-- .../apache/jena/sdb/compiler/TransformSDB.java | 4 +-- .../org/apache/jena/sdb/core/ScopeOptional.java | 2 +- .../sdb/core/sqlnode/GenerateSQLVisitor.java | 2 +- .../org/apache/jena/sdb/print/StreamsPrint.java | 6 ++--- .../org/apache/jena/sdb/store/TupleTable.java | 6 ++--- .../apache/jena/tdb/solver/TestSolverTDB.java | 4 +-- 16 files changed, 35 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java index 9c07cec..78d591a 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java @@ -111,7 +111,7 @@ public class ListUtils first = false ; } } ; - Iter.apply(list, output) ; + Iter.apply(list.iterator(), output) ; } /** Return a list of lists of all the elements of collection in every order http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java index 3360c46..ae944a7 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java @@ -148,6 +148,6 @@ public class Tuple<T> implements Iterable<T> { @Override public String toString() { - return "[" + Iter.asString(this, ", ") + "]" ; + return "[" + Iter.asString(iterator(), ", ") + "]" ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java index 90605cb..e316b31 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/optimizer/reorder/ReorderTransformationSubstitution.java @@ -64,7 +64,7 @@ public abstract class ReorderTransformationSubstitution implements ReorderTransf // Or done here as a second pass mutate of PatternTriples // Convert to a mutable form (that allows things like "TERM") - List<PatternTriple> components = Iter.toList(Iter.map(triples, convert)) ; + List<PatternTriple> components = Iter.toList(Iter.map(triples.iterator(), convert)) ; // Allow subclasses to get in (e.g. static reordering). components = modifyComponents(components) ; http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVInput.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVInput.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVInput.java index 6e9cbcd..7d6487b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVInput.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVInput.java @@ -87,7 +87,7 @@ public class CSVInput count++ ; return binding ; }} ; - Iterator<Binding> bindings = Iter.map(parser, transform) ; + Iterator<Binding> bindings = Iter.map(parser.iterator(), transform) ; //Generate an instance of ResultSetStream using TSVInputIterator //This will parse actual result rows as needed thus minimising memory usage http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java index 832b628..c11a38c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java @@ -281,14 +281,14 @@ public class ResultSetCompare return true ; } - // Is bind1 contained in bind22? For every (var,value) in bind1, is it in bind2? + // Is bind1 contained in bind2? For every (var,value) in bind1, is it in bind2? // Maybe more in bind2. private static boolean containedIn(Binding bind1, Binding bind2, EqualityTest test) { // There are about 100 ways to do this! Iterator<Var> iter1 = bind1.vars() ; - for ( Var v : Iter.iter(iter1) ) - { + while(iter1.hasNext()) { + Var v = iter1.next() ; Node n1 = bind1.get(v) ; Node n2 = bind2.get(v) ; if ( n2 == null ) http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java index f611c03..56cf8a9 100644 --- a/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java +++ b/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java @@ -39,7 +39,7 @@ public class TestIter @Test public void append_1() { - Iterator<String> iter = Iter.append(data1, data0) ; + Iterator<String> iter = Iter.append(data1.iterator(), data0.iterator()) ; test(iter, "a") ; } @@ -47,14 +47,14 @@ public class TestIter @Test public void append_2() { - Iterator<String> iter = Iter.append(data0, data1) ; + Iterator<String> iter = Iter.append(data0.iterator(), data1.iterator()) ; test(iter, "a") ; } @Test public void append_3() { - Iterator<String> iter = Iter.append(data1, data2) ; + Iterator<String> iter = Iter.append(data1.iterator(), data2.iterator()) ; test(iter, "a", "x", "y", "z") ; } @@ -71,7 +71,7 @@ public class TestIter R.add("f"); - Iterator<String> LR = Iter.append(L, R) ; + Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ; while (LR.hasNext()) { @@ -101,7 +101,7 @@ public class TestIter R.add("f"); - Iterator<String> LR = Iter.append(L, R) ; + Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ; while (LR.hasNext()) { @@ -131,7 +131,7 @@ public class TestIter R.add("f"); - Iterator<String> LR = Iter.append(L, R) ; + Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ; while (LR.hasNext()) { @@ -435,13 +435,13 @@ public class TestIter @Test public void filter_01() { - test(Iter.removeNulls(data3), "x", "y", "z"); + test(Iter.removeNulls(data3.iterator()), "x", "y", "z"); } @Test public void filter_02() { - Iterator<String> it = Iter.filter(data3, new Filter<String>() + Iterator<String> it = Iter.filter(data3.iterator(), new Filter<String>() { @Override public boolean accept(String item) @@ -456,7 +456,7 @@ public class TestIter @Test public void filter_03() { - Iterator<String> it = Iter.filter(data3, new Filter<String>() + Iterator<String> it = Iter.filter(data3.iterator(), new Filter<String>() { @Override public boolean accept(String item) @@ -471,28 +471,28 @@ public class TestIter @Test public void distinct_01() { List<String> x = Arrays.asList("a", "b", "a") ; - Iterator<String> iter = Iter.distinct(x) ; + Iterator<String> iter = Iter.distinct(x.iterator()) ; test(iter, "a", "b") ; } @Test public void distinct_02() { List<String> x = Arrays.asList("a", "b", "a") ; - Iterator<String> iter = Iter.distinctAdjacent(x) ; + Iterator<String> iter = Iter.distinctAdjacent(x.iterator()) ; test(iter, "a", "b", "a") ; } @Test public void distinct_03() { List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a") ; - Iterator<String> iter = Iter.distinct(x) ; + Iterator<String> iter = Iter.distinct(x.iterator()) ; test(iter, "a", "b") ; } @Test public void distinct_04() { List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a") ; - Iterator<String> iter = Iter.distinctAdjacent(x) ; + Iterator<String> iter = Iter.distinctAdjacent(x.iterator()) ; test(iter, "a", "b", "a") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java index 3f72643..bf956e9 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java @@ -70,7 +70,7 @@ public class MgtFunctions /** Return lists of datasets */ public static List<String> datasets(HttpServletRequest request) { - return Iter.toList(DatasetRegistry.get().keys()) ; + return Iter.toList(DatasetRegistry.get().keys().iterator()) ; } /** Return name of */ http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java index 344eb54..0aa7cbf 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java @@ -143,7 +143,7 @@ public class ServerTest { server.stop() ; server = null ; // Clear out the registry. - Collection<String> keys = Iter.toList(DataAccessPointRegistry.get().keys()) ; + Collection<String> keys = Iter.toList(DataAccessPointRegistry.get().keys().iterator()) ; for (String k : keys) DataAccessPointRegistry.get().remove(k) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QuadBlock.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QuadBlock.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QuadBlock.java index a71f9d4..78aae0b 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QuadBlock.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/QuadBlock.java @@ -178,7 +178,7 @@ public class QuadBlock extends ArrayList<Quad> implements Iterable<Quad>, PrintS out.print(String.valueOf(quad)) ; } } ; - apply(this, strAction) ; + apply(this.iterator(), strAction) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java index 50d2271..9ece0c9 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/SDB_QC.java @@ -102,7 +102,7 @@ public class SDB_QC // If part query, need all variables. // Project variables - List<Var> vars = toList(map(query.getResultVars(), StringToVar)) ; + List<Var> vars = toList(map(query.getResultVars().iterator(), StringToVar)) ; if ( vars.size() == 0 ) { @@ -114,7 +114,7 @@ public class SDB_QC q2.setQueryPattern(query.getQueryPattern()) ; q2.setQuerySelectType() ; q2.setQueryResultStar(true) ; - vars = toList(map(q2.getResultVars(), StringToVar)) ; + vars = toList(map(q2.getResultVars().iterator(), StringToVar)) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java index 24d2531..608cb6b 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/compiler/TransformSDB.java @@ -112,8 +112,8 @@ public class TransformSDB extends TransformCopy Set<ScopeEntry> scopes = sqlLeft.getIdScope().findScopes() ; // Find optional-on-left - Set<ScopeEntry> scopes2 = toSet(filter(scopes, ScopeEntry.OptionalFilter)) ; - Set<Var> leftOptVars = toSet(map(scopes2, ScopeEntry.ToVar)) ; // Vars from left optionals. + Set<ScopeEntry> scopes2 = toSet(filter(scopes.iterator(), ScopeEntry.OptionalFilter)) ; + Set<Var> leftOptVars = toSet(map(scopes2.iterator(), ScopeEntry.ToVar)) ; // Vars from left optionals. if ( false ) { http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/core/ScopeOptional.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/ScopeOptional.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/ScopeOptional.java index c683b3e..c478abf 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/ScopeOptional.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/ScopeOptional.java @@ -57,7 +57,7 @@ public class ScopeOptional implements Scope public Set<ScopeEntry> findScopes() { Set<ScopeEntry> x = scope.findScopes() ; - Iter.apply(x, ScopeEntry.SetOpt) ; + Iter.apply(x.iterator(), ScopeEntry.SetOpt) ; return x ; } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java index 1348ba5..46ce36d 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java @@ -288,7 +288,7 @@ public class GenerateSQLVisitor implements SqlNodeVisitor private static Set<SqlTable> tables(Set<SqlColumn> cols) { - return Iter.toSet(Iter.map(cols, colToTable)) ; + return Iter.toSet(Iter.map(cols.iterator(), colToTable)) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/print/StreamsPrint.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/print/StreamsPrint.java b/jena-sdb/src/main/java/org/apache/jena/sdb/print/StreamsPrint.java index 0d46d6a..288fe05 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/print/StreamsPrint.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/print/StreamsPrint.java @@ -37,20 +37,20 @@ public class StreamsPrint public static <T extends Printable> String printString(Iterable<? extends T> struct, String sep) { IndentedLineBuffer b = new IndentedLineBuffer() ; - apply(struct, new ActionPrint<T>(b, sep)) ; + apply(struct.iterator(), new ActionPrint<T>(b, sep)) ; return b.asString() ; } public static <T extends Printable> void print(IndentedWriter out, Iterable<? extends T> struct) { - apply(struct, new ActionPrint<T>(out)) ; + apply(struct.iterator(), new ActionPrint<T>(out)) ; } public static <T extends Printable> void print(IndentedWriter out, Iterable<? extends T> struct, String sep) { - apply(struct, new ActionPrint<T>(out, sep)) ; + apply(struct.iterator(), new ActionPrint<T>(out, sep)) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-sdb/src/main/java/org/apache/jena/sdb/store/TupleTable.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/store/TupleTable.java b/jena-sdb/src/main/java/org/apache/jena/sdb/store/TupleTable.java index ce8d5dd..6e64c06 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/store/TupleTable.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/store/TupleTable.java @@ -22,7 +22,6 @@ import java.sql.SQLException ; import java.util.ArrayList ; import java.util.List ; -import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.query.ResultSetFactory ; import org.apache.jena.query.ResultSetFormatter ; import org.apache.jena.sdb.Store ; @@ -58,12 +57,11 @@ public class TupleTable this.desc = desc ; sqlTable = new SqlTable(desc.getTableName(), desc.getTableName()) ; vars = new ArrayList<Var>() ; - for (String colName : Iter.iter(desc.colNames()) ) - { + desc.colNames().forEachRemaining(colName -> { Var var = Var.alloc(colName) ; vars.add(var) ; sqlTable.setIdColumnForVar(var, new SqlColumn(sqlTable, colName)) ; - } + }) ; } private static TableDesc getDesc(Store store, String tableName) http://git-wip-us.apache.org/repos/asf/jena/blob/0c9237bc/jena-tdb/src/test/java/org/apache/jena/tdb/solver/TestSolverTDB.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/solver/TestSolverTDB.java b/jena-tdb/src/test/java/org/apache/jena/tdb/solver/TestSolverTDB.java index cd60778..ba73f43 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/solver/TestSolverTDB.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/solver/TestSolverTDB.java @@ -23,7 +23,6 @@ import java.util.ArrayList ; import java.util.Iterator ; import java.util.List ; -import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.junit.BaseTest ; import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.graph.Graph ; @@ -72,8 +71,7 @@ public class TestSolverTDB extends BaseTest static private void addAll(Graph srcGraph, Graph dstGraph) { Iterator<Triple> triples = srcGraph.find(Node.ANY, Node.ANY, Node.ANY) ; - for ( Triple t : Iter.iter(triples) ) - dstGraph.add(t) ; + triples.forEachRemaining(dstGraph::add) ; }
