Fix typos in CanonicalWebUrls Fixes typos in the `CanonicalWebUrls` class and variable names. Plus use `assertTrue` in the `GitHubOAuthConfigTest`. This is a follow-up change after post submit review comments[1] [1] https://gerrit-review.googlesource.com/c/plugins/github/+/391296/comment/4f6cb71e_eedd6d1b/ Change-Id: I232663ad940a2bc378721a9841e7415764abc6f9
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CannonicalWebUrls.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CanonicalWebUrls.java similarity index 87% rename from github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CannonicalWebUrls.java rename to github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CanonicalWebUrls.java index 321d0ea..faca0f9 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CannonicalWebUrls.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/CanonicalWebUrls.java
@@ -24,19 +24,19 @@ import com.google.inject.Singleton; @Singleton -public class CannonicalWebUrls { +public class CanonicalWebUrls { private final GitHubOAuthConfig oauthConf; - private final HttpCanonicalWebUrlProvider canonnicalWebUrlProvider; + private final HttpCanonicalWebUrlProvider canonicalWebUrlProvider; static String trimTrailingSlash(String url) { return CharMatcher.is('/').trimTrailingFrom(url); } @Inject - CannonicalWebUrls( + CanonicalWebUrls( GitHubOAuthConfig oauthConf, HttpCanonicalWebUrlProvider canonicalWebUrlProvider) { this.oauthConf = oauthConf; - this.canonnicalWebUrlProvider = canonicalWebUrlProvider; + this.canonicalWebUrlProvider = canonicalWebUrlProvider; } public String getScopeSelectionUrl() { @@ -49,6 +49,6 @@ } private String getCannonicalWebUrl() { - return trimTrailingSlash(canonnicalWebUrlProvider.get()); + return trimTrailingSlash(canonicalWebUrlProvider.get()); } }
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java index dafca3f..adfe5e3 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java
@@ -64,7 +64,7 @@ private SortedSet<Scope> loginScopes; private final GitHubOAuthConfig config; - private final CannonicalWebUrls cannonicalWebUrls; + private final CanonicalWebUrls canonicalWebUrls; private final VirtualDomainConfig virtualDomainConfig; private final GitHubConnector gitHubConnector; @@ -85,11 +85,11 @@ @Inject public GitHubLogin( GitHubOAuthConfig config, - CannonicalWebUrls cannonicalWebUrls, + CanonicalWebUrls canonicalWebUrls, VirtualDomainConfig virutalDomainConfig, GitHubHttpConnector httpConnector) { this.config = config; - this.cannonicalWebUrls = cannonicalWebUrls; + this.canonicalWebUrls = canonicalWebUrls; this.virtualDomainConfig = virutalDomainConfig; this.gitHubConnector = GitHubConnectorHttpConnectorAdapter.adapt(httpConnector); } @@ -119,7 +119,7 @@ Set<ScopeKey> configuredScopesProfiles = virtualDomainConfig.getScopes(request).keySet(); String scopeRequested = getScopesKey(request, response); if (Strings.isNullOrEmpty(scopeRequested) && configuredScopesProfiles.size() > 1) { - response.sendRedirect(cannonicalWebUrls.getScopeSelectionUrl()); + response.sendRedirect(canonicalWebUrls.getScopeSelectionUrl()); } else { this.loginScopes = getScopes(request, MoreObjects.firstNonNull(scopeRequested, "scopes"), scopes);
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java index f396a80..16fcb28 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
@@ -13,7 +13,7 @@ // limitations under the License. package com.googlesource.gerrit.plugins.github.oauth; -import static com.googlesource.gerrit.plugins.github.oauth.CannonicalWebUrls.trimTrailingSlash; +import static com.googlesource.gerrit.plugins.github.oauth.CanonicalWebUrls.trimTrailingSlash; import static com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig.KeyConfig.PASSWORD_DEVICE_CONFIG_LABEL; import com.google.common.base.MoreObjects;
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java index 3b8d708..035f1ce 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthProtocol.java
@@ -155,7 +155,7 @@ private static SecureRandom randomState = newRandomGenerator(); private final GitHubOAuthConfig config; - private final CannonicalWebUrls cannonicalWebUrls; + private final CanonicalWebUrls canonicalWebUrls; private final Gson gson; private final Provider<HttpClient> httpProvider; @@ -232,7 +232,7 @@ @Inject public OAuthProtocol( GitHubOAuthConfig config, - CannonicalWebUrls cannonicalWebUrls, + CanonicalWebUrls canonicalWebUrls, PooledHttpClientProvider httpClientProvider, /* * We need to explicitly tell Guice which Provider<> we need as this class @@ -241,7 +241,7 @@ */ GsonProvider gsonProvider) { this.config = config; - this.cannonicalWebUrls = cannonicalWebUrls; + this.canonicalWebUrls = canonicalWebUrls; this.httpProvider = httpClientProvider; this.gson = gsonProvider.get(); } @@ -259,7 +259,7 @@ + "?client_id=" + config.gitHubClientId + getURLEncodedParameter("&scope=", scopesString) - + getURLEncodedParameter("&redirect_uri=", cannonicalWebUrls.getOAuthFinalRedirectUrl()) + + getURLEncodedParameter("&redirect_uri=", canonicalWebUrls.getOAuthFinalRedirectUrl()) + getURLEncodedParameter("&state=", state); }
diff --git a/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java b/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java index 6833e71..7808ff4 100644 --- a/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java +++ b/github-oauth/src/test/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfigTest.java
@@ -22,6 +22,7 @@ import static com.googlesource.gerrit.plugins.github.oauth.GitHubOAuthConfig.KeyConfig.SECRET_KEY_CONFIG_LABEL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import com.google.gerrit.extensions.client.AuthType; import java.util.ArrayList; @@ -185,7 +186,7 @@ Map<String, SortedMap<ScopeKey, List<OAuthProtocol.Scope>>> virtualScopes = githubOAuthConfig().getVirtualScopes(); - assertEquals(virtualScopes.containsKey(vhost), true); + assertTrue(virtualScopes.containsKey(vhost)); SortedMap<ScopeKey, List<OAuthProtocol.Scope>> vhostConfig = virtualScopes.get(vhost); List<Map.Entry<ScopeKey, List<OAuthProtocol.Scope>>> entries =
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java index aab1ef0..b7dc08f 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java
@@ -20,7 +20,7 @@ import com.google.inject.Singleton; import com.google.inject.name.Named; import com.googlesource.gerrit.plugins.github.GitHubConfig; -import com.googlesource.gerrit.plugins.github.oauth.CannonicalWebUrls; +import com.googlesource.gerrit.plugins.github.oauth.CanonicalWebUrls; import com.googlesource.gerrit.plugins.github.oauth.GitHubLogin; import com.googlesource.gerrit.plugins.github.oauth.ScopedProvider; import com.googlesource.gerrit.plugins.github.oauth.VirtualDomainConfig; @@ -52,7 +52,7 @@ private final Provider<CurrentUser> userProvider; private final GitHubConfig config; private final VirtualDomainConfig virtualDomainConfig; - private final CannonicalWebUrls cannonicalWebUrls; + private final CanonicalWebUrls canonicalWebUrls; @Inject public VelocityViewServlet( @@ -62,7 +62,7 @@ Provider<CurrentUser> userProvider, GitHubConfig config, VirtualDomainConfig virutalDomainConfig, - CannonicalWebUrls cannonicalWebUrls) { + CanonicalWebUrls canonicalWebUrls) { this.velocityRuntime = velocityRuntime; this.modelProvider = modelProvider; @@ -70,7 +70,7 @@ this.userProvider = userProvider; this.config = config; this.virtualDomainConfig = virutalDomainConfig; - this.cannonicalWebUrls = cannonicalWebUrls; + this.canonicalWebUrls = canonicalWebUrls; } @Override @@ -104,7 +104,7 @@ GitHubLogin gitHubLogin = loginProvider.get(request); model.put("myself", gitHubLogin.getMyself()); model.put("config", config); - model.put("scopeSelectionUrl", cannonicalWebUrls.getScopeSelectionUrl()); + model.put("scopeSelectionUrl", canonicalWebUrls.getScopeSelectionUrl()); model.put("scopes", virtualDomainConfig.getScopes(request)); CurrentUser user = userProvider.get();