Improve implementation for parsing Lizard reports

sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/complexity/LizardMeasure.java

@@ -0,0 +1,44 @@
+/**
+ * backelite-sonar-objective-c-plugin - Enables analysis of Objective-C projects into SonarQube.
+ * Copyright © 2012 OCTO Technology, Backelite (${email})
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.sonar.plugins.objectivec.complexity;
+
+import org.sonar.api.batch.measure.Metric;
+
+import java.io.Serializable;
+
+final class LizardMeasure<T extends Serializable> {
+    private final Metric<T> metric;
+    private final T value;
+
+    private LizardMeasure(Metric<T> metric, T value) {
+        this.metric = metric;
+        this.value = value;
+    }
+
+    static <T extends Serializable> LizardMeasure of(Metric<T> metric, T value) {
+        return new LizardMeasure<>(metric, value);
+    }
+
+    public Metric<T> getMetric() {
+        return metric;
+    }
+
+    public T getValue() {
+        return value;
+    }
+}

sonar-objective-c-plugin/src/main/java/org/sonar/plugins/objectivec/complexity/LizardMeasurePersistor.java

@@ -19,33 +19,33 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sonar.api.batch.SensorContext;
+import org.sonar.api.batch.fs.FilePredicate;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.measures.Measure;
-import org.sonar.api.resources.Project;
-import org.sonar.api.resources.Resource;
+import org.sonar.api.batch.measure.Metric;
+import org.sonar.api.batch.sensor.SensorContext;
 
+import javax.annotation.Nonnull;
 import java.io.File;
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * This class is used to save the measures created by the lizardReportParser in the sonar database
  *
  * @author Andres Gil Herrera
  * @since 28/05/15.
  */
-public class LizardMeasurePersistor {
+final class LizardMeasurePersistor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LizardMeasurePersistor.class);
 
-    private final Project project;
     private final SensorContext sensorContext;
     private final FileSystem fileSystem;
 
-    public LizardMeasurePersistor(final Project project, final SensorContext sensorContext, final FileSystem fileSystem) {
-        this.project = project;
+    LizardMeasurePersistor(@Nonnull final SensorContext sensorContext, @Nonnull final FileSystem fileSystem) {
         this.sensorContext = sensorContext;
         this.fileSystem = fileSystem;
     }
@@ -54,33 +54,38 @@ public LizardMeasurePersistor(final Project project, final SensorContext sensorC
      *
      * @param measures Map containing as key the name of the file and as value a list containing the measures for that file
      */
-    public void saveMeasures(final Map<String, List<Measure>> measures) {
+    <T extends Serializable> void saveMeasures(@Nonnull final Map<String, List<LizardMeasure<T>>> measures) {
+        for (Map.Entry<String, List<LizardMeasure<T>>> entry : measures.entrySet()) {
+            Optional<InputFile> value = buildInputFile(entry.getKey());
+            if (value.isPresent()) {
+                entry.getValue().forEach(measure -> saveMeasure(value.get(), measure));
+                continue;
+            }
 
-        if (measures == null) {
-            return;
+            LOGGER.warn("File not included {}", entry.getKey());
         }
+    }
 
-        for (Map.Entry<String, List<Measure>> entry : measures.entrySet()) {
-            File file = new File(fileSystem.baseDir(), entry.getKey());
-            InputFile inputFile = fileSystem.inputFile(fileSystem.predicates().hasAbsolutePath(file.getAbsolutePath()));
+    @Nonnull
+    private Optional<InputFile> buildInputFile(@Nonnull String relativeFilePath) {
+        File file = new File(fileSystem.baseDir(), relativeFilePath);
+        FilePredicate predicate = fileSystem.predicates().hasAbsolutePath(file.getAbsolutePath());
 
-            if (inputFile == null) {
-                LOGGER.warn("file not included in sonar {}", entry.getKey());
-                continue;
-            }
+        return Optional.ofNullable(fileSystem.inputFile(predicate));
+    }
 
-            Resource resource = sensorContext.getResource(inputFile);
+    private <T extends Serializable> void saveMeasure(@Nonnull InputFile inputFile, @Nonnull LizardMeasure<T> measure) {
+        Metric<T> metric = measure.getMetric();
 
-            if (resource != null) {
-                for (Measure measure : entry.getValue()) {
-                    try {
-                        LOGGER.debug("Save measure {} for file {}", measure.getMetric().getName(), file);
-                        sensorContext.saveMeasure(resource, measure);
-                    } catch (Exception e) {
-                        LOGGER.error(" Exception -> {} -> {}", entry.getKey(), measure.getMetric().getName(), e);
-                    }
-                }
-            }
+        try {
+            LOGGER.debug("Save measure {} for file {}", metric.key(), inputFile.relativePath());
+            sensorContext.<T>newMeasure()
+                    .on(inputFile)
+                    .forMetric(metric)
+                    .withValue(measure.getValue())
+                    .save();
+        } catch (Exception e) {
+            LOGGER.error(" Exception -> {} -> {}", inputFile.relativePath(), metric.key(), e);
         }
     }