fix quality flaws

2 files changed, 33 insertions, 19 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchReportMeasureUtils.java b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchReportMeasureUtils.java
index 3e35b9970aa..54b224a9651 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchReportMeasureUtils.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchReportMeasureUtils.java
@@ -53,11 +53,11 @@ public class BatchReportMeasureUtils {
    * check that measure has a value (numerical or string) and a metric key
    */
   public static void checkMeasure(BatchReport.Measure measure) {
-    if (!measure.hasValueType() || !measure.hasMetricKey()) {
+    if (!hasValueTypeAndMetricKey(measure)) {
       throw newIllegalStateException(measure);
     }
 
-    boolean hasValueOrData = false;
+    boolean hasValueOrData;
     switch (measure.getValueType()) {
       case DOUBLE:
         hasValueOrData = measure.hasDoubleValue();
@@ -74,6 +74,8 @@ public class BatchReportMeasureUtils {
       case BOOLEAN:
         hasValueOrData = measure.hasBooleanValue();
         break;
+      default:
+        throw newIllegalStateException(measure);
     }
 
     if (!hasValueOrData) {
@@ -81,6 +83,10 @@ public class BatchReportMeasureUtils {
     }
   }
 
+  private static boolean hasValueTypeAndMetricKey(BatchReport.Measure measure) {
+    return measure.hasValueType() && measure.hasMetricKey();
+  }
+
   private static IllegalStateException newIllegalStateException(BatchReport.Measure measure) {
     return new IllegalStateException(String.format("Measure %s does not have value", measure));
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
index 68d8ea11706..4991bab9b7c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
@@ -97,24 +97,32 @@ public class PersistMeasuresStep implements ComputationStep {
   MeasureDto toMeasureDto(BatchReport.Measure in, BatchReport.Component component) {
     checkMeasure(in);
 
-    MeasureDto out = new MeasureDto()
-      .setTendency(in.hasTendency() ? in.getTendency() : null)
-      .setVariation(1, in.hasVariationValue1() ? in.getVariationValue1() : null)
-      .setVariation(2, in.hasVariationValue2() ? in.getVariationValue2() : null)
-      .setVariation(3, in.hasVariationValue3() ? in.getVariationValue3() : null)
-      .setVariation(4, in.hasVariationValue4() ? in.getVariationValue4() : null)
-      .setVariation(5, in.hasVariationValue5() ? in.getVariationValue5() : null)
-      .setAlertStatus(in.hasAlertStatus() ? in.getAlertStatus() : null)
-      .setAlertText(in.hasAlertText() ? in.getAlertText() : null)
-      .setDescription(in.hasDescription() ? in.getDescription() : null)
-      .setSeverity(in.hasSeverity() ? in.getSeverity().name() : null)
-      .setComponentId(component.getId())
-      .setSnapshotId(component.getSnapshotId())
-      .setMetricId(metricCache.get(in.getMetricKey()).getId())
-      .setRuleId(ruleCache.get(RuleKey.parse(in.getRuleKey())).getId())
-      .setCharacteristicId(in.hasCharactericId() ? in.getCharactericId() : null);
+    MeasureDto out = new MeasureDto();
+    out.setTendency(in.hasTendency() ? in.getTendency() : null);
+    out.setVariation(1, in.hasVariationValue1() ? in.getVariationValue1() : null);
+    out.setVariation(2, in.hasVariationValue2() ? in.getVariationValue2() : null);
+    out.setVariation(3, in.hasVariationValue3() ? in.getVariationValue3() : null);
+    out.setVariation(4, in.hasVariationValue4() ? in.getVariationValue4() : null);
+    out.setVariation(5, in.hasVariationValue5() ? in.getVariationValue5() : null);
+    out.setAlertStatus(in.hasAlertStatus() ? in.getAlertStatus() : null);
+    out.setAlertText(in.hasAlertText() ? in.getAlertText() : null);
+    out.setDescription(in.hasDescription() ? in.getDescription() : null);
+    out.setSeverity(in.hasSeverity() ? in.getSeverity().name() : null);
+    out.setComponentId(component.getId());
+    out.setSnapshotId(component.getSnapshotId());
+    out.setMetricId(metricCache.get(in.getMetricKey()).getId());
+    out.setRuleId(ruleCache.get(RuleKey.parse(in.getRuleKey())).getId());
+    out.setCharacteristicId(in.hasCharactericId() ? in.getCharactericId() : null);
     out.setValue(valueAsDouble(in));
-    out.setData(in.hasStringValue() ? in.getStringValue() : null);
+    setData(in, out);
+    return out;
+  }
+
+  private MeasureDto setData(BatchReport.Measure in, MeasureDto out) {
+    if (in.hasStringValue()) {
+      out.setData(in.getStringValue());
+    }
+
     return out;
   }
 }