Fix some quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/UserManagedMetrics.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/UserManagedMetrics.java
index 8b1aa5e33f748206ecfae593c2b24f102fa23069..65ab932575a71dea72b1b326eb2ea2e5e62e49cd 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/UserManagedMetrics.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/UserManagedMetrics.java
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableList;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.measures.Metrics;
 
-import java.util.Arrays;
 import java.util.List;
 
 public final class UserManagedMetrics implements Metrics {

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
index 3acaa29481ffb76213f2abb464bf1b5d8a273a8a..88fb6f72379f5dd7f94aac566cca6ee22de2f8c7 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypeTree.java
@@ -67,7 +67,7 @@ public final class ResourceTypeTree implements BatchExtension, ServerExtension {
     return new Builder();
   }
 
-  public static class Builder {
+  public static final class Builder {
     private List<ResourceType> types = Lists.newArrayList();
     private ListMultimap<String, String> relations = ArrayListMultimap.create();
 
@@ -81,11 +81,11 @@ public final class ResourceTypeTree implements BatchExtension, ServerExtension {
       return this;
     }
 
-    public Builder addRelations(String parentQualifier, String... childQualifiers) {
+    public Builder addRelations(String parentQualifier, String... childrenQualifiers) {
       Preconditions.checkNotNull(parentQualifier);
-      Preconditions.checkNotNull(childQualifiers);
-      Preconditions.checkArgument(childQualifiers.length > 0, "childQualifiers can't be empty");
-      relations.putAll(parentQualifier, Arrays.asList(childQualifiers));
+      Preconditions.checkNotNull(childrenQualifiers);
+      Preconditions.checkArgument(childrenQualifiers.length > 0, "childrenQualifiers can't be empty");
+      relations.putAll(parentQualifier, Arrays.asList(childrenQualifiers));
       return this;
     }
 

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTreeTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTreeTest.java
index 486330d7d004235eb715562f8c122650aace1ce8..c8f73ec0596ee02e9b397f980e48e2a612fbd94c 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTreeTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/resources/ResourceTypeTreeTest.java
@@ -61,4 +61,20 @@ public class ResourceTypeTreeTest {
     assertThat(tree.getLeaves(), hasItems("FIL", "UTS"));
   }
 
+  @Test(expected = IllegalArgumentException.class)
+  public void forbidNullRelation() {
+    ResourceTypeTree.builder()
+        .addType(ResourceType.builder("TRK").build())
+        .addType(ResourceType.builder("DIR").build())
+        .addRelations("DIR" /* missing child */)
+        .build();
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void forbidDuplicatedType() {
+    ResourceTypeTree.builder()
+        .addType(ResourceType.builder("TRK").build())
+        .addType(ResourceType.builder("TRK").build())
+        .build();
+  }
 }

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java b/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java
index 4730a8210c3066e4685b62e1d56e23656157a7b2..4afa2b8c776b603d8ffe60174e0e704226c9ee3b 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/ChartFactory.java
@@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory;
 import org.sonar.api.ServerComponent;
 import org.sonar.api.charts.Chart;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public final class ChartFactory implements ServerComponent {

diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
index 5ec0171e4ef06cf8c8bb01844a7112dd2b66e475..a497e03fcd30604c450e9b5b1f6de120d0d91e1d 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
+++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java
@@ -87,8 +87,8 @@ public final class JRubyFacade {
   }
 
   public Collection<String> getResourceChildrenQualifiers(String qualifier) {
-      return getContainer().getComponentByType(ResourceTypes.class).getChildrenQualifiers(qualifier);
-    }
+    return getContainer().getComponentByType(ResourceTypes.class).getChildrenQualifiers(qualifier);
+  }
 
   // UPDATE CENTER ------------------------------------------------------------
 

diff --git a/sonar-testing-harness/src/main/java/org/sonar/test/i18n/BundleSynchronizedMatcher.java b/sonar-testing-harness/src/main/java/org/sonar/test/i18n/BundleSynchronizedMatcher.java
index 93aecf2c1d60b7d31c88aaa7d1d61395185ef83d..7ed8b3384a247bbb7611e6e5c18daf7dfb2606ee 100644 (file)
--- a/sonar-testing-harness/src/main/java/org/sonar/test/i18n/BundleSynchronizedMatcher.java
+++ b/sonar-testing-harness/src/main/java/org/sonar/test/i18n/BundleSynchronizedMatcher.java
@@ -132,7 +132,7 @@ public class BundleSynchronizedMatcher extends BaseMatcher<String> {
       writer = new FileWriter(dumpFile);
       writer.write(details);
     } catch (IOException e) {
-      throw new RuntimeException("Unable to write the report to 'target/l10n/" + bundleName + ".report.txt'");
+      throw new IllegalStateException("Unable to write the report to 'target/l10n/" + bundleName + ".report.txt'", e);
     } finally {
       IOUtils.closeQuietly(writer);
     }