commit 83aff37b50c0ba505de3104f548638f015b39545
author Andrew Smith <smith3at@gmail.com> Fri Sep 14 12:37:16 2018 -0400
committer Valiyil <Puja.Valiyil@parsons.com> Mon Oct 01 09:28:00 2018 -0400
tree 128c35eb218db502d83b5e9258916c371ec39900
parent 22d282b7660f3fdd69352c1c8ba4a0b0d156fa78

RYA-501 Change guava Iterators/Collections; Closes #302

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.

dao/mongodb.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java

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 727538b..d66d1b6 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 @@
     }
 
     private boolean currentBindingSetIteratorIsValid() {
-        return (currentBindingSetIterator != null) && currentBindingSetIterator.hasNext();
+        return currentBindingSetIterator != null && currentBindingSetIterator.hasNext();
     }
 
     private void findNextResult() {
@@ -131,7 +131,7 @@
     }
 
     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 @@
         } 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 boolean currentBatchQueryResultCursorIsValid() {
-        return (batchQueryResultsIterator != null) && batchQueryResultsIterator.hasNext();
+        return batchQueryResultsIterator != null && batchQueryResultsIterator.hasNext();
     }