diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java')
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java index 2382809ea5..d3f9186106 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java @@ -14,13 +14,13 @@ package com.google.gerrit.server.config; -import static com.google.gerrit.server.account.ExternalId.SCHEME_MAILTO; -import static com.google.gerrit.server.account.ExternalId.SCHEME_USERNAME; -import static com.google.gerrit.server.account.ExternalId.SCHEME_UUID; +import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_MAILTO; +import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_USERNAME; +import static com.google.gerrit.server.account.externalids.ExternalId.SCHEME_UUID; import com.google.gerrit.extensions.client.AuthType; import com.google.gerrit.extensions.client.GitBasicAuthPolicy; -import com.google.gerrit.server.account.ExternalId; +import com.google.gerrit.server.account.externalids.ExternalId; import com.google.gerrit.server.auth.openid.OpenIdProviderPattern; import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.XsrfException; @@ -67,7 +67,7 @@ public class AuthConfig { private GitBasicAuthPolicy gitBasicAuthPolicy; @Inject - AuthConfig(@GerritServerConfig final Config cfg) throws XsrfException { + AuthConfig(@GerritServerConfig Config cfg) throws XsrfException { authType = toType(cfg); httpHeader = cfg.getString("auth", null, "httpheader"); httpDisplaynameHeader = cfg.getString("auth", null, "httpdisplaynameheader"); @@ -136,7 +136,7 @@ public class AuthConfig { return Collections.unmodifiableList(r); } - private static AuthType toType(final Config cfg) { + private static AuthType toType(Config cfg) { return cfg.getEnum("auth", null, "type", AuthType.OPENID); } |