Use a Provider for ChangeQueryBuilder and skip passing in CurrentUser ChangeQueryBuilder will automatically check visibility aganst the current user. Change-Id: I53449cef3a6e510664d623070f5ae24c69e696ab
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersFilterUtil.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersFilterUtil.java index 4871e1e..ae68949 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersFilterUtil.java +++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersFilterUtil.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Sets; import com.google.gerrit.exceptions.StorageException; import com.google.gerrit.index.query.QueryParseException; -import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.inject.Inject; @@ -29,13 +28,11 @@ import java.util.Set; public class ReviewersFilterUtil { - private final ChangeQueryBuilder queryBuilder; - private final Provider<CurrentUser> user; + private final Provider<ChangeQueryBuilder> queryBuilder; @Inject - public ReviewersFilterUtil(ChangeQueryBuilder queryBuilder, Provider<CurrentUser> user) { + public ReviewersFilterUtil(Provider<ChangeQueryBuilder> queryBuilder) { this.queryBuilder = queryBuilder; - this.user = user; } public Set<String> findReviewers(ChangeData cd, List<ReviewerFilter> filters) @@ -73,6 +70,6 @@ boolean filterMatch(ChangeData cd, String filter) throws StorageException, QueryParseException { Preconditions.checkNotNull(filter); - return queryBuilder.asUser(user.get()).parse(filter).asMatchable().match(cd); + return queryBuilder.get().parse(filter).asMatchable().match(cd); } }