Replace deprecated method setFilter to setPostFilter

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/ProfileRules.java b/sonar-server/src/main/java/org/sonar/server/rule/ProfileRules.java
index 467f1d83093da72acc054e71521a0587fa7387a5..b95aa53f237f4eff10057fd40d04951e3dbc0048 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/ProfileRules.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/ProfileRules.java
@@ -81,7 +81,7 @@ public class ProfileRules implements ServerExtension {
     BoolFilterBuilder filter = activeRuleFilter(query);
 
     SearchRequestBuilder builder = index.client().prepareSearch(INDEX_RULES).setTypes(TYPE_ACTIVE_RULE)
-      .setFilter(filter)
+      .setPostFilter(filter)
       .addFields(FIELD_SOURCE, FIELD_PARENT)
       .setSize(paging.pageSize())
       .setFrom(paging.offset());
@@ -117,7 +117,7 @@ public class ProfileRules implements ServerExtension {
     SearchRequestBuilder builder = index.client()
       .prepareSearch(INDEX_RULES)
       .setTypes(TYPE_ACTIVE_RULE)
-      .setFilter(filter);
+      .setPostFilter(filter);
     List<String> documentIds = index.findDocumentIds(builder, 2);
     return newArrayList(Iterables.transform(documentIds, new Function<String, Integer>() {
       @Override
@@ -135,7 +135,7 @@ public class ProfileRules implements ServerExtension {
         termFilter(ActiveRuleDocument.FIELD_PROFILE_ID, query.profileId())));
 
     SearchRequestBuilder builder = index.client().prepareSearch(INDEX_RULES).setTypes(TYPE_RULE)
-      .setFilter(filter)
+      .setPostFilter(filter)
       .addFields(FIELD_SOURCE, FIELD_PARENT)
       .setSize(paging.pageSize())
       .setFrom(paging.offset());

diff --git a/sonar-server/src/main/java/org/sonar/server/search/SearchQuery.java b/sonar-server/src/main/java/org/sonar/server/search/SearchQuery.java
index 055ef78696ebe5d0aa1e67253bfd27187d935b1d..526e9efb82beee7f0a0620305c5454a0912702c7 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/search/SearchQuery.java
+++ b/sonar-server/src/main/java/org/sonar/server/search/SearchQuery.java
@@ -33,10 +33,7 @@ import org.elasticsearch.index.query.QueryStringQueryBuilder.Operator;
 import java.util.Iterator;
 import java.util.List;
 
-import static org.elasticsearch.index.query.FilterBuilders.boolFilter;
-import static org.elasticsearch.index.query.FilterBuilders.queryFilter;
-import static org.elasticsearch.index.query.FilterBuilders.termFilter;
-import static org.elasticsearch.index.query.FilterBuilders.termsFilter;
+import static org.elasticsearch.index.query.FilterBuilders.*;
 
 /**
  * This class can be used to build "AND" form queries, to be passed e.g to {@link SearchIndex#findDocumentIds(SearchQuery)}
@@ -110,7 +107,7 @@ public class SearchQuery {
     SearchRequestBuilder builder = client.prepareSearch(indices.toArray(new String[0])).setTypes(types.toArray(new String[0]));
 
     if (fieldCriteria.isEmpty() && notFieldCriteria.isEmpty() && StringUtils.isBlank(searchString)) {
-      builder.setFilter(new MatchAllFilterBuilder());
+      builder.setPostFilter(new MatchAllFilterBuilder());
     } else {
       BoolFilterBuilder boolFilter = boolFilter();
 
@@ -138,7 +135,7 @@ public class SearchQuery {
           .allowLeadingWildcard(false)));
       }
 
-      builder.setFilter(boolFilter);
+      builder.setPostFilter(boolFilter);
     }
     return builder;
   }

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
index 1f97b894124be82b7cf87ca09b0cf9639f48181d..4ed207e041862f05435f213e3c383fa5c3f37795 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistryTest.java
@@ -257,13 +257,13 @@ public class RuleRegistryTest {
     registry.bulkIndexActiveRules(activeRules, paramsByActiveRule);
     assertThat(esSetup.exists("rules", "active_rule", "1"));
 
-    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasChildFilter("active_rule", termFilter("profileId", 10))
     ).execute().actionGet().getHits().getHits();
     assertThat(parentHit).hasSize(1);
     assertThat(parentHit[0].getId()).isEqualTo("1");
 
-    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasParentFilter("rule", termFilter("key", "RuleWithParameters"))
     ).execute().actionGet().getHits().getHits();
     assertThat(childHit).hasSize(1);
@@ -283,13 +283,13 @@ public class RuleRegistryTest {
     registry.bulkIndexActiveRules(ids);
     assertThat(esSetup.exists("rules", "active_rule", "1"));
 
-    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasChildFilter("active_rule", termFilter("profileId", 10))
     ).execute().actionGet().getHits().getHits();
     assertThat(parentHit).hasSize(1);
     assertThat(parentHit[0].getId()).isEqualTo("1");
 
-    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasParentFilter("rule", termFilter("key", "RuleWithParameters"))
     ).execute().actionGet().getHits().getHits();
     assertThat(childHit).hasSize(1);
@@ -304,13 +304,13 @@ public class RuleRegistryTest {
     registry.save(activeRule, params);
     assertThat(esSetup.exists("rules", "active_rule", "1"));
 
-    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] parentHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasChildFilter("active_rule", termFilter("profileId", 10))
     ).execute().actionGet().getHits().getHits();
     assertThat(parentHit).hasSize(1);
     assertThat(parentHit[0].getId()).isEqualTo("1");
 
-    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setFilter(
+    SearchHit[] childHit = esSetup.client().prepareSearch("rules").setPostFilter(
       hasParentFilter("rule", termFilter("key", "RuleWithParameters"))
     ).execute().actionGet().getHits().getHits();
     assertThat(childHit).hasSize(1);