Really fix classes name containing GitHub

SonarSource · Feb 11, 2016 · 3daec15 · 3daec15
1 parent 1337e77
commit 3daec15
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <sonar.pluginClass>org.sonarsource.auth.github.AuthGithubPlugin2</sonar.pluginClass>
+    <sonar.pluginClass>org.sonarsource.auth.github.AuthGitHubPlugin</sonar.pluginClass>
 
     <!-- used for deployment to SonarSource Artifactory -->
     <gitRepositoryName>sonar-auth-github</gitRepositoryName>

diff --git a/...source/auth/github/AuthGithubPlugin2.java → ...rsource/auth/github/AuthGitHubPlugin.java b/...source/auth/github/AuthGithubPlugin2.java → ...rsource/auth/github/AuthGitHubPlugin.java
@@ -23,13 +23,13 @@
 import java.util.List;
 import org.sonar.api.SonarPlugin;
 
-public class AuthGithubPlugin2 extends SonarPlugin {
+public class AuthGitHubPlugin extends SonarPlugin {
   @Override
   public List getExtensions() {
     List extensions = new ArrayList();
-    extensions.add(GithubIdentityProvider2.class);
-    extensions.add(GithubSettings2.class);
-    extensions.addAll(GithubSettings2.definitions());
+    extensions.add(GitHubIdentityProvider.class);
+    extensions.add(GitHubSettings.class);
+    extensions.addAll(GitHubSettings.definitions());
     return extensions;
   }
 }
diff --git a/.../auth/github/GithubIdentityProvider2.java → ...e/auth/github/GitHubIdentityProvider.java b/.../auth/github/GithubIdentityProvider2.java → ...e/auth/github/GitHubIdentityProvider.java
@@ -36,19 +36,19 @@
 import org.sonar.api.utils.log.Loggers;
 
 import static java.lang.String.format;
-import static org.sonarsource.auth.github.GithubSettings2.LOGIN_STRATEGY_PROVIDER_ID;
-import static org.sonarsource.auth.github.GithubSettings2.LOGIN_STRATEGY_UNIQUE;
+import static org.sonarsource.auth.github.GitHubSettings.LOGIN_STRATEGY_PROVIDER_ID;
+import static org.sonarsource.auth.github.GitHubSettings.LOGIN_STRATEGY_UNIQUE;
 
 @ServerSide
-public class GithubIdentityProvider2 implements OAuth2IdentityProvider {
+public class GitHubIdentityProvider implements OAuth2IdentityProvider {
 
-  private static final Logger LOGGER = Loggers.get(GithubIdentityProvider2.class);
+  private static final Logger LOGGER = Loggers.get(GitHubIdentityProvider.class);
 
   private static final Token EMPTY_TOKEN = null;
 
-  private final GithubSettings2 settings;
+  private final GitHubSettings settings;
 
-  public GithubIdentityProvider2(GithubSettings2 settings) {
+  public GitHubIdentityProvider(GitHubSettings settings) {
     this.settings = settings;
   }
 

diff --git a/...arsource/auth/github/GithubSettings2.java → ...narsource/auth/github/GitHubSettings.java b/...arsource/auth/github/GithubSettings2.java → ...narsource/auth/github/GitHubSettings.java
@@ -32,7 +32,7 @@
 import static org.sonar.api.PropertyType.SINGLE_SELECT_LIST;
 
 @ServerSide
-public class GithubSettings2 {
+public class GitHubSettings {
 
   public static final String CLIENT_ID = "sonar.auth.github.clientId";
   public static final String CLIENT_SECRET = "sonar.auth.github.clientSecret";
@@ -49,7 +49,7 @@ public class GithubSettings2 {
 
   private final Settings settings;
 
-  public GithubSettings2(Settings settings) {
+  public GitHubSettings(Settings settings) {
     this.settings = settings;
   }
 

diff --git a/src/test/java/org/sonarsource/auth/github/GithubSettingsTest.java b/src/test/java/org/sonarsource/auth/github/GithubSettingsTest.java
@@ -23,14 +23,14 @@
 import org.sonar.api.config.Settings;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.sonarsource.auth.github.GithubSettings2.LOGIN_STRATEGY_DEFAULT_VALUE;
-import static org.sonarsource.auth.github.GithubSettings2.LOGIN_STRATEGY_PROVIDER_ID;
+import static org.sonarsource.auth.github.GitHubSettings.LOGIN_STRATEGY_DEFAULT_VALUE;
+import static org.sonarsource.auth.github.GitHubSettings.LOGIN_STRATEGY_PROVIDER_ID;
 
 public class GithubSettingsTest {
 
   Settings settings = new Settings();
 
-  GithubSettings2 underTest = new GithubSettings2(settings);
+  GitHubSettings underTest = new GitHubSettings(settings);
 
   @Test
   public void is_enabled() throws Exception {
@@ -87,6 +87,6 @@ public void allow_users_to_sign_up() throws Exception {
 
   @Test
   public void definitions() throws Exception {
-    assertThat(GithubSettings2.definitions()).hasSize(5);
+    assertThat(GitHubSettings.definitions()).hasSize(5);
   }
 }