From 63baf5a86a81ea8e72ff547b176bb7732d7c25cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20B=C3=BCscher?= Date: Mon, 2 Jan 2017 14:27:11 +0100 Subject: [PATCH] Remove Getters and Setters for "minimumNumberShouldMatch" in BoolQueryBuilder The interval value set is "minimumShouldMatch" and also the documented query dsl parameter is `minimum_should_match` so we can deprecate `minimum_number_should_match` and its getters/setters in 5.x and remove them in 6. Original commit: elastic/x-pack-elasticsearch@53ce64b7b3195c9ba203b84c3c8fe238dd859d33 --- .../elasticsearch/integration/DocumentLevelSecurityTests.java | 2 +- .../xpack/monitoring/resolver/cluster/ClusterInfoTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java index c36177995bc..2ed5755c3be 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java @@ -136,7 +136,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { QueryBuilder combined = QueryBuilders.boolQuery() .should(QueryBuilders.termQuery("field2", "value2")) .should(QueryBuilders.termQuery("field1", "value1")) - .minimumNumberShouldMatch(1); + .minimumShouldMatch(1); response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user3", USERS_PASSWD))) .prepareSearch("test") .setQuery(randomBoolean() ? combined : QueryBuilders.matchAllQuery()) diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java index 4ddcb7c519e..ea616673ae8 100644 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java +++ b/elasticsearch/src/test/java/org/elasticsearch/xpack/monitoring/resolver/cluster/ClusterInfoTests.java @@ -148,7 +148,7 @@ public class ClusterInfoTests extends MonitoringIntegTestCase { .should(QueryBuilders.matchQuery(License.Fields.STATUS, License.Status.INVALID.label())) .should(QueryBuilders.matchQuery(License.Fields.STATUS, License.Status.EXPIRED.label())) .should(QueryBuilders.matchQuery("cluster_name", cluster().getClusterName())) - .minimumNumberShouldMatch(1) + .minimumShouldMatch(1) ).get(), 0L); } }