Adapats plugin to changes done in core
Change-Id: Ic421ca9a97e6b1574fc1af3590e041263b0a2977
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
index 0866648..8af0a7b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ReviewersByBlame.java
@@ -23,14 +23,15 @@
import com.google.gerrit.reviewdb.client.Patch.ChangeType;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.account.AccountCache;
+import com.google.gerrit.server.account.AccountState;
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.change.ChangeResource;
-import com.google.gerrit.server.change.ChangesCollection;
-import com.google.gerrit.server.change.PostReviewers;
import com.google.gerrit.server.patch.PatchList;
import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchListEntry;
import com.google.gerrit.server.patch.PatchListNotAvailableException;
+import com.google.gerrit.server.restapi.change.ChangesCollection;
+import com.google.gerrit.server.restapi.change.PostReviewers;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -40,6 +41,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Set;
import org.eclipse.jgit.api.BlameCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
@@ -193,10 +195,13 @@
try {
Set<Account.Id> ids = emails.getAccountFor(commit.getAuthorIdent().getEmailAddress());
for (Account.Id id : ids) {
- Account account = accountCache.get(id).getAccount();
- if (account.isActive() && !change.getOwner().equals(account.getId())) {
- Integer count = reviewers.get(account);
- reviewers.put(account, count == null ? 1 : count.intValue() + 1);
+ Optional<Account> accountState = accountCache.get(id).map(AccountState::getAccount);
+ if (accountState.isPresent()) {
+ Account account = accountState.get();
+ if (account.isActive() && !change.getOwner().equals(account.getId())) {
+ Integer count = reviewers.get(account);
+ reviewers.put(account, count == null ? 1 : count.intValue() + 1);
+ }
}
}
} catch (IOException | OrmException e) {