diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java index 9ee6901c03..c7d3f73b68 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java @@ -16,18 +16,17 @@ package com.google.gerrit.server.args4j; import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.account.AuthRequest; -import com.google.gerrit.server.account.ExternalId; +import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import java.io.IOException; +import org.eclipse.jgit.errors.ConfigInvalidException; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.OptionDef; @@ -36,14 +35,12 @@ import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; public class AccountIdHandler extends OptionHandler<Account.Id> { - private final Provider<ReviewDb> db; private final AccountResolver accountResolver; private final AccountManager accountManager; private final AuthType authType; @Inject public AccountIdHandler( - Provider<ReviewDb> db, AccountResolver accountResolver, AccountManager accountManager, AuthConfig authConfig, @@ -51,7 +48,6 @@ public class AccountIdHandler extends OptionHandler<Account.Id> { @Assisted OptionDef option, @Assisted Setter<Account.Id> setter) { super(parser, option, setter); - this.db = db; this.accountResolver = accountResolver; this.accountManager = accountManager; this.authType = authConfig.getAuthType(); @@ -62,7 +58,7 @@ public class AccountIdHandler extends OptionHandler<Account.Id> { String token = params.getParameter(0); Account.Id accountId; try { - Account a = accountResolver.find(db.get(), token); + Account a = accountResolver.find(token); if (a != null) { accountId = a.getId(); } else { @@ -83,8 +79,12 @@ public class AccountIdHandler extends OptionHandler<Account.Id> { throw new CmdLineException(owner, "user \"" + token + "\" not found"); } } - } catch (OrmException | IOException e) { + } catch (OrmException e) { throw new CmdLineException(owner, "database is down"); + } catch (IOException e) { + throw new CmdLineException(owner, "Failed to load account", e); + } catch (ConfigInvalidException e) { + throw new CmdLineException(owner, "Invalid account config", e); } setter.addValue(accountId); return 1; |