Fix some quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java
index 8171683a356bbaaf05226b349b45a12317653ee9..e521d62738034637fed76a5d17b293500d471673 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/DefaultResourceTypes.java
@@ -29,6 +29,9 @@ import org.sonar.api.resources.ResourceTypeTree;
 
 @InstantiationStrategy(InstantiationStrategy.PER_BATCH)
 public final class DefaultResourceTypes extends ExtensionProvider implements BatchExtension, ServerExtension {
+
+  private static final String SUPPORTS_MEASURE_FILTERS = "supportsMeasureFilters";
+
   @Override
   public ResourceTypeTree provide() {
     return ResourceTypeTree.builder()
@@ -38,30 +41,30 @@ public final class DefaultResourceTypes extends ExtensionProvider implements Bat
             .setProperty("modifiable_history", true)
             .setProperty("hasRolePolicy", true)
             .setProperty("updatable_key", true)
-            .setProperty("supportsMeasureFilters", true)
+            .setProperty(SUPPORTS_MEASURE_FILTERS, true)
             .setProperty("comparable", true)
             .setProperty("configurable", true)
             .build())
         .addType(ResourceType.builder(Qualifiers.MODULE)
             .setProperty("updatable_key", true)
-            .setProperty("supportsMeasureFilters", true)
+            .setProperty(SUPPORTS_MEASURE_FILTERS, true)
             .setProperty("configurable", true)
             .build())
         .addType(ResourceType.builder(Qualifiers.DIRECTORY)
-            .setProperty("supportsMeasureFilters", true)
+            .setProperty(SUPPORTS_MEASURE_FILTERS, true)
             .build())
         .addType(ResourceType.builder(Qualifiers.PACKAGE)
             .build())
         .addType(ResourceType.builder(Qualifiers.FILE)
             .hasSourceCode()
-            .setProperty("supportsMeasureFilters", true)
+            .setProperty(SUPPORTS_MEASURE_FILTERS, true)
             .build())
         .addType(ResourceType.builder(Qualifiers.CLASS)
             .hasSourceCode()
             .build())
         .addType(ResourceType.builder(Qualifiers.UNIT_TEST_FILE)
             .hasSourceCode()
-            .setProperty("supportsMeasureFilters", true)
+            .setProperty(SUPPORTS_MEASURE_FILTERS, true)
             .build())
 
         .addRelations(Qualifiers.PROJECT, Qualifiers.MODULE)

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java
index 58b7ba469c780b4e4a9ffada632e601c3607d2dc..6b8f9f191fb54f37e21defcaa018e46877051177 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageAggregator.java
@@ -52,7 +52,7 @@ public final class NewCoverageAggregator implements Decorator {
 
   public void decorate(Resource resource, DecoratorContext context) {
     if (shouldDecorate(resource)) {
-      int maxPeriods = (Qualifiers.isView(resource, true) ? 3 : 5);
+      int maxPeriods = Qualifiers.isView(resource, true) ? 3 : 5;
       aggregate(context, CoreMetrics.NEW_LINES_TO_COVER, maxPeriods);
       aggregate(context, CoreMetrics.NEW_UNCOVERED_LINES, maxPeriods);
       aggregate(context, CoreMetrics.NEW_CONDITIONS_TO_COVER, maxPeriods);

diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/SuspectLcom4DensityDecorator.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/SuspectLcom4DensityDecorator.java
index 7b0ee4a1949fb34412a0cd59b318d05a5e7e49bc..b722957d1c2a02272047b1023871726f41573daf 100644 (file)
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/SuspectLcom4DensityDecorator.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/batch/SuspectLcom4DensityDecorator.java
@@ -73,7 +73,7 @@ public class SuspectLcom4DensityDecorator implements Decorator {
     }
 
     if (hasLcom4 && totalFiles > 0) {
-      context.saveMeasure(CoreMetrics.SUSPECT_LCOM4_DENSITY, (total / totalFiles));
+      context.saveMeasure(CoreMetrics.SUSPECT_LCOM4_DENSITY, total / totalFiles);
     }
   }
 

diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/Dsm.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/Dsm.java
index 9539a9c96ce67363d72ab915b100e37c254e1d72..1dad1fa06c5b375b214d4ec54b650d4973043a36 100644 (file)
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/Dsm.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/page/client/Dsm.java
@@ -289,7 +289,7 @@ public class Dsm extends Composite {
 
   private Label createNonDiagonalCell(final int row, final int col, int weight) {
     Label cell;
-    cell = buildCell(row, col, weight, (col > row ? GRID_CELL_TOP_RIGHT : GRID_CELL_BOTTOM_LEFT));
+    cell = buildCell(row, col, weight, col > row ? GRID_CELL_TOP_RIGHT : GRID_CELL_BOTTOM_LEFT);
 
     if (weight > 0) {
       String tooltip = data.get(col).getName() + " -> " + data.get(row).getName() + " (" + weight + "). " + Dictionary.getDictionary("l10n").get("design.cellTooltip");

diff --git a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
index f1e532514ea86cd50932b42b764694550c77ffe3..4dea19680710d07fd815b98969acf2453b8f98f2 100644 (file)
--- a/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
+++ b/plugins/sonar-maven-batch-plugin/src/main/java/org/sonar/plugins/maven/DefaultMavenPluginExecutor.java
@@ -57,7 +57,7 @@ public class DefaultMavenPluginExecutor implements MavenPluginExecutor {
       MavenPlugin plugin = MavenPlugin.getPlugin(project.getPom(), handler.getGroupId(), handler.getArtifactId());
       execute(project,
           fs,
-          getGoal(handler.getGroupId(), handler.getArtifactId(), (plugin != null && plugin.getPlugin() != null ? plugin.getPlugin().getVersion() : null), goal));
+          getGoal(handler.getGroupId(), handler.getArtifactId(), plugin != null && plugin.getPlugin() != null ? plugin.getPlugin().getVersion() : null, goal));
     }
     return handler;
   }
@@ -82,7 +82,7 @@ public class DefaultMavenPluginExecutor implements MavenPluginExecutor {
   }
 
   static String getGoal(String groupId, String artifactId, @Nullable String version, String goal) {
-    String defaultVersion = (version == null ? "" : version);
+    String defaultVersion = version == null ? "" : version;
     return new StringBuilder()
         .append(groupId).append(":")
         .append(artifactId).append(":")

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
index 2bd49827409fe55cb7cdec16b63c963d5c7f2775..cb1324f7df6fbc9636622be011b3f774a245fb9d 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/config/PropertyDefinition.java
@@ -497,7 +497,7 @@ public final class PropertyDefinition implements BatchExtension, ServerExtension
       Preconditions.checkArgument(!Strings.isNullOrEmpty(key), "Key must be set");
       fixType(key, type);
       Preconditions.checkArgument(onQualifiers.isEmpty() || onlyOnQualifiers.isEmpty(), "Cannot define both onQualifiers and onlyOnQualifiers");
-      Preconditions.checkArgument((!hidden || (onQualifiers.isEmpty()) && onlyOnQualifiers.isEmpty()), "Cannot be hidden and defining qualifiers on which to display");
+      Preconditions.checkArgument(!hidden || (onQualifiers.isEmpty() && onlyOnQualifiers.isEmpty()), "Cannot be hidden and defining qualifiers on which to display");
       if (hidden) {
         global = false;
       }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
index 9826894fc23c5aa5e348fa5589f6b72542918e31..278050f32dabfaad41e314a2dc3e76c58bf3ec33 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/issue/IssueQuery.java
@@ -164,17 +164,17 @@ public class IssueQuery {
 
   @CheckForNull
   public Date createdAfter() {
-    return (createdAfter == null ? null : new Date(createdAfter.getTime()));
+    return createdAfter == null ? null : new Date(createdAfter.getTime());
   }
 
   @CheckForNull
   public Date createdAt() {
-    return (createdAt == null ? null : new Date(createdAt.getTime()));
+    return createdAt == null ? null : new Date(createdAt.getTime());
   }
 
   @CheckForNull
   public Date createdBefore() {
-    return (createdBefore == null ? null : new Date(createdBefore.getTime()));
+    return createdBefore == null ? null : new Date(createdBefore.getTime());
   }
 
   @CheckForNull
@@ -316,17 +316,17 @@ public class IssueQuery {
     }
 
     public Builder createdAt(@Nullable Date d) {
-      this.createdAt = (d == null ? null : new Date(d.getTime()));
+      this.createdAt = d == null ? null : new Date(d.getTime());
       return this;
     }
 
     public Builder createdAfter(@Nullable Date d) {
-      this.createdAfter = (d == null ? null : new Date(d.getTime()));
+      this.createdAfter = d == null ? null : new Date(d.getTime());
       return this;
     }
 
     public Builder createdBefore(@Nullable Date d) {
-      this.createdBefore = (d == null ? null : new Date(d.getTime()));
+      this.createdBefore = d == null ? null : new Date(d.getTime());
       return this;
     }
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
index 24fd2c8cf5049ea99f470d57a249f03fe4eeaaca..2a5a0c63640894a49cf78ad256d7ecefd406100d 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java
@@ -106,7 +106,7 @@ public final class KeyValueFormat {
 
     @Override
     String format(Integer s) {
-      return (s == null ? "" : String.valueOf(s));
+      return s == null ? "" : String.valueOf(s);
     }
 
     @Override
@@ -127,7 +127,7 @@ public final class KeyValueFormat {
 
     @Override
     String format(RulePriority s) {
-      return (s == null ? "" : s.toString());
+      return s == null ? "" : s.toString();
     }
 
     @Override
@@ -148,7 +148,7 @@ public final class KeyValueFormat {
 
     @Override
     String format(Double d) {
-      return (d == null ? "" : String.valueOf(d));
+      return d == null ? "" : String.valueOf(d);
     }
 
     @Override
@@ -178,7 +178,7 @@ public final class KeyValueFormat {
 
     @Override
     String format(Date d) {
-      return (d == null ? "" : dateFormat.format(d));
+      return d == null ? "" : dateFormat.format(d);
     }
 
     @Override
@@ -220,7 +220,7 @@ public final class KeyValueFormat {
       for (String pair : pairs) {
         String[] keyValue = StringUtils.split(pair, FIELD_SEPARATOR);
         String key = keyValue[0];
-        String value = (keyValue.length == 2 ? keyValue[1] : "");
+        String value = keyValue.length == 2 ? keyValue[1] : "";
         map.put(keyConverter.parse(key), valueConverter.parse(value));
       }
     }
@@ -294,7 +294,7 @@ public final class KeyValueFormat {
       for (String pair : pairs) {
         String[] keyValue = StringUtils.split(pair, FIELD_SEPARATOR);
         String key = keyValue[0];
-        String value = (keyValue.length == 2 ? keyValue[1] : "0");
+        String value = keyValue.length == 2 ? keyValue[1] : "0";
         multiset.add(keyConverter.parse(key), new IntegerConverter().parse(value));
       }
     }

diff --git a/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java b/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
index 78c17bb800e7ccbd332f7c2aa2dd50ab842cf5f1..2e46eecb29a016ac0bcc5338c0c69f097065a04c 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
+++ b/sonar-server/src/main/java/org/sonar/server/util/RubyUtils.java
@@ -142,7 +142,7 @@ public class RubyUtils {
       return ((Integer)o).longValue();
     }
     if (o instanceof Long) {
-      return ((Long) o);
+      return (Long) o;
     }
     if (o instanceof String) {
       if (StringUtils.isBlank((String)o)) {

diff --git a/sonar-squid/src/main/java/org/sonar/squid/api/SourceCode.java b/sonar-squid/src/main/java/org/sonar/squid/api/SourceCode.java
index 6fe42851fa3b81e53a778c3e538064c54b80028a..6aa9b7e14a7d8bae493504d41d8f275df1a23b86 100644 (file)
--- a/sonar-squid/src/main/java/org/sonar/squid/api/SourceCode.java
+++ b/sonar-squid/src/main/java/org/sonar/squid/api/SourceCode.java
@@ -276,7 +276,7 @@ public abstract class SourceCode implements Measurable, Comparable<SourceCode> {
   }
 
   public boolean hasChildren() {
-    return children != null && children.size() != 0;
+    return children != null && !children.isEmpty();
   }
 
   public boolean hasAmongParents(SourceCode expectedParent) {

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AbstractQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AbstractQuery.java
index f6c8e398bdc73806095fd13f6c49b80f9c37d1d0..979e43b51c2c603238146ca71e38a7cc226c76df 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AbstractQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AbstractQuery.java
@@ -75,7 +75,7 @@ public abstract class AbstractQuery<M extends Model> {
    * @since 2.10
    */
   public final AbstractQuery<M> setTimeoutMilliseconds(int i) {
-    this.timeoutMilliseconds = (i < 0 ? 0 : i);
+    this.timeoutMilliseconds = i<0 ? 0 : i;
     return this;
   }
 
@@ -138,7 +138,7 @@ public abstract class AbstractQuery<M extends Model> {
 
   protected static void appendUrlParameter(StringBuilder url, String paramKey, @Nullable Date paramValue, boolean includeTime) {
     if (paramValue != null) {
-      String format = (includeTime ? "yyyy-MM-dd'T'HH:mm:ssZ" : "yyyy-MM-dd");
+      String format = includeTime ? "yyyy-MM-dd'T'HH:mm:ssZ" : "yyyy-MM-dd";
       url.append(paramKey)
         .append('=')
         .append(encode(WSUtils.getINSTANCE().format(paramValue, format)))

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
index 943974d2c3e0254f34d64ecd251c62afb9bb29ea..c1825cfb03b5889fd7b368b60c47657bcc5aa94f 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
@@ -111,7 +111,7 @@ public final class JsonUtils {
         return dateFormat.parse(value);
 
       } catch (ParseException e) {
-        throw new RuntimeException(e);
+        throw new IllegalArgumentException("Fail to parse date property '" + field + "': " + format, e);
       }
     }
     return null;