From 8fa017822aedda6928f7886a20832c9dc225d11e Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 10 Dec 2012 15:25:31 +0100 Subject: [PATCH] Decreased complexity --- .../org/sonar/plugins/core/sensors/AlertUtils.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 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 5fbd604e235..d56f275ffc4 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 @@ -96,7 +96,7 @@ public final class AlertUtils { return Double.parseDouble(value); } if (isAInteger(metric)) { - return value.contains(".") ? Integer.parseInt(value.substring(0, value.indexOf('.'))) : Integer.parseInt(value); + return parseInteger(value); } if (isAString(metric)) { return value; @@ -107,14 +107,17 @@ public final class AlertUtils { throw new NotImplementedException(metric.getType().toString()); } + private static Comparable parseInteger(String value){ + return value.contains(".") ? Integer.parseInt(value.substring(0, value.indexOf('.'))) : Integer.parseInt(value); + } + private static Comparable getMeasureValue(Alert alert, Measure measure) { Metric metric = alert.getMetric(); if (isADouble(metric)) { return getValue(alert, measure); } if (isAInteger(metric)) { - Double value = getValue(alert, measure); - return value != null ? value.intValue() : null; + parseInteger(alert, measure); } if (alert.getPeriod() == null) { if (isAString(metric)) { @@ -127,6 +130,11 @@ public final class AlertUtils { throw new NotImplementedException(metric.getType().toString()); } + private static Comparable parseInteger(Alert alert, Measure measure){ + Double value = getValue(alert, measure); + return value != null ? value.intValue() : null; + } + private static boolean isADouble(Metric metric){ return metric.getType() == Metric.ValueType.FLOAT || metric.getType() == Metric.ValueType.PERCENT || -- 2.39.5