From a4718d6858cc6e44080641cb1da4e8f5c9ee0762 Mon Sep 17 00:00:00 2001
From: lukasz-jarocki-sonarsource <lukasz.jarocki@sonarsource.com>
Date: Fri, 3 Nov 2023 14:54:02 +0100
Subject: SONAR-20892 Updated api/measures endpoints to return renamed metric

---
 .../src/it/java/org/sonar/server/startup/RegisterMetricsIT.java   | 6 ++++--
 .../src/main/java/org/sonar/server/startup/RegisterMetrics.java   | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'server/sonar-webserver-core')

diff --git a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
index bf19912492a..35bfa6854a8 100644
--- a/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
+++ b/server/sonar-webserver-core/src/it/java/org/sonar/server/startup/RegisterMetricsIT.java
@@ -136,10 +136,12 @@ public class RegisterMetricsIT {
   }
 
   @Test
-  public void insert_core_metrics() {
+  public void insert_core_metrics_without_removed_metric() {
     register.start();
 
-    assertThat(dbTester.countRowsOfTable("metrics")).isEqualTo(CoreMetrics.getMetrics().size());
+    // Metric CoreMetrics.WONT_FIX_ISSUES was renamed to CoreMetrics.ACCEPTED_ISSUES in 10.3.
+    // We don't want to insert it anymore
+    assertThat(dbTester.countRowsOfTable("metrics")).isEqualTo(CoreMetrics.getMetrics().size() - 1);
   }
 
   @Test
diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java
index 238c97dd8f6..8afa7232280 100644
--- a/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java
+++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/startup/RegisterMetrics.java
@@ -20,6 +20,7 @@
 package org.sonar.server.startup;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.FluentIterable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,10 +36,11 @@ import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.metric.MetricDto;
 import org.sonar.server.metric.MetricToDto;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import static com.google.common.collect.FluentIterable.concat;
 import static com.google.common.collect.Lists.newArrayList;
-import org.springframework.beans.factory.annotation.Autowired;
+import static org.sonar.db.metric.RemovedMetricConverter.REMOVED_METRIC;
 
 public class RegisterMetrics implements Startable {
 
@@ -65,7 +67,9 @@ public class RegisterMetrics implements Startable {
 
   @Override
   public void start() {
-    register(concat(CoreMetrics.getMetrics(), getPluginMetrics()));
+    FluentIterable<Metric> metricsToRegister = concat(CoreMetrics.getMetrics(), getPluginMetrics())
+      .filter(m -> !REMOVED_METRIC.equals(m.getKey()));
+    register(metricsToRegister);
   }
 
   @Override
-- 
cgit v1.2.3