Fix quality flaws

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
index 69dd9ccebbe95b509f26c3575b89ec11fec1438e..3ce086ad5d7fca5b5e67dd5cd8adda1db4748a13 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/AverageFormula.java
@@ -110,7 +110,7 @@ public class AverageFormula implements Formula {
       }
     }
     if (hasApplicableChildren) {
-      result = new Measure(context.getTargetMetric(), (totalMainMeasure / totalByMeasure));
+      result = new Measure(context.getTargetMetric(), totalMainMeasure / totalByMeasure);
     }
     return result;
   }
@@ -122,7 +122,7 @@ public class AverageFormula implements Formula {
     Double byMeasure = MeasureUtils.getValue(data.getMeasure(byMetric), null);
     Double mainMeasure = MeasureUtils.getValue(data.getMeasure(mainMetric), fallbackMeasure);
     if (mainMeasure != null && byMeasure != null && byMeasure > 0.0) {
-      result = new Measure(context.getTargetMetric(), (mainMeasure / byMeasure));
+      result = new Measure(context.getTargetMetric(), mainMeasure / byMeasure);
     }
 
     return result;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeanAggregationFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeanAggregationFormula.java
index d6cf167b4f8fd9491f601b229f71ee366e3098f3..9d7bf817d8946f082a1851acf27fb5dbd1594075 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeanAggregationFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/MeanAggregationFormula.java
@@ -58,6 +58,6 @@ public class MeanAggregationFormula implements Formula {
     if (!hasValue && !forceZeroIfMissingData) {
       return null;
     }
-    return new Measure(context.getTargetMetric(), (count==0 ? 0.0 : sum/count));
+    return new Measure(context.getTargetMetric(), count==0 ? 0.0 : sum/count);
   }
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/WeightedMeanAggregationFormula.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/WeightedMeanAggregationFormula.java
index ca1e200764096bd8db38abbbacb9fc5e29cab406..3cc202c14c8d00b08c04ba3619da04dd2c17fea9 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/WeightedMeanAggregationFormula.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/WeightedMeanAggregationFormula.java
@@ -51,7 +51,7 @@ public class WeightedMeanAggregationFormula implements Formula {
       Measure measure = child.getMeasure(context.getTargetMetric());
       Measure weightingMeasure = child.getMeasure(weightingMetric);
       if (MeasureUtils.haveValues(measure, weightingMeasure)) {
-        sum += (measure.getValue() * weightingMeasure.getValue());
+        sum += measure.getValue() * weightingMeasure.getValue();
         count += weightingMeasure.getValue();
         hasValue=true;
       }
@@ -61,7 +61,7 @@ public class WeightedMeanAggregationFormula implements Formula {
       return null;
     }
 
-    double result = (count==0.0 ? 0.0 : sum/count);
+    double result = count==0.0 ? 0.0 : sum/count;
     return new Measure(context.getTargetMetric(), result);
   }
 }

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/AbstractLanguage.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/AbstractLanguage.java
index 3b16ffecd9aa803b10e9f9550ecfbd83c40a24e4..c42c4913360079bef7f73f3468d15ca4c25a030f 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/AbstractLanguage.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/AbstractLanguage.java
@@ -90,7 +90,7 @@ public abstract class AbstractLanguage implements Language {
 
   @Override
   public int hashCode() {
-    return (key != null ? key.hashCode() : 0);
+    return key != null ? key.hashCode() : 0;
   }
 
   @Override

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
index ac3494b136bc8ce73361ad6069e1b4cbff18bca7..0e93c6a00b80fcbd68251786ce8b1960c4f1a73e 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Project.java
@@ -175,7 +175,7 @@ public class Project extends Resource implements Component {
   }
 
   public Project getRoot() {
-    return (parent == null ? this : parent.getRoot());
+    return parent==null ? this : parent.getRoot();
   }
 
   /**
@@ -318,7 +318,7 @@ public class Project extends Resource implements Component {
    */
   @Deprecated
   public boolean getReuseExistingRulesConfig() {
-    return (configuration != null && configuration.getBoolean(CoreProperties.REUSE_RULES_CONFIGURATION_PROPERTY, false));
+    return configuration!=null && configuration.getBoolean(CoreProperties.REUSE_RULES_CONFIGURATION_PROPERTY, false);
   }
 
   /**

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/AnnotationUtils.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/AnnotationUtils.java
index d4eb7b5553341bf5e9d845152ee631a7bcbaec06..5ac29fe00e2e531885338557426f74d240963f1d 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/AnnotationUtils.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/AnnotationUtils.java
@@ -40,7 +40,7 @@ public final class AnnotationUtils {
    * @since 3.1
    */
   public static <A extends Annotation> A getAnnotation(Object objectOrClass, Class<A> annotationClass) {
-    Class<?> initialClass = (objectOrClass instanceof Class<?> ? (Class<?>) objectOrClass : objectOrClass.getClass());
+    Class<?> initialClass = objectOrClass instanceof Class<?> ? (Class<?>) objectOrClass : objectOrClass.getClass();
     
     for (Class<?> aClass = initialClass; aClass != null; aClass = aClass.getSuperclass()) {
       A result = aClass.getAnnotation(annotationClass);

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
index 0fc31c4b18a5474704ef224b4a8c63ca64d0329c..e233dadd22735c04a5c889f05b5f638ae0c20af1 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/Paging.java
@@ -64,8 +64,8 @@ public class Paging {
    * Number of pages. It is greater than or equal 0.
    */
   public int pages() {
-    int p = (total / pageSize);
-    if ((total % pageSize) > 0) {
+    int p = total / pageSize;
+    if (total % pageSize > 0) {
       p++;
     }
     return p;

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
index 6cc911555bdac7e78cef8c193baabe09be69e719..0b156cd2c48a85bb0f8aa304896dba98f2821c44 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
@@ -81,9 +81,9 @@ public class TimeProfiler {
   public TimeProfiler stop() {
     if (start > 0) {
       if (debug) {
-        logger.debug("{} done: {} ms", name, (System.currentTimeMillis() - start));
+        logger.debug("{} done: {} ms", name, System.currentTimeMillis() - start);
       } else {
-        logger.info("{} done: {} ms", name, (System.currentTimeMillis() - start));
+        logger.info("{} done: {} ms", name, System.currentTimeMillis() - start);
       }
     }
     start = 0;