Fix Quality flaws

4 files changed, 97 insertions, 107 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Qualifiers.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Qualifiers.java
index b66930059ad..6ccc65d23f8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Qualifiers.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Qualifiers.java
@@ -29,10 +29,6 @@ import org.apache.commons.lang.StringUtils;
  */
 public final class Qualifiers {
 
-  private Qualifiers() {
-    // only static methods
-  }
-
   /**
    * Root views. Scope of views is Scopes.PROJECT
    */
@@ -69,6 +65,10 @@ public final class Qualifiers {
   // ugly, should be replaced by "natures"
   public static final String UNIT_TEST_FILE = "UTS";
 
+  private Qualifiers() {
+    // only static methods
+  }
+
   /**
    * @param resource not nullable
    */
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
index 3a5f16f3230..32768bb68b2 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceType.java
@@ -53,98 +53,6 @@ import java.util.Map;
 @Immutable
 public class ResourceType {
 
-  /**
-   * Builder used to create {@link ResourceType} objects.
-   */
-  public static class Builder {
-    private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
-    private String qualifier;
-    private String iconPath;
-    private boolean hasSourceCode = false;
-    private final Map<String, String> properties = Maps.newHashMap();
-
-    /**
-     * Creates a new {@link Builder}
-     *
-     * @param qualifier
-     */
-    public Builder(String qualifier) {
-      this.qualifier = qualifier;
-    }
-
-    /**
-     * Relative path of the icon used to represent the resource type.
-     *
-     * @param iconPath path to icon, relative to context of web-application (e.g. "/images/q/DIR.png")
-     */
-    public Builder setIconPath(@Nullable String iconPath) {
-      this.iconPath = iconPath;
-      return this;
-    }
-
-    /**
-     * @deprecated since 3.0. Use {@link #setProperty(String, String)} with "supportsMeasureFilters" set to "true".
-     */
-    @Deprecated
-    public Builder availableForFilters() {
-      setProperty(SUPPORTS_MEASURE_FILTERS, "true");
-      return this;
-    }
-
-    /**
-     * Tells that the resources of this type will have source code.
-     */
-    public Builder hasSourceCode() {
-      this.hasSourceCode = true;
-      return this;
-    }
-
-    /**
-     * Sets a property on the resource type. See the description of {@link ResourceType} class for more information.
-     *
-     * @since 3.0
-     */
-    public Builder setProperty(String key, String value) {
-      Preconditions.checkNotNull(key);
-      Preconditions.checkNotNull(value);
-      properties.put(key, value);
-
-      // for backward-compatibility since version 3.4
-      if ("availableForFilters".equals(key)) {
-        properties.put(SUPPORTS_MEASURE_FILTERS, value);
-      }
-      return this;
-    }
-
-    /**
-     * @since 3.2
-     */
-    public Builder setProperty(String key, boolean value) {
-      return setProperty(key, String.valueOf(value));
-    }
-
-    /**
-     * Creates an instance of {@link ResourceType} based on all information given to the builder.
-     */
-    public ResourceType build() {
-      if (Strings.isNullOrEmpty(iconPath)) {
-        iconPath = "/images/q/" + qualifier + ".png";
-      }
-      return new ResourceType(this);
-    }
-  }
-
-  /**
-   * Creates a new {@link Builder}
-   *
-   * @param qualifier
-   */
-  public static Builder builder(String qualifier) {
-    Preconditions.checkNotNull(qualifier);
-    Preconditions.checkArgument(qualifier.length() <= 10, "Qualifier is limited to 10 characters");
-    return new Builder(qualifier);
-  }
-
   private final String qualifier;
   private final String iconPath;
   private final boolean hasSourceCode;
@@ -234,4 +142,92 @@ public class ResourceType {
   public String toString() {
     return qualifier;
   }
+
+  /**
+   * Creates a new {@link Builder}
+   */
+  public static Builder builder(String qualifier) {
+    Preconditions.checkNotNull(qualifier);
+    Preconditions.checkArgument(qualifier.length() <= 10, "Qualifier is limited to 10 characters");
+    return new Builder(qualifier);
+  }
+
+  /**
+   * Builder used to create {@link ResourceType} objects.
+   */
+  public static class Builder {
+    private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
+    private String qualifier;
+    private String iconPath;
+    private boolean hasSourceCode = false;
+    private final Map<String, String> properties = Maps.newHashMap();
+
+    /**
+     * Creates a new {@link Builder}
+     */
+    public Builder(String qualifier) {
+      this.qualifier = qualifier;
+    }
+
+    /**
+     * Relative path of the icon used to represent the resource type.
+     *
+     * @param iconPath path to icon, relative to context of web-application (e.g. "/images/q/DIR.png")
+     */
+    public Builder setIconPath(@Nullable String iconPath) {
+      this.iconPath = iconPath;
+      return this;
+    }
+
+    /**
+     * @deprecated since 3.0. Use {@link #setProperty(String, String)} with "supportsMeasureFilters" set to "true".
+     */
+    @Deprecated
+    public Builder availableForFilters() {
+      setProperty(SUPPORTS_MEASURE_FILTERS, "true");
+      return this;
+    }
+
+    /**
+     * Tells that the resources of this type will have source code.
+     */
+    public Builder hasSourceCode() {
+      this.hasSourceCode = true;
+      return this;
+    }
+
+    /**
+     * Sets a property on the resource type. See the description of {@link ResourceType} class for more information.
+     *
+     * @since 3.0
+     */
+    public Builder setProperty(String key, String value) {
+      Preconditions.checkNotNull(key);
+      Preconditions.checkNotNull(value);
+      properties.put(key, value);
+
+      // for backward-compatibility since version 3.4
+      if ("availableForFilters".equals(key)) {
+        properties.put(SUPPORTS_MEASURE_FILTERS, value);
+      }
+      return this;
+    }
+
+    /**
+     * @since 3.2
+     */
+    public Builder setProperty(String key, boolean value) {
+      return setProperty(key, String.valueOf(value));
+    }
+
+    /**
+     * Creates an instance of {@link ResourceType} based on all information given to the builder.
+     */
+    public ResourceType build() {
+      if (Strings.isNullOrEmpty(iconPath)) {
+        iconPath = "/images/q/" + qualifier + ".png";
+      }
+      return new ResourceType(this);
+    }
+  }
 }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
index 7f9c384c0b7..091823b9593 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/ResourceTypes.java
@@ -20,7 +20,6 @@
 package org.sonar.api.resources;
 
 import com.google.common.annotations.Beta;
-import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -192,12 +191,7 @@ public class ResourceTypes {
   }
 
   public List<ResourceType> getChildren(String qualifier) {
-    return Lists.transform(getChildrenQualifiers(qualifier), new Function<String, ResourceType>() {
-      @Override
-      public ResourceType apply(String s) {
-        return typeByQualifier.get(s);
-      }
-    });
+    return Lists.transform(getChildrenQualifiers(qualifier), typeByQualifier::get);
   }
 
   public List<String> getLeavesQualifiers(String qualifier) {
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Scopes.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Scopes.java
index e97f39607ef..04aee94714b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Scopes.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Scopes.java
@@ -34,10 +34,6 @@ import org.apache.commons.lang.StringUtils;
  */
 public final class Scopes {
 
-  private Scopes() {
-    // only static methods
-  }
-
   /**
    * For example view, subview, project, module or library. Persisted in database.
    */
@@ -71,6 +67,10 @@ public final class Scopes {
 
   public static final String[] SORTED_SCOPES = {PROJECT, DIRECTORY, FILE, PROGRAM_UNIT, BLOCK_UNIT};
 
+  private Scopes() {
+    // only static methods
+  }
+
   public static boolean isProject(final Resource resource) {
     return StringUtils.equals(PROJECT, resource.getScope());
   }