Fix some quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
index 19d1dd93207f91526691672e9668ab3ceba8427b..8f54748066f7c78ff07fd72ad10b005af1577a74 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/VariationDecorator.java
@@ -95,10 +95,10 @@ public class VariationDecorator implements Decorator {
 
   private void computeVariation(Resource resource, DecoratorContext context, PastSnapshot pastSnapshot) {
     List<Object[]> pastMeasures = pastMeasuresLoader.getPastMeasures(resource, pastSnapshot);
-    compareWithPastMeasures(resource, context, pastSnapshot.getIndex(), pastMeasures);
+    compareWithPastMeasures(context, pastSnapshot.getIndex(), pastMeasures);
   }
 
-  void compareWithPastMeasures(Resource resource, DecoratorContext context, int index, List<Object[]> pastMeasures) {
+  private void compareWithPastMeasures(DecoratorContext context, int index, List<Object[]> pastMeasures) {
     Map<MeasureKey, Object[]> pastMeasuresByKey = Maps.newHashMap();
     for (Object[] pastMeasure : pastMeasures) {
       pastMeasuresByKey.put(new MeasureKey(pastMeasure), pastMeasure);

diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
index be3185f7b6d6922a9b15b891d4fad19d53fbff29..cc0d2577e82becc5a77f56aa5c004be91b6e7f9e 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
@@ -89,7 +89,7 @@ public class BatchMediumTester {
   public static class BatchMediumTesterBuilder {
     private final FakeGlobalReferentialsLoader globalRefProvider = new FakeGlobalReferentialsLoader();
     private final FakeProjectReferentialsLoader projectRefProvider = new FakeProjectReferentialsLoader();
-    private final FackPluginsReferential pluginsReferential = new FackPluginsReferential();
+    private final FakePluginsReferential pluginsReferential = new FakePluginsReferential();
     private final Map<String, String> bootstrapProperties = new HashMap<String, String>();
 
     public BatchMediumTester build() {
@@ -378,7 +378,7 @@ public class BatchMediumTester {
     }
   }
 
-  private static class FackPluginsReferential implements PluginsReferential {
+  private static class FakePluginsReferential implements PluginsReferential {
 
     private List<RemotePlugin> pluginList = new ArrayList<RemotePlugin>();
     private Map<RemotePlugin, File> pluginFiles = new HashMap<RemotePlugin, File>();
@@ -394,15 +394,15 @@ public class BatchMediumTester {
       return pluginFiles.get(remote);
     }
 
-    public FackPluginsReferential addPlugin(String pluginKey, File location) {
+    public FakePluginsReferential addPlugin(String pluginKey, File location) {
       RemotePlugin plugin = new RemotePlugin(pluginKey, false);
       pluginList.add(plugin);
       pluginFiles.put(plugin, location);
       return this;
     }
 
-    public FackPluginsReferential addPlugin(String pluginKey, SonarPlugin pluginInstance) {
-      localPlugins.put(DefaultPluginMetadata.create(null).setKey(pluginKey), pluginInstance);
+    public FakePluginsReferential addPlugin(String pluginKey, SonarPlugin pluginInstance) {
+      localPlugins.put(DefaultPluginMetadata.create(pluginKey), pluginInstance);
       return this;
     }
 

diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
index 55239eb3410525b0539b8d60e02f20f9e786630d..8a4a103cd5a6e6afa6070130998d944713c87f27 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/DefaultPluginMetadata.java
@@ -63,6 +63,10 @@ public class DefaultPluginMetadata implements PluginMetadata, Comparable<PluginM
     return new DefaultPluginMetadata().setFile(file);
   }
 
+  public static DefaultPluginMetadata create(String key) {
+    return new DefaultPluginMetadata().setKey(key);
+  }
+
   public File getFile() {
     return file;
   }

diff --git a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
index 509035926161beed63a5ac7e1bf6e779baa82dc7..3bc254a3ff187f55be7eeccf11e079424a4f87c4 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
+++ b/sonar-core/src/main/java/org/sonar/core/plugins/RemotePlugin.java
@@ -45,7 +45,7 @@ public class RemotePlugin {
     RemotePlugin result = new RemotePlugin(fields[0], Boolean.parseBoolean(fields[1]));
     if (fields.length > 2) {
       String[] nameAndHash = StringUtils.split(fields[2], "|");
-      result.setFile(nameAndHash[0], nameAndHash.length > 1 ? nameAndHash[1] : null);
+      result.setFile(nameAndHash[0], nameAndHash[1]);
     }
     return result;
   }
@@ -72,7 +72,7 @@ public class RemotePlugin {
   }
 
   public RemotePlugin setFile(File f) {
-    return this.setFile(f.getName(), f.exists() ? new FileHashes().of(f) : null);
+    return this.setFile(f.getName(), new FileHashes().of(f));
   }
 
   public RemotePluginFile file() {

diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
index f7d7dea4e590c8028f4b6ef98abf1419b392ab63..d3f819392b56726a3892dcbbd8d320915da3cedf 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/DefaultPluginMetadataTest.java
@@ -36,19 +36,19 @@ public class DefaultPluginMetadataTest {
   public void testGettersAndSetters() {
     DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"));
     metadata.setKey("checkstyle")
-        .setParent("java")
-        .setLicense("LGPL")
-        .setDescription("description")
-        .setHomepage("http://home")
-        .setIssueTrackerUrl("http://jira.codehuas.org")
-        .setMainClass("org.Main")
-        .setOrganization("SonarSource")
-        .setOrganizationUrl("http://sonarsource.org")
-        .setVersion("1.1")
-        .setSonarVersion("3.0")
-        .setUseChildFirstClassLoader(true)
-        .setCore(false)
-        .setImplementationBuild("abcdef");
+      .setParent("java")
+      .setLicense("LGPL")
+      .setDescription("description")
+      .setHomepage("http://home")
+      .setIssueTrackerUrl("http://jira.codehuas.org")
+      .setMainClass("org.Main")
+      .setOrganization("SonarSource")
+      .setOrganizationUrl("http://sonarsource.org")
+      .setVersion("1.1")
+      .setSonarVersion("3.0")
+      .setUseChildFirstClassLoader(true)
+      .setCore(false)
+      .setImplementationBuild("abcdef");
 
     assertThat(metadata.getKey()).isEqualTo("checkstyle");
     assertThat(metadata.getParent()).isEqualTo("java");
@@ -72,8 +72,8 @@ public class DefaultPluginMetadataTest {
   @Test
   public void testDeployedFiles() {
     DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"))
-        .addDeployedFile(new File("foo.jar"))
-        .addDeployedFile(new File("bar.jar"));
+      .addDeployedFile(new File("foo.jar"))
+      .addDeployedFile(new File("bar.jar"));
 
     assertThat(metadata.getDeployedFiles()).hasSize(2);
   }
@@ -81,7 +81,7 @@ public class DefaultPluginMetadataTest {
   @Test
   public void testInternalPathToDependencies() {
     DefaultPluginMetadata metadata = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"))
-        .setPathsToInternalDeps(newArrayList("META-INF/lib/commons-lang.jar", "META-INF/lib/commons-io.jar"));
+      .setPathsToInternalDeps(newArrayList("META-INF/lib/commons-lang.jar", "META-INF/lib/commons-io.jar"));
 
     assertThat(metadata.getPathsToInternalDeps()).containsOnly("META-INF/lib/commons-lang.jar", "META-INF/lib/commons-io.jar");
   }
@@ -99,11 +99,11 @@ public class DefaultPluginMetadataTest {
   @Test
   public void shouldCompare() {
     DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create(new File("sonar-checkstyle-plugin.jar"))
-        .setKey("checkstyle")
-        .setName("Checkstyle");
+      .setKey("checkstyle")
+      .setName("Checkstyle");
     DefaultPluginMetadata pmd = DefaultPluginMetadata.create(new File("sonar-pmd-plugin.jar"))
-        .setKey("pmd")
-        .setName("PMD");
+      .setKey("pmd")
+      .setName("PMD");
     List<DefaultPluginMetadata> plugins = Arrays.asList(pmd, checkstyle);
 
     assertThat(natural().sortedCopy(plugins)).onProperty("key").containsExactly("checkstyle", "pmd");
@@ -141,6 +141,6 @@ public class DefaultPluginMetadataTest {
   }
 
   static DefaultPluginMetadata pluginWithVersion(String version) {
-    return DefaultPluginMetadata.create(null).setSonarVersion(version);
+    return DefaultPluginMetadata.create("foo").setSonarVersion(version);
   }
 }

diff --git a/sonar-core/src/test/java/org/sonar/core/plugins/PluginClassloadersTest.java b/sonar-core/src/test/java/org/sonar/core/plugins/PluginClassloadersTest.java
index 95bb9da245cac5dfc0996aca4c89f82b6f24d7b8..120680b19985e2dafb55c3d9492f15806301860a 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/plugins/PluginClassloadersTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/plugins/PluginClassloadersTest.java
@@ -62,8 +62,8 @@ public class PluginClassloadersTest {
 
   @Test
   public void shouldImport() throws Exception {
-    classloaders.add(DefaultPluginMetadata.create(null).setKey("foo").addDeployedFile(getFile("PluginClassloadersTest/foo.jar")));
-    classloaders.add(DefaultPluginMetadata.create(null).setKey("bar").addDeployedFile(getFile("PluginClassloadersTest/bar.jar")));
+    classloaders.add(DefaultPluginMetadata.create("foo").addDeployedFile(getFile("PluginClassloadersTest/foo.jar")));
+    classloaders.add(DefaultPluginMetadata.create("bar").addDeployedFile(getFile("PluginClassloadersTest/bar.jar")));
     classloaders.done();
 
     String resourceName = "org/sonar/plugins/bar/api/resource.txt";
@@ -74,8 +74,7 @@ public class PluginClassloadersTest {
   @Test
   public void shouldCreateBaseClassloader() {
     classloaders = new PluginClassloaders(getClass().getClassLoader());
-    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create(null)
-      .setKey("checkstyle")
+    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create("checkstyle")
       .setMainClass("org.sonar.plugins.checkstyle.CheckstylePlugin")
       .addDeployedFile(getFile("sonar-checkstyle-plugin-2.8.jar"));
 
@@ -90,13 +89,11 @@ public class PluginClassloadersTest {
   public void shouldExtendPlugin() {
     classloaders = new PluginClassloaders(getClass().getClassLoader());
 
-    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create(null)
-      .setKey("checkstyle")
+    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create("checkstyle")
       .setMainClass("org.sonar.plugins.checkstyle.CheckstylePlugin")
       .addDeployedFile(getFile("sonar-checkstyle-plugin-2.8.jar"));
 
-    DefaultPluginMetadata checkstyleExt = DefaultPluginMetadata.create(null)
-      .setKey("checkstyle-ext")
+    DefaultPluginMetadata checkstyleExt = DefaultPluginMetadata.create("checkstyle-ext")
       .setBasePlugin("checkstyle")
       .setMainClass("com.mycompany.sonar.checkstyle.CheckstyleExtensionsPlugin")
       .addDeployedFile(getFile("sonar-checkstyle-extensions-plugin-0.1-SNAPSHOT.jar"));
@@ -119,8 +116,7 @@ public class PluginClassloadersTest {
 
     classloaders = new PluginClassloaders(getClass().getClassLoader(), world);
 
-    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create(null)
-      .setKey("checkstyle")
+    DefaultPluginMetadata checkstyle = DefaultPluginMetadata.create("checkstyle")
       .setMainClass("org.sonar.plugins.checkstyle.CheckstylePlugin")
       .addDeployedFile(getFile("sonar-checkstyle-plugin-2.8.jar"));