SONAR-6576 WS api/metrics/domains returns domains of enabled metrics only

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
index b68d4bd0db694e0552cadeb27f42913f4a4c3f37..2a83576fecd5ed9a075aaabdd56ee4e835f83598 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
@@ -57,13 +57,14 @@ public class DomainsActionTest {
 
   @Test
   public void json_example_validated() throws Exception {
-    insertNewMetricDto(MetricTesting.newDto().setDomain("API Compatibility"));
-    insertNewMetricDto(MetricTesting.newDto().setDomain("Issues"));
-    insertNewMetricDto(MetricTesting.newDto().setDomain("Rules"));
-    insertNewMetricDto(MetricTesting.newDto().setDomain("Tests"));
-    insertNewMetricDto(MetricTesting.newDto().setDomain("Documentation"));
-    insertNewMetricDto(MetricTesting.newDto().setDomain(null));
-    insertNewMetricDto(MetricTesting.newDto().setDomain(""));
+    insertNewMetricDto(newEnabledMetric("API Compatibility"));
+    insertNewMetricDto(newEnabledMetric("Issues"));
+    insertNewMetricDto(newEnabledMetric("Rules"));
+    insertNewMetricDto(newEnabledMetric("Tests"));
+    insertNewMetricDto(newEnabledMetric("Documentation"));
+    insertNewMetricDto(newEnabledMetric(null));
+    insertNewMetricDto(newEnabledMetric(""));
+    insertNewMetricDto(MetricTesting.newDto().setDomain("Domain of Deactivated Metric").setEnabled(false));
 
     WsTester.Result result = ws.newGetRequest(MetricsWs.ENDPOINT, "domains").execute();
 
@@ -74,4 +75,8 @@ public class DomainsActionTest {
     dbClient.metricDao().insert(dbSession, metric);
     dbSession.commit();
   }
+
+  private MetricDto newEnabledMetric(String domain) {
+    return MetricTesting.newDto().setDomain(domain).setEnabled(true);
+  }
 }

diff --git a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml
index 4c38d99c12aee80ec5505a17280b48bef83cbbe0..2e6383098501f6beb8f03ae2bff2e833cc30f276 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/metric/db/MetricMapper.xml
@@ -66,7 +66,7 @@
   <select id="selectDomains" resultType="String">
     select distinct domain
     from metrics m
-    where m.domain is not null
+    where m.domain is not null and m.enabled=${_true}
   </select>
 
   <update id="disable">