commit c27e04abdef994687c459eb8660e8fdf81bc3ee2
author David Pursehouse <dpursehouse@collab.net> Mon Nov 19 10:23:07 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon Nov 19 10:32:38 2018 +0900
tree 8c43ab872f6df1974d2fc3f466a00c6fccedd370
parent 8a9a09412eba8ce244b4f4c9025bccfb51968f23

Fix guice creation exception caused by incorrect injection of AccountState

AccountState should not be injected. It needs to be instantiated as
needed per account. Instead, inject the AccountCache and use that to
instantiate AccountState.

Bug: Issue 10061
Change-Id: I97ab42707dce6b705cea3389e910756bd63a4029

src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowAccountCommand.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowAccountCommand.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowAccountCommand.java
index bde0611..99c140e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowAccountCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/ShowAccountCommand.java
@@ -23,6 +23,7 @@
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Account.Id;
 import com.google.gerrit.server.IdentifiedUser;
+import com.google.gerrit.server.account.AccountCache;
 import com.google.gerrit.server.account.AccountResolver;
 import com.google.gerrit.server.account.AccountResource;
 import com.google.gerrit.server.account.AccountState;
@@ -39,6 +40,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import org.eclipse.jgit.errors.ConfigInvalidException;
 import org.kohsuke.args4j.Argument;
@@ -67,7 +69,7 @@
   private final IdentifiedUser.GenericFactory userFactory;
   private final Provider<GetSshKeys> getSshKeys;
   private final ExternalIds externalIds;
-  private final AccountState accountState;
+  private final AccountCache accountCache;
 
   @Inject
   ShowAccountCommand(
@@ -76,13 +78,13 @@
       IdentifiedUser.GenericFactory userFactory,
       Provider<GetSshKeys> getSshKeys,
       ExternalIds externalIds,
-      AccountState accountState) {
+      AccountCache accountCache) {
     this.accountResolver = accountResolver;
     this.accountGetGroups = accountGetGroups;
     this.userFactory = userFactory;
     this.getSshKeys = getSshKeys;
     this.externalIds = externalIds;
-    this.accountState = accountState;
+    this.accountCache = accountCache;
   }
 
   @Override
@@ -122,7 +124,10 @@
       stdout.println("Full name:         " + account.getFullName());
       stdout.println("Account Id:        " + id.toString());
       stdout.println("Preferred Email:   " + account.getPreferredEmail());
-      stdout.println("User Name:         " + accountState.getUserName().get());
+      Optional<AccountState> accountState = accountCache.get(id);
+      if (accountState.isPresent()) {
+        stdout.println("User Name:         " + accountState.get().getUserName().get());
+      }
       stdout.println("Active:            " + account.isActive());
       stdout.println("Registered on:     " + account.getRegisteredOn());