SONAR-21455 fix deprecated metrics in 10.4

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
index a0027a8cd5caa668a3ece67e4fe1dae703fcfa11..9a452090d9a4da8054e16bbf53e4bc820c125ab1 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/ws/MeasuresWsModule.java
@@ -41,7 +41,6 @@ public class MeasuresWsModule extends Module {
 
   public static String getDeprecatedMetricsInSonarQube104() {
     return "'" + String.join("', '","bugs", "new_bugs", "vulnerabilities", "new_vulnerabilities",
-      "security_hotspots", "new_security_hotspots", "security_hotspots_reviewed", "new_security_hotspots_reviewed",
-      "code_smells", "new_code_smells") + "'";
+      "code_smells", "new_code_smells", "high_impact_accepted_issues") + "'";
   }
 }

diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
index 21a72478a1063a269833eb71196f39c23a7b8e78..a272c9cbbac3d479142d22c5d24d7e1972a2f101 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/ws/MeasuresWsModuleTest.java
@@ -36,7 +36,7 @@ public class MeasuresWsModuleTest {
   public void getDeprecatedMetricsInSonarQube104_shouldReturnExactString() {
     String actual = MeasuresWsModule.getDeprecatedMetricsInSonarQube104();
 
-    assertThat(actual).isEqualTo("'bugs', 'new_bugs', 'vulnerabilities', 'new_vulnerabilities', 'security_hotspots', " +
-      "'new_security_hotspots', 'security_hotspots_reviewed', 'new_security_hotspots_reviewed', 'code_smells', 'new_code_smells'");
+    assertThat(actual).isEqualTo("'bugs', 'new_bugs', 'vulnerabilities', 'new_vulnerabilities', 'code_smells', 'new_code_smells', " +
+      "'high_impact_accepted_issues'");
   }
 }