SONAR-11795 Drop persistit and move coverage measures computation to CE side

1 files changed, 1 insertions, 30 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java
index 7ef71bbb221..eecbbd15e84 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/DefaultFileLinesContext.java
@@ -32,15 +32,12 @@ import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.FileLinesContext;
 import org.sonar.api.utils.KeyValueFormat;
-import org.sonar.api.utils.KeyValueFormat.Converter;
-import org.sonar.scanner.scan.measure.MeasureCache;
 
 import static java.util.stream.Collectors.toMap;
 
 public class DefaultFileLinesContext implements FileLinesContext {
   private final InputFile inputFile;
   private final MetricFinder metricFinder;
-  private final MeasureCache measureCache;
 
   /**
    * metric key -> line -> value
@@ -48,11 +45,10 @@ public class DefaultFileLinesContext implements FileLinesContext {
   private final Map<String, Map<Integer, Object>> map = new HashMap<>();
   private final SensorStorage sensorStorage;
 
-  public DefaultFileLinesContext(SensorStorage sensorStorage, InputFile inputFile, MetricFinder metricFinder, MeasureCache measureCache) {
+  public DefaultFileLinesContext(SensorStorage sensorStorage, InputFile inputFile, MetricFinder metricFinder) {
     this.sensorStorage = sensorStorage;
     this.inputFile = inputFile;
     this.metricFinder = metricFinder;
-    this.measureCache = measureCache;
   }
 
   @Override
@@ -68,13 +64,6 @@ public class DefaultFileLinesContext implements FileLinesContext {
     Preconditions.checkArgument(line <= inputFile.lines(), "Line %s is out of range for file %s. File has %s lines.", line, inputFile, inputFile.lines());
   }
 
-  public Integer getIntValue(String metricKey, int line) {
-    Preconditions.checkNotNull(metricKey);
-    checkLineRange(line);
-    Map<Integer, Object> lines = map.computeIfAbsent(metricKey, k -> loadData(k, KeyValueFormat.newIntegerConverter()));
-    return (Integer) lines.get(line);
-  }
-
   @Override
   public void setStringValue(String metricKey, int line, String value) {
     Preconditions.checkNotNull(metricKey);
@@ -84,13 +73,6 @@ public class DefaultFileLinesContext implements FileLinesContext {
     setValue(metricKey, line, value);
   }
 
-  public String getStringValue(String metricKey, int line) {
-    Preconditions.checkNotNull(metricKey);
-    checkLineRange(line);
-    Map<Integer, Object> lines = map.computeIfAbsent(metricKey, k -> loadData(k, KeyValueFormat.newStringConverter()));
-    return (String) lines.get(line);
-  }
-
   private void setValue(String metricKey, int line, Object value) {
     map.computeIfAbsent(metricKey, k -> new HashMap<>())
       .put(line, value);
@@ -123,20 +105,9 @@ public class DefaultFileLinesContext implements FileLinesContext {
     return lines;
   }
 
-  private Map<Integer, Object> loadData(String metricKey, Converter<? extends Object> converter) {
-    DefaultMeasure<?> measure = measureCache.byMetric(inputFile.key(), metricKey);
-    String data = measure != null ? (String) measure.value() : null;
-    if (data != null) {
-      return ImmutableMap.copyOf(KeyValueFormat.parse(data, KeyValueFormat.newIntegerConverter(), converter));
-    }
-    // no such measure
-    return ImmutableMap.of();
-  }
-
   /**
    * Checks that measure was not saved.
    *
-   * @see #loadData(String, Converter)
    * @see #save()
    */
   private static boolean shouldSave(Map<Integer, Object> lines) {