aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2012-12-19 08:12:03 +0100
committerJulien Lancelot <julien.lancelot@gmail.com>2012-12-19 08:12:03 +0100
commit7e60267ea6b1a11bac6ae7331ec0c609a4468c6a (patch)
tree0e614f8e1846bcbdaaae8c306197d87a6b630209 /plugins
parent8e4f1f764c4da0bf2a48aa76a54c8b3c8b6bf260 (diff)
downloadsonarqube-7e60267ea6b1a11bac6ae7331ec0c609a4468c6a.tar.gz
sonarqube-7e60267ea6b1a11bac6ae7331ec0c609a4468c6a.zip
Fix some quality flaws
Diffstat (limited to 'plugins')
-rw-r--r--plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/AlertUtils.java39
1 files changed, 22 insertions, 17 deletions
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 450d31ac4c5..23d904ebbe0 100644
--- 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
@@ -57,7 +57,7 @@ public final class AlertUtils {
return false;
}
- private static boolean doesReachThresholds(Comparable measureValue, Comparable criteriaValue, Alert alert){
+ private static boolean doesReachThresholds(Comparable measureValue, Comparable criteriaValue, Alert alert) {
int comparison = measureValue.compareTo(criteriaValue);
return !(isNotEquals(comparison, alert)
|| isGreater(comparison, alert)
@@ -65,19 +65,19 @@ public final class AlertUtils {
|| isEquals(comparison, alert));
}
- private static boolean isNotEquals(int comparison, Alert alert){
+ private static boolean isNotEquals(int comparison, Alert alert) {
return alert.isNotEqualsOperator() && comparison == 0;
}
- private static boolean isGreater(int comparison, Alert alert){
+ private static boolean isGreater(int comparison, Alert alert) {
return alert.isGreaterOperator() && comparison != 1;
}
- private static boolean isSmaller(int comparison, Alert alert){
+ private static boolean isSmaller(int comparison, Alert alert) {
return alert.isSmallerOperator() && comparison != -1;
}
- private static boolean isEquals(int comparison, Alert alert){
+ private static boolean isEquals(int comparison, Alert alert) {
return alert.isEqualsOperator() && comparison != 0;
}
@@ -107,7 +107,7 @@ public final class AlertUtils {
throw new NotImplementedException(metric.getType().toString());
}
- private static Comparable<Integer> parseInteger(String value){
+ private static Comparable<Integer> parseInteger(String value) {
return value.contains(".") ? Integer.parseInt(value.substring(0, value.indexOf('.'))) : Integer.parseInt(value);
}
@@ -120,38 +120,43 @@ public final class AlertUtils {
return parseInteger(alert, measure);
}
if (alert.getPeriod() == null) {
- if (isAString(metric)) {
- return measure.getData();
- }
- if (isABoolean(metric)) {
- return measure.getValue().intValue();
- }
+ return getMeasureValueForStringOrBoolean(metric, measure);
}
throw new NotImplementedException(metric.getType().toString());
}
- private static Comparable<Integer> parseInteger(Alert alert, Measure measure){
+ private static Comparable<?> getMeasureValueForStringOrBoolean(Metric metric, Measure measure) {
+ if (isAString(metric)) {
+ return measure.getData();
+ }
+ if (isABoolean(metric)) {
+ return measure.getValue().intValue();
+ }
+ throw new NotImplementedException(metric.getType().toString());
+ }
+
+ private static Comparable<Integer> parseInteger(Alert alert, Measure measure) {
Double value = getValue(alert, measure);
return value != null ? value.intValue() : null;
}
- private static boolean isADouble(Metric metric){
+ 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){
+ private static boolean isAInteger(Metric metric) {
return metric.getType() == Metric.ValueType.INT ||
metric.getType() == Metric.ValueType.MILLISEC;
}
- private static boolean isAString(Metric metric){
+ private static boolean isAString(Metric metric) {
return metric.getType() == Metric.ValueType.STRING ||
metric.getType() == Metric.ValueType.LEVEL;
}
- private static boolean isABoolean(Metric metric){
+ private static boolean isABoolean(Metric metric) {
return metric.getType() == Metric.ValueType.BOOL;
}