Decreased complexity

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 959510133330256219584928f85729a2ca9d59bc..5fbd604e235ac1dd261db6695409087f7ab8358c 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
@@ -59,10 +59,26 @@ public final class AlertUtils {
 
   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));
+    return !(isNotEquals(comparison, alert)
+        || isGreater(comparison, alert)
+        || isSmaller(comparison, alert)
+        || isEquals(comparison, alert));
+  }
+
+  private static boolean isNotEquals(int comparison, Alert alert){
+    return alert.isNotEqualsOperator() && comparison == 0;
+  }
+
+  private static boolean isGreater(int comparison, Alert alert){
+    return alert.isGreaterOperator() && comparison != 1;
+  }
+
+  private static boolean isSmaller(int comparison, Alert alert){
+    return alert.isSmallerOperator() && comparison != -1;
+  }
+
+  private static boolean isEquals(int comparison, Alert alert){
+    return alert.isEqualsOperator() && comparison != 0;
   }
 
   private static String getValueToEval(Alert alert, Metric.Level alertLevel) {
@@ -76,21 +92,16 @@ public final class AlertUtils {
   }
 
   private static Comparable<?> getValueForComparison(Metric metric, String value) {
-    if (metric.getType() == Metric.ValueType.FLOAT ||
-        metric.getType() == Metric.ValueType.PERCENT ||
-        metric.getType() == Metric.ValueType.RATING
-        ) {
+    if (isADouble(metric)) {
       return Double.parseDouble(value);
     }
-    if (metric.getType() == Metric.ValueType.INT ||
-        metric.getType() == Metric.ValueType.MILLISEC) {
+    if (isAInteger(metric)) {
       return value.contains(".") ? Integer.parseInt(value.substring(0, value.indexOf('.'))) : Integer.parseInt(value);
     }
-    if (metric.getType() == Metric.ValueType.STRING ||
-        metric.getType() == Metric.ValueType.LEVEL) {
+    if (isAString(metric)) {
       return value;
     }
-    if (metric.getType() == Metric.ValueType.BOOL) {
+    if (isABoolean(metric)) {
       return Integer.parseInt(value);
     }
     throw new NotImplementedException(metric.getType().toString());
@@ -98,28 +109,44 @@ public final class AlertUtils {
 
   private static Comparable<?> getMeasureValue(Alert alert, Measure measure) {
     Metric metric = alert.getMetric();
-    if (metric.getType() == Metric.ValueType.FLOAT ||
-        metric.getType() == Metric.ValueType.PERCENT ||
-        metric.getType() == Metric.ValueType.RATING) {
+    if (isADouble(metric)) {
       return getValue(alert, measure);
     }
-    if (metric.getType() == Metric.ValueType.INT ||
-        metric.getType() == Metric.ValueType.MILLISEC) {
+    if (isAInteger(metric)) {
       Double value = getValue(alert, measure);
       return value != null ? value.intValue() : null;
     }
     if (alert.getPeriod() == null) {
-      if (metric.getType() == Metric.ValueType.STRING ||
-          metric.getType() == Metric.ValueType.LEVEL) {
+      if (isAString(metric)) {
         return measure.getData();
       }
-      if (metric.getType() == Metric.ValueType.BOOL) {
+      if (isABoolean(metric)) {
         return measure.getValue().intValue();
       }
     }
     throw new NotImplementedException(metric.getType().toString());
   }
 
+  private static boolean isADouble(Metric metric){
+    return metric.getType() == Metric.ValueType.FLOAT ||
+        metric.getType() == Metric.ValueType.PERCENT ||
+        metric.getType() == Metric.ValueType.RATING;
+  }
+
+  private static boolean isAInteger(Metric metric){
+    return metric.getType() == Metric.ValueType.INT ||
+        metric.getType() == Metric.ValueType.MILLISEC;
+  }
+
+  private static boolean isAString(Metric metric){
+    return metric.getType() == Metric.ValueType.STRING ||
+        metric.getType() == Metric.ValueType.LEVEL;
+  }
+
+  private static boolean isABoolean(Metric metric){
+    return metric.getType() == Metric.ValueType.BOOL;
+  }
+
   private static Double getValue(Alert alert, Measure measure) {
     if (alert.getPeriod() == null) {
       return measure.getValue();

diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AlertUtilsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AlertUtilsTest.java
index dfc6eafd2b09b3e7f6133bb1fb990f5041650199..97dc4089cd85b30e31401cba260de7608f5d3195 100644 (file)
--- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AlertUtilsTest.java
+++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/AlertUtilsTest.java
@@ -35,11 +35,11 @@ public class AlertUtilsTest {
 
   @Before
   public void setup() {
-    metric = new Metric("test-metric");
+    metric = new Metric.Builder("test-metric", "name", Metric.ValueType.FLOAT).create();
     measure = new Measure();
     measure.setMetric(metric);
 
-    metric2 = new Metric("test-metric2");
+    metric2 = new Metric.Builder("test-metric2", "name2", Metric.ValueType.FLOAT).create();
     measure2 = new Measure();
     measure2.setMetric(metric2);