commit 6712be22e84986d0879ad6da79c842b273311734
author Dariusz Luksza <dluksza@collab.net> Tue Aug 16 11:55:39 2016 +0200
committer Dariusz Luksza <dluksza@collab.net> Wed Aug 17 09:53:33 2016 +0200
tree 97776f338a9fde95c96d588c6fc79e1a91148efa
parent bb0b4fa0ddbcb4be615bc3c3674f9988b3b36128

Use new find(ReviewDb, String) method from AccountResolver

Since I7231be3e ReviewDb instance must be passed into AccountResolver
methods.

Change-Id: I5ecd1ca5abb82d90029f355c07e3b45cb8d45d8e
Signed-off-by: Dariusz Luksza <dluksza@collab.net>

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
index 54e455a..e4c5771 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
@@ -140,9 +140,9 @@
       }
 
       final Change change = changeData.change();
-      final Runnable task =
-          reviewersFactory.create(change,
-              toAccounts(reviewers, projectName, e.uploader.get().email));
+      final Runnable task = reviewersFactory.create(change,
+          toAccounts(reviewDb, reviewers, projectName,
+              e.uploader.get().email));
 
       workQueue.getDefaultQueue().submit(new Runnable() {
         ReviewDb db = null;
@@ -226,13 +226,13 @@
     return filterPredicate.asMatchable().match(changeData);
   }
 
-  private Set<Account> toAccounts(Set<String> in, Project.NameKey p,
-      String uploaderEMail) {
+  private Set<Account> toAccounts(ReviewDb reviewDb, Set<String> in,
+      Project.NameKey p, String uploaderEMail) {
     Set<Account> reviewers = Sets.newHashSetWithExpectedSize(in.size());
     GroupMembers groupMembers = null;
     for (String r : in) {
       try {
-        Account account = accountResolver.find(r);
+        Account account = accountResolver.find(reviewDb, r);
         if (account != null) {
           reviewers.add(account);
           continue;

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
index e2ef680..b83ea10 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/PutReviewers.java
@@ -22,6 +22,7 @@
 import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.account.AccountResolver;
 import com.google.gerrit.server.git.MetaDataUpdate;
 import com.google.gerrit.server.group.GroupsCollection;
@@ -59,6 +60,7 @@
   private final ProjectCache projectCache;
   private final AccountResolver accountResolver;
   private final Provider<GroupsCollection> groupsCollection;
+  private final Provider<ReviewDb> reviewDbProvider;
 
   @Inject
   PutReviewers(@PluginName String pluginName,
@@ -66,13 +68,15 @@
       Provider<MetaDataUpdate.User> metaDataUpdateFactory,
       ProjectCache projectCache,
       AccountResolver accountResolver,
-      Provider<GroupsCollection> groupsCollection) {
+      Provider<GroupsCollection> groupsCollection,
+      Provider<ReviewDb> reviewDbProvider) {
     this.pluginName = pluginName;
     this.configFactory = configFactory;
     this.metaDataUpdateFactory = metaDataUpdateFactory;
     this.projectCache = projectCache;
     this.accountResolver = accountResolver;
     this.groupsCollection = groupsCollection;
+    this.reviewDbProvider = reviewDbProvider;
   }
 
   @Override
@@ -135,7 +139,7 @@
 
   private void validateReviewer(String reviewer) throws RestApiException {
     try {
-      Account account = accountResolver.find(reviewer);
+      Account account = accountResolver.find(reviewDbProvider.get(), reviewer);
       if (account == null) {
         try {
           groupsCollection.get().parse(reviewer);