SONAR-5237 - Changed facet's name to property to link/match search Filters

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
index 3b4a1267ed1af01c90cd99d8e86c7cd60c6e84c1..af103e3446153f282acc0d16a770a5ecc2f7eec1 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
@@ -328,7 +328,7 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
 
     /* the Lang facet */
     query.addAggregation(AggregationBuilders
-      .terms("Languages")
+      .terms("languages")
       .field(RuleNormalizer.RuleField.LANGUAGE.key())
       .order(Terms.Order.count(false))
       .size(10)
@@ -336,7 +336,7 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
 
      /* the Tag facet */
     query.addAggregation(AggregationBuilders
-      .terms("Tags")
+      .terms("tags")
       .field(RuleNormalizer.RuleField._TAGS.key())
       .order(Terms.Order.count(false))
       .size(10)
@@ -344,7 +344,7 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
 
      /* the Repo facet */
     query.addAggregation(AggregationBuilders
-      .terms("Repositories")
+      .terms("repositories")
       .field(RuleNormalizer.RuleField.REPOSITORY.key())
       .order(Terms.Order.count(false))
       .size(10)

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
index 13f755c6ee6e9f53e59d35344cf1cf829f273045..6bd8c580d49d2415e413fa7db17e563c9bcb7a50 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
@@ -217,7 +217,7 @@ public class SearchAction implements RequestHandler {
     json.name("facets").beginArray();
     for (Map.Entry<String, Collection<FacetValue>> facet : results.getFacets().entrySet()) {
       json.beginObject();
-      json.prop("name", facet.getKey());
+      json.prop("property", facet.getKey());
       json.name("values").beginArray();
       for (FacetValue facetValue : facet.getValue()) {
         json.beginObject();

diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java
index 4031b64d78a9ca6f042818567cbb36f74bf5f76a..6776c714d8877b2f74fcc4330da7b200bf349399 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule2/index/RuleIndexMediumTest.java
@@ -122,7 +122,7 @@ public class RuleIndexMediumTest {
     assertThat(result.getFacets()).hasSize(3);
 
     // Verify the value of a given facet
-    Collection<FacetValue> repoFacets = result.getFacetValues("Repositories");
+    Collection<FacetValue> repoFacets = result.getFacetValues("repositories");
     assertThat(repoFacets).hasSize(2);
     assertThat(Iterables.get(repoFacets, 0).getKey()).isEqualTo("javascript");
     assertThat(Iterables.get(repoFacets, 0).getValue()).isEqualTo(2);
@@ -130,7 +130,7 @@ public class RuleIndexMediumTest {
     assertThat(Iterables.get(repoFacets, 1).getValue()).isEqualTo(1);
 
     // Check that tag facet has both Tags and SystemTags values
-    Collection<FacetValue> tagFacet = result.getFacetValues("Tags");
+    Collection<FacetValue> tagFacet = result.getFacetValues("tags");
     assertThat(tagFacet).hasSize(2);
   }