Fix some quality flaws

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java
index 5d5e6c89a2c83c87587481db39ca05a02425f1d6..959510133330256219584928f85729a2ca9d59bc 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java
@@ -52,16 +52,19 @@ public final class AlertUtils {
     Comparable criteriaValue = getValueForComparison(alert.getMetric(), valueToEval);
     Comparable measureValue = getMeasureValue(alert, measure);
     if (measureValue != null) {
-      int comparison = measureValue.compareTo(criteriaValue);
-      return !(// NOSONAR complexity of this boolean expression is under control
-          (alert.isNotEqualsOperator() && comparison == 0)
-              || (alert.isGreaterOperator() && comparison != 1)
-              || (alert.isSmallerOperator() && comparison != -1)
-              || (alert.isEqualsOperator() && comparison != 0));
+      return doesReachThresholds(measureValue, criteriaValue, alert);
     }
     return false;
   }
 
+  private static boolean doesReachThresholds(Comparable measureValue, Comparable criteriaValue, Alert alert){
+    int comparison = measureValue.compareTo(criteriaValue);
+    return !((alert.isNotEqualsOperator() && comparison == 0)
+        || (alert.isGreaterOperator() && comparison != 1)
+        || (alert.isSmallerOperator() && comparison != -1)
+        || (alert.isEqualsOperator() && comparison != 0));
+  }
+
   private static String getValueToEval(Alert alert, Metric.Level alertLevel) {
     if (alertLevel.equals(Metric.Level.ERROR)) {
       return alert.getValueError();

diff --git a/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java b/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java
index 4d1c34ace3ac01217386834f70a706e07bceb1bf..5c244bef19d8fa0b7ed65b3606574cf75e223e6d 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java
+++ b/sonar-core/src/main/java/org/sonar/core/timemachine/Periods.java
@@ -100,7 +100,7 @@ public class Periods implements BatchExtension {
     return Locale.ENGLISH;
   }
 
-  private class PeriodParameters {
+  private static class PeriodParameters {
 
     private String mode;
     private String param;