From 03fd52e89b44fd39ae97490f43d4922b39e7d07d Mon Sep 17 00:00:00 2001 From: Andrew Smith Date: Fri, 14 Sep 2018 12:37:16 -0400 Subject: [PATCH] RYA-501 Change guava Iterators to Collections Google changed the Iterators object emptyIterator() visibility. This can cause versioning issues with anything depending on a newer version of guava. Using Java's Collections.emptyIterator() instead. --- .../iter/RyaStatementBindingSetCursorIterator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java index 727538bd2..d66d1b62e 100644 --- a/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java +++ b/dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java @@ -19,6 +19,7 @@ package org.apache.rya.mongodb.iter; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -37,7 +38,6 @@ import org.openrdf.query.BindingSet; import com.google.common.collect.HashMultimap; -import com.google.common.collect.Iterators; import com.google.common.collect.Multimap; import com.mongodb.DBObject; import com.mongodb.client.AggregateIterable; @@ -92,7 +92,7 @@ public Entry next() { } private boolean currentBindingSetIteratorIsValid() { - return (currentBindingSetIterator != null) && currentBindingSetIterator.hasNext(); + return currentBindingSetIterator != null && currentBindingSetIterator.hasNext(); } private void findNextResult() { @@ -131,7 +131,7 @@ private static boolean isResultForQuery(final RyaStatement query, final RyaState } private static boolean isResult(final RyaType query, final RyaType result) { - return (query == null) || query.equals(result); + return query == null || query.equals(result); } private void submitBatchQuery() { @@ -153,7 +153,7 @@ private void submitBatchQuery() { } else if (match.size() == 1) { pipeline.add(new Document("$match", match.get(0))); } else { - batchQueryResultsIterator = Iterators.emptyIterator(); + batchQueryResultsIterator = Collections.emptyIterator(); return; } @@ -167,7 +167,7 @@ private void submitBatchQuery() { } private boolean currentBatchQueryResultCursorIsValid() { - return (batchQueryResultsIterator != null) && batchQueryResultsIterator.hasNext(); + return batchQueryResultsIterator != null && batchQueryResultsIterator.hasNext(); }