commit d17bcc78ddbcab1e64e58af7f52895a727c755ab
author Patrick Hiesel <hiesel@google.com> Tue Feb 14 14:32:23 2023 +0100
committer Patrick Hiesel <hiesel@google.com> Tue Feb 14 13:53:06 2023 +0000
tree 3e07ebc6ac445fb7422a82e79bc8544e0e97ff69
parent 9e4b930bd4a25d91bd9c1ebc2cd76031334e9ce3

Use a Provider for ChangeQueryBuilder and skip passing in CurrentUser

ChangeQueryBuilder will automatically check visibility aganst the current user.

Change-Id: I53449cef3a6e510664d623070f5ae24c69e696ab

src/main/java/com/googlesource/gerrit/plugins/reviewers/ReviewersFilterUtil.java

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);
   }
 }