Revert "SONAR-22876 Exclude metrics from being persisted to measures

2 files changed, 0 insertions, 40 deletions

diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepIT.java
index d9564b8b699..4ff9babee3c 100644
--- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepIT.java
+++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStepIT.java
@@ -53,10 +53,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.sonar.api.measures.CoreMetrics.EXECUTABLE_LINES_DATA;
-import static org.sonar.api.measures.CoreMetrics.EXECUTABLE_LINES_DATA_KEY;
-import static org.sonar.api.measures.CoreMetrics.NCLOC_DATA;
-import static org.sonar.api.measures.CoreMetrics.NCLOC_DATA_KEY;
 import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY;
 import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE;
 import static org.sonar.ce.task.projectanalysis.component.Component.Type.PROJECT;
@@ -261,26 +257,6 @@ class PersistMeasuresStepIT {
     verifyUnchanged(0);
   }
 
-  @Test
-  void do_not_persist_excluded_metrics() {
-    MetricDto nclocDto = db.measures().insertMetric(m -> m.setKey(NCLOC_DATA.getKey()).setValueType(Metric.ValueType.DATA.name()));
-    MetricDto executableDto = db.measures().insertMetric(m -> m.setKey(EXECUTABLE_LINES_DATA.getKey()).setValueType(Metric.ValueType.DATA.name()));
-
-    metricRepository.add(nclocDto.getUuid(), NCLOC_DATA);
-    metricRepository.add(executableDto.getUuid(), EXECUTABLE_LINES_DATA);
-
-    prepareProject();
-
-    // the computed measures
-    measureRepository.addRawMeasure(REF_1, NCLOC_DATA_KEY, newMeasureBuilder().create(10_000));
-    measureRepository.addRawMeasure(REF_1, EXECUTABLE_LINES_DATA_KEY, newMeasureBuilder().create(5_000));
-
-    step().execute(context);
-
-    // no excluded measures are persisted
-    verifyInsertsOrUpdates(0);
-  }
-
   private void insertMeasure(String componentUuid, String projectUuid, Metric<?> metric, Object obj) {
     MeasureDto measure = new MeasureDto()
       .setComponentUuid(componentUuid)
diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java
index 0bfa6dba574..46094e08fd0 100644
--- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java
+++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistMeasuresStep.java
@@ -51,8 +51,6 @@ import org.sonar.db.measure.MeasureHash;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.sonar.api.measures.CoreMetrics.DUPLICATIONS_DATA_KEY;
-import static org.sonar.api.measures.CoreMetrics.EXECUTABLE_LINES_DATA_KEY;
-import static org.sonar.api.measures.CoreMetrics.NCLOC_DATA_KEY;
 import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER;
 
 public class PersistMeasuresStep implements ComputationStep {
@@ -62,13 +60,6 @@ public class PersistMeasuresStep implements ComputationStep {
   private static final Predicate<Measure> NON_EMPTY_MEASURE = measure ->
     measure.getValueType() != ValueType.NO_VALUE || measure.getData() != null;
 
-  /**
-   * List of metrics that should not be persisted
-   */
-  private static final Set<String> NOT_TO_PERSIST = Set.of(
-    EXECUTABLE_LINES_DATA_KEY,
-    NCLOC_DATA_KEY);
-
   private final DbClient dbClient;
   private final MetricRepository metricRepository;
   private final TreeRootHolder treeRootHolder;
@@ -155,9 +146,6 @@ public class PersistMeasuresStep implements ComputationStep {
     Map<String, Measure> measures = measureRepository.getRawMeasures(component);
     for (Map.Entry<String, Measure> measuresByMetricKey : measures.entrySet()) {
       String metricKey = measuresByMetricKey.getKey();
-      if (shouldNotPersist(metricKey)) {
-        continue;
-      }
       Metric metric = metricRepository.getByKey(metricKey);
       Predicate<Measure> notBestValueOptimized = BestValueOptimization.from(metric, component).negate();
       Measure measure = measuresByMetricKey.getValue();
@@ -180,10 +168,6 @@ public class PersistMeasuresStep implements ComputationStep {
     return measureDto;
   }
 
-  private static boolean shouldNotPersist(String metricKey) {
-    return NOT_TO_PERSIST.contains(metricKey);
-  }
-
   private void persist(Collection<MeasureDto> inserts, Collection<MeasureDto> updates) {
     if (inserts.isEmpty() && updates.isEmpty()) {
       return;