You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by pu...@apache.org on 2018/10/01 13:28:50 UTC
incubator-rya git commit: RYA-501 Change guava Iterators/Collections;
Closes #302
Repository: incubator-rya
Updated Branches:
refs/heads/3.x/master 22d282b76 -> 83aff37b5
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/83aff37b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/83aff37b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/83aff37b
Branch: refs/heads/3.x/master
Commit: 83aff37b50c0ba505de3104f548638f015b39545
Parents: 22d282b
Author: Andrew Smith <sm...@gmail.com>
Authored: Fri Sep 14 12:37:16 2018 -0400
Committer: Valiyil <Pu...@parsons.com>
Committed: Mon Oct 1 09:28:00 2018 -0400
----------------------------------------------------------------------
.../iter/RyaStatementBindingSetCursorIterator.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/83aff37b/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.bson.Document;
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 class RyaStatementBindingSetCursorIterator implements CloseableIteration<
}
private boolean currentBindingSetIteratorIsValid() {
- return (currentBindingSetIterator != null) && currentBindingSetIterator.hasNext();
+ return currentBindingSetIterator != null && currentBindingSetIterator.hasNext();
}
private void findNextResult() {
@@ -131,7 +131,7 @@ public class RyaStatementBindingSetCursorIterator implements CloseableIteration<
}
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 @@ public class RyaStatementBindingSetCursorIterator implements CloseableIteration<
} 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 @@ public class RyaStatementBindingSetCursorIterator implements CloseableIteration<
}
private boolean currentBatchQueryResultCursorIsValid() {
- return (batchQueryResultsIterator != null) && batchQueryResultsIterator.hasNext();
+ return batchQueryResultsIterator != null && batchQueryResultsIterator.hasNext();
}