Skip to content

RYA-501 Change guava Iterators to Collections #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isper3at wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RYA-501 Change guava Iterators to Collections #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...b.rya/src/main/java/org/apache/rya/mongodb/iter/RyaStatementBindingSetCursorIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,7 +39,6 @@
import org.eclipse.rdf4j.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;
Expand Down Expand Up @@ -91,7 +91,7 @@ public Entry<RyaStatement, BindingSet> next() {
}

private boolean currentBindingSetIteratorIsValid() {
return (currentBindingSetIterator != null) && currentBindingSetIterator.hasNext();
return currentBindingSetIterator != null && currentBindingSetIterator.hasNext();
}

private void findNextResult() {
Expand Down Expand Up @@ -130,7 +130,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() {
Expand All @@ -152,7 +152,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;
}

Expand All @@ -166,7 +166,7 @@ private void submitBatchQuery() {
}

private boolean currentBatchQueryResultCursorIsValid() {
return (batchQueryResultsIterator != null) && batchQueryResultsIterator.hasNext();
return batchQueryResultsIterator != null && batchQueryResultsIterator.hasNext();
}


Expand Down