From 3e0fcb4f76bc349293a8c6128dd1b2b77bfc1beb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 21 Oct 2014 14:37:17 +0200
Subject: [PATCH] SONAR-5749 SONAR-5747 Rename issues facets to reflect filter
 names

---
 .../java/org/sonar/server/issue/index/IssueIndex.java | 11 ++++++-----
 .../sonar/server/issue/IssueServiceMediumTest.java    |  2 +-
 .../ws/SearchActionMediumTest/display_facets.json     |  8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index a8ec2762a8b..a2abebfd164 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -38,6 +38,7 @@ import org.sonar.api.issue.Issue;
 import org.sonar.api.web.UserRole;
 import org.sonar.core.issue.db.IssueDto;
 import org.sonar.server.issue.IssueQuery;
+import org.sonar.server.issue.filter.IssueFilterParameters;
 import org.sonar.server.search.*;
 
 import javax.annotation.Nullable;
@@ -277,15 +278,15 @@ public class IssueIndex extends BaseIndex<Issue, IssueDto, String> {
   private void setFacets(QueryContext options, SearchRequestBuilder esSearch) {
     if (options.isFacet()) {
       // Execute Term aggregations
-      esSearch.addAggregation(AggregationBuilders.terms(IssueNormalizer.IssueField.SEVERITY.field())
+      esSearch.addAggregation(AggregationBuilders.terms(IssueFilterParameters.SEVERITIES)
         .field(IssueNormalizer.IssueField.SEVERITY.field()));
-      esSearch.addAggregation(AggregationBuilders.terms(IssueNormalizer.IssueField.STATUS.field())
+      esSearch.addAggregation(AggregationBuilders.terms(IssueFilterParameters.STATUSES)
         .field(IssueNormalizer.IssueField.STATUS.field()));
-      esSearch.addAggregation(AggregationBuilders.terms(IssueNormalizer.IssueField.RESOLUTION.field())
+      esSearch.addAggregation(AggregationBuilders.terms(IssueFilterParameters.RESOLUTIONS)
         .field(IssueNormalizer.IssueField.RESOLUTION.field()));
-      esSearch.addAggregation(AggregationBuilders.terms(IssueNormalizer.IssueField.ACTION_PLAN.field())
+      esSearch.addAggregation(AggregationBuilders.terms(IssueFilterParameters.ACTION_PLANS)
         .field(IssueNormalizer.IssueField.ACTION_PLAN.field()));
-      esSearch.addAggregation(AggregationBuilders.terms(IssueNormalizer.IssueField.PROJECT.field())
+      esSearch.addAggregation(AggregationBuilders.terms(IssueFilterParameters.COMPONENT_ROOTS)
         .field(IssueNormalizer.IssueField.PROJECT.field()));
     }
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
index 8fffdced484..dbe20f7cb79 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java
@@ -151,7 +151,7 @@ public class IssueServiceMediumTest {
 
     result = service.search(IssueQuery.builder().build(), new QueryContext().setFacet(true));
     assertThat(result.getFacets().keySet()).hasSize(5);
-    assertThat(result.getFacetKeys("actionPlan")).hasSize(2);
+    assertThat(result.getFacetKeys("actionPlans")).hasSize(2);
   }
 
   @Test
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json
index 03d05e1c1bc..42aa68fd5eb 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/display_facets.json
@@ -14,7 +14,7 @@
   ],
   "facets": [
     {
-      "property": "status",
+      "property": "statuses",
       "values": [
         {
           "val": "OPEN",
@@ -23,7 +23,7 @@
       ]
     },
     {
-      "property": "severity",
+      "property": "severities",
       "values": [
         {
           "val": "MAJOR",
@@ -32,7 +32,7 @@
       ]
     },
     {
-      "property": "resolution",
+      "property": "resolutions",
       "values": [
         {
           "val": "OPEN",
@@ -41,7 +41,7 @@
       ]
     },
     {
-      "property": "project",
+      "property": "componentRoots",
       "values": [
         {
           "val": "MyProject",
-- 
2.39.5