diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/DateDerivativeIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/DateDerivativeIT.java
index 5c4a7d5ef587..f375d341c5ae 100644
--- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/DateDerivativeIT.java
+++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/DateDerivativeIT.java
@@ -555,14 +555,12 @@ public class DateDerivativeIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- dateHistogram("histo").field("date")
- .calendarInterval(DateHistogramInterval.MONTH)
- .minDocCount(0)
- .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count"))
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ dateHistogram("histo").field("date")
+ .calendarInterval(DateHistogramInterval.MONTH)
+ .minDocCount(0)
+ .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count"))
+ ).get();
assertNoFailures(response);
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java
index 6798aba477f9..e7e9aa32b168 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -158,26 +158,21 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase {
)
.get();
refresh();
- SearchResponse search = client().prepareSearch()
- .setQuery(matchPhraseQuery("body", "Test: http://www.facebook.com "))
+ SearchResponse search = prepareSearch().setQuery(matchPhraseQuery("body", "Test: http://www.facebook.com "))
.highlighter(new HighlightBuilder().field("body").highlighterType("fvh"))
.get();
assertHighlight(search, 0, "body", 0, startsWith("Test: http://www.facebook.com"));
- search = client().prepareSearch()
- .setQuery(
- matchPhraseQuery(
- "body",
- "Test: http://www.facebook.com "
- + "http://elasticsearch.org http://xing.com http://cnn.com "
- + "http://quora.com http://twitter.com this is a test for highlighting "
- + "feature Test: http://www.facebook.com http://elasticsearch.org "
- + "http://xing.com http://cnn.com http://quora.com http://twitter.com this "
- + "is a test for highlighting feature"
- )
+ search = prepareSearch().setQuery(
+ matchPhraseQuery(
+ "body",
+ "Test: http://www.facebook.com "
+ + "http://elasticsearch.org http://xing.com http://cnn.com "
+ + "http://quora.com http://twitter.com this is a test for highlighting "
+ + "feature Test: http://www.facebook.com http://elasticsearch.org "
+ + "http://xing.com http://cnn.com http://quora.com http://twitter.com this "
+ + "is a test for highlighting feature"
)
- .highlighter(new HighlightBuilder().field("body").highlighterType("fvh"))
- .execute()
- .actionGet();
+ ).highlighter(new HighlightBuilder().field("body").highlighterType("fvh")).execute().actionGet();
assertHighlight(
search,
0,
diff --git a/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java
index 6c428556c734..f71a55f4f6be 100644
--- a/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java
+++ b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java
@@ -66,7 +66,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
paramsMap.put(params[i].toString(), params[i + 1]);
}
- SearchRequestBuilder req = client().prepareSearch().setIndices("test");
+ SearchRequestBuilder req = prepareSearch().setIndices("test");
req.setQuery(QueryBuilders.matchAllQuery())
.addSort(SortBuilders.fieldSort("id").order(SortOrder.ASC).unmappedType("long"))
.addScriptField("foo", new Script(ScriptType.INLINE, "expression", script, paramsMap));
@@ -113,7 +113,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
ScriptScoreFunctionBuilder score = ScoreFunctionBuilders.scriptFunction(
new Script(ScriptType.INLINE, "expression", "1 / _score", Collections.emptyMap())
);
- SearchRequestBuilder req = client().prepareSearch().setIndices("test");
+ SearchRequestBuilder req = prepareSearch().setIndices("test");
req.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("text", "hello"), score).boostMode(CombineFunction.REPLACE));
req.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); // make sure DF is consistent
SearchResponse rsp = req.get();
@@ -124,7 +124,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
assertEquals("3", hits.getAt(1).getId());
assertEquals("2", hits.getAt(2).getId());
- req = client().prepareSearch().setIndices("test");
+ req = prepareSearch().setIndices("test");
req.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("text", "hello"), score).boostMode(CombineFunction.REPLACE));
score = ScoreFunctionBuilders.scriptFunction(new Script(ScriptType.INLINE, "expression", "1 / _score", Collections.emptyMap()));
req.addAggregation(AggregationBuilders.max("max_score").script((score).getScript()));
@@ -466,7 +466,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
client().prepareIndex("test").setId("3").setSource("x", 13, "y", 1.8)
);
- SearchRequestBuilder req = client().prepareSearch().setIndices("test");
+ SearchRequestBuilder req = prepareSearch().setIndices("test");
req.setQuery(QueryBuilders.matchAllQuery())
.addAggregation(
AggregationBuilders.stats("int_agg")
@@ -512,7 +512,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
client().prepareIndex("test").setId("3").setSource("text", "hello")
);
- SearchRequestBuilder req = client().prepareSearch().setIndices("test");
+ SearchRequestBuilder req = prepareSearch().setIndices("test");
req.setQuery(QueryBuilders.matchAllQuery())
.addAggregation(
AggregationBuilders.terms("term_agg")
diff --git a/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java
index 77e90d42ad94..dcf380d338c1 100644
--- a/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java
+++ b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java
@@ -50,12 +50,9 @@ public class StoredExpressionIT extends ESIntegTestCase {
assertThat(e.getCause().getMessage(), containsString("Failed to compile stored script [script1] using lang [expression]"));
}
try {
- client().prepareSearch()
- .setSource(
- new SearchSourceBuilder().scriptField("test1", new Script(ScriptType.STORED, null, "script1", Collections.emptyMap()))
- )
- .setIndices("test")
- .get();
+ prepareSearch().setSource(
+ new SearchSourceBuilder().scriptField("test1", new Script(ScriptType.STORED, null, "script1", Collections.emptyMap()))
+ ).setIndices("test").get();
fail("search script should have been rejected");
} catch (Exception e) {
assertThat(e.toString(), containsString("cannot execute scripts using [field] context"));
diff --git a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ChildQuerySearchIT.java b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ChildQuerySearchIT.java
index a5b9e5532a96..1915df55a783 100644
--- a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ChildQuerySearchIT.java
+++ b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ChildQuerySearchIT.java
@@ -1259,26 +1259,20 @@ public class ChildQuerySearchIT extends ParentChildTestCase {
indicesAdmin().prepareRefresh("test").get();
for (int i = 0; i < 2; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().must(matchAllQuery())
- .filter(
- boolQuery().must(hasChildQuery("child", matchQuery("c_field", "red"), ScoreMode.None)).must(matchAllQuery())
- )
- )
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ boolQuery().must(matchAllQuery())
+ .filter(boolQuery().must(hasChildQuery("child", matchQuery("c_field", "red"), ScoreMode.None)).must(matchAllQuery()))
+ ).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L));
}
createIndexRequest("test", "child", "c3", "p2", "c_field", "blue").get();
indicesAdmin().prepareRefresh("test").get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().must(matchAllQuery())
- .filter(boolQuery().must(hasChildQuery("child", matchQuery("c_field", "red"), ScoreMode.None)).must(matchAllQuery()))
- )
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ boolQuery().must(matchAllQuery())
+ .filter(boolQuery().must(hasChildQuery("child", matchQuery("c_field", "red"), ScoreMode.None)).must(matchAllQuery()))
+ ).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
}
diff --git a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/InnerHitsIT.java b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/InnerHitsIT.java
index e64d5594fa77..a857316319a6 100644
--- a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/InnerHitsIT.java
+++ b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/InnerHitsIT.java
@@ -590,13 +590,12 @@ public class InnerHitsIT extends ParentChildTestCase {
client().prepareIndex("index2").setId("3").setSource("key", "value").get();
refresh();
assertSearchHitsWithoutFailures(
- client().prepareSearch("index1", "index2")
- .setQuery(
- boolQuery().should(
- hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true)
- .innerHit(new InnerHitBuilder().setIgnoreUnmapped(true))
- ).should(termQuery("key", "value"))
- ),
+ prepareSearch("index1", "index2").setQuery(
+ boolQuery().should(
+ hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true)
+ .innerHit(new InnerHitBuilder().setIgnoreUnmapped(true))
+ ).should(termQuery("key", "value"))
+ ),
"1",
"3"
);
diff --git a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
index 39b42b25ca65..9362080c9cb3 100644
--- a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
+++ b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
@@ -98,14 +98,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
BytesReference source = BytesReference.bytes(jsonBuilder().startObject().endObject());
logger.info("percolating empty doc");
- SearchResponse response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
source = BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").endObject());
logger.info("percolating doc with 1 field");
- response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 2);
@@ -116,8 +115,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
source = BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").field("field2", "value").endObject());
logger.info("percolating doc with 2 fields");
- response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 3);
@@ -129,19 +127,16 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
assertThat(response.getHits().getAt(2).getFields().get("_percolator_document_slot").getValue(), equalTo(0));
logger.info("percolating doc with 2 fields");
- response = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
- Arrays.asList(
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").field("field2", "value").endObject())
- ),
- XContentType.JSON
- )
+ response = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ Arrays.asList(
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").field("field2", "value").endObject())
+ ),
+ XContentType.JSON
)
- .addSort("id", SortOrder.ASC)
- .get();
+ ).addSort("id", SortOrder.ASC).get();
assertHitCount(response, 3);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
assertThat(response.getHits().getAt(0).getFields().get("_percolator_document_slot").getValues(), equalTo(Arrays.asList(0, 1)));
@@ -238,44 +233,44 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
// Test long range:
BytesReference source = BytesReference.bytes(jsonBuilder().startObject().field("field1", 12).endObject());
- SearchResponse response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
logger.info("response={}", response);
assertHitCount(response, 2);
assertThat(response.getHits().getAt(0).getId(), equalTo("3"));
assertThat(response.getHits().getAt(1).getId(), equalTo("1"));
source = BytesReference.bytes(jsonBuilder().startObject().field("field1", 11).endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
// Test double range:
source = BytesReference.bytes(jsonBuilder().startObject().field("field2", 12).endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 2);
assertThat(response.getHits().getAt(0).getId(), equalTo("6"));
assertThat(response.getHits().getAt(1).getId(), equalTo("4"));
source = BytesReference.bytes(jsonBuilder().startObject().field("field2", 11).endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("4"));
// Test IP range:
source = BytesReference.bytes(jsonBuilder().startObject().field("field3", "192.168.1.5").endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 2);
assertThat(response.getHits().getAt(0).getId(), equalTo("9"));
assertThat(response.getHits().getAt(1).getId(), equalTo("7"));
source = BytesReference.bytes(jsonBuilder().startObject().field("field3", "192.168.1.4").endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("7"));
// Test date range:
source = BytesReference.bytes(jsonBuilder().startObject().field("field4", "2016-05-15").endObject());
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("10"));
}
@@ -325,8 +320,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
BytesReference source = BytesReference.bytes(
jsonBuilder().startObject().startObject("field1").field("lat", 52.20).field("lon", 4.51).endObject().endObject()
);
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 3);
@@ -365,15 +359,12 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
logger.info("percolating empty doc");
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", "test", "1", null, null, null))
- .get();
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "1", null, null, null)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
logger.info("percolating doc with 1 field");
- response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", "test", "5", null, null, null))
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "5", null, null, null))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 2);
@@ -381,8 +372,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
assertThat(response.getHits().getAt(1).getId(), equalTo("2"));
logger.info("percolating doc with 2 fields");
- response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", "test", "6", null, null, null))
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "6", null, null, null))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 3);
@@ -404,7 +394,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
logger.info("percolating empty doc with source disabled");
IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> {
- client().prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "1", null, null, null)).get();
+ prepareSearch().setQuery(new PercolateQueryBuilder("query", "test", "1", null, null, null)).get();
});
assertThat(e.getMessage(), containsString("source disabled"));
}
@@ -488,8 +478,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
.field("field2", "the quick brown fox falls down into the well")
.endObject()
);
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 3);
@@ -542,8 +531,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
BytesReference document = BytesReference.bytes(
jsonBuilder().startObject().field("field1", "The quick brown fox jumps over the lazy dog").endObject()
);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", document, XContentType.JSON))
+ SearchResponse searchResponse = prepareSearch().setQuery(new PercolateQueryBuilder("query", document, XContentType.JSON))
.highlighter(new HighlightBuilder().field("field1"))
.addSort("id", SortOrder.ASC)
.get();
@@ -574,14 +562,10 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
jsonBuilder().startObject().field("field1", "The quick brown fox jumps").endObject()
);
BytesReference document2 = BytesReference.bytes(jsonBuilder().startObject().field("field1", "over the lazy dog").endObject());
- searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().should(new PercolateQueryBuilder("query", document1, XContentType.JSON).setName("query1"))
- .should(new PercolateQueryBuilder("query", document2, XContentType.JSON).setName("query2"))
- )
- .highlighter(new HighlightBuilder().field("field1"))
- .addSort("id", SortOrder.ASC)
- .get();
+ searchResponse = prepareSearch().setQuery(
+ boolQuery().should(new PercolateQueryBuilder("query", document1, XContentType.JSON).setName("query1"))
+ .should(new PercolateQueryBuilder("query", document2, XContentType.JSON).setName("query2"))
+ ).highlighter(new HighlightBuilder().field("field1")).addSort("id", SortOrder.ASC).get();
logger.info("searchResponse={}", searchResponse);
assertHitCount(searchResponse, 5);
@@ -606,22 +590,18 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
equalTo("The quick brown fox jumps")
);
- searchResponse = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
- Arrays.asList(
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "dog").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "fox").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "jumps").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "brown fox").endObject())
- ),
- XContentType.JSON
- )
+ searchResponse = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ Arrays.asList(
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "dog").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "fox").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "jumps").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "brown fox").endObject())
+ ),
+ XContentType.JSON
)
- .highlighter(new HighlightBuilder().field("field1"))
- .addSort("id", SortOrder.ASC)
- .get();
+ ).highlighter(new HighlightBuilder().field("field1")).addSort("id", SortOrder.ASC).get();
assertHitCount(searchResponse, 5);
assertThat(
searchResponse.getHits().getAt(0).getFields().get("_percolator_document_slot").getValues(),
@@ -660,32 +640,28 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
equalTo("brown fox")
);
- searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().should(
+ searchResponse = prepareSearch().setQuery(
+ boolQuery().should(
+ new PercolateQueryBuilder(
+ "query",
+ Arrays.asList(
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "dog").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "fox").endObject())
+ ),
+ XContentType.JSON
+ ).setName("query1")
+ )
+ .should(
new PercolateQueryBuilder(
"query",
Arrays.asList(
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "dog").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "fox").endObject())
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "jumps").endObject()),
+ BytesReference.bytes(jsonBuilder().startObject().field("field1", "brown fox").endObject())
),
XContentType.JSON
- ).setName("query1")
+ ).setName("query2")
)
- .should(
- new PercolateQueryBuilder(
- "query",
- Arrays.asList(
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "jumps").endObject()),
- BytesReference.bytes(jsonBuilder().startObject().field("field1", "brown fox").endObject())
- ),
- XContentType.JSON
- ).setName("query2")
- )
- )
- .highlighter(new HighlightBuilder().field("field1"))
- .addSort("id", SortOrder.ASC)
- .get();
+ ).highlighter(new HighlightBuilder().field("field1")).addSort("id", SortOrder.ASC).get();
logger.info("searchResponse={}", searchResponse);
assertHitCount(searchResponse, 5);
assertThat(
@@ -764,9 +740,9 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
.get();
indicesAdmin().prepareRefresh().get();
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", new BytesArray("{\"field\" : [\"brown\", \"fox\"]}"), XContentType.JSON))
- .get();
+ SearchResponse response = prepareSearch().setQuery(
+ new PercolateQueryBuilder("query", new BytesArray("{\"field\" : [\"brown\", \"fox\"]}"), XContentType.JSON)
+ ).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("2"));
}
@@ -846,16 +822,14 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
BytesReference source = BytesReference.bytes(jsonBuilder().startObject().field("field", "value").endObject());
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder(queryFieldName, source, XContentType.JSON))
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder(queryFieldName, source, XContentType.JSON))
.setIndices("test1")
.get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
assertThat(response.getHits().getAt(0).getIndex(), equalTo("test1"));
- response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("object_field." + queryFieldName, source, XContentType.JSON))
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("object_field." + queryFieldName, source, XContentType.JSON))
.setIndices("test2")
.get();
assertHitCount(response, 1);
@@ -942,10 +916,67 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
.get();
indicesAdmin().prepareRefresh().get();
- SearchResponse response = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
+ SearchResponse response = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ BytesReference.bytes(
+ XContentFactory.jsonBuilder()
+ .startObject()
+ .field("companyname", "stark")
+ .startArray("employee")
+ .startObject()
+ .field("name", "virginia potts")
+ .endObject()
+ .startObject()
+ .field("name", "tony stark")
+ .endObject()
+ .endArray()
+ .endObject()
+ ),
+ XContentType.JSON
+ )
+ ).addSort("id", SortOrder.ASC).get();
+ assertHitCount(response, 2);
+ assertThat(response.getHits().getAt(0).getId(), equalTo("q1"));
+ assertThat(response.getHits().getAt(1).getId(), equalTo("q3"));
+
+ response = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ BytesReference.bytes(
+ XContentFactory.jsonBuilder()
+ .startObject()
+ .field("companyname", "notstark")
+ .startArray("employee")
+ .startObject()
+ .field("name", "virginia stark")
+ .endObject()
+ .startObject()
+ .field("name", "tony stark")
+ .endObject()
+ .endArray()
+ .endObject()
+ ),
+ XContentType.JSON
+ )
+ ).addSort("id", SortOrder.ASC).get();
+ assertHitCount(response, 1);
+ assertThat(response.getHits().getAt(0).getId(), equalTo("q3"));
+
+ response = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ BytesReference.bytes(XContentFactory.jsonBuilder().startObject().field("companyname", "notstark").endObject()),
+ XContentType.JSON
+ )
+ ).addSort("id", SortOrder.ASC).get();
+ assertHitCount(response, 1);
+ assertThat(response.getHits().getAt(0).getId(), equalTo("q3"));
+
+ response = prepareSearch().setQuery(
+ new PercolateQueryBuilder(
+ "query",
+ Arrays.asList(
BytesReference.bytes(
XContentFactory.jsonBuilder()
.startObject()
@@ -960,104 +991,35 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
.endArray()
.endObject()
),
- XContentType.JSON
- )
- )
- .addSort("id", SortOrder.ASC)
- .get();
- assertHitCount(response, 2);
- assertThat(response.getHits().getAt(0).getId(), equalTo("q1"));
- assertThat(response.getHits().getAt(1).getId(), equalTo("q3"));
-
- response = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
BytesReference.bytes(
XContentFactory.jsonBuilder()
.startObject()
- .field("companyname", "notstark")
+ .field("companyname", "stark")
.startArray("employee")
.startObject()
- .field("name", "virginia stark")
+ .field("name", "peter parker")
.endObject()
.startObject()
- .field("name", "tony stark")
+ .field("name", "virginia potts")
.endObject()
.endArray()
.endObject()
),
- XContentType.JSON
- )
+ BytesReference.bytes(
+ XContentFactory.jsonBuilder()
+ .startObject()
+ .field("companyname", "stark")
+ .startArray("employee")
+ .startObject()
+ .field("name", "peter parker")
+ .endObject()
+ .endArray()
+ .endObject()
+ )
+ ),
+ XContentType.JSON
)
- .addSort("id", SortOrder.ASC)
- .get();
- assertHitCount(response, 1);
- assertThat(response.getHits().getAt(0).getId(), equalTo("q3"));
-
- response = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
- BytesReference.bytes(XContentFactory.jsonBuilder().startObject().field("companyname", "notstark").endObject()),
- XContentType.JSON
- )
- )
- .addSort("id", SortOrder.ASC)
- .get();
- assertHitCount(response, 1);
- assertThat(response.getHits().getAt(0).getId(), equalTo("q3"));
-
- response = client().prepareSearch()
- .setQuery(
- new PercolateQueryBuilder(
- "query",
- Arrays.asList(
- BytesReference.bytes(
- XContentFactory.jsonBuilder()
- .startObject()
- .field("companyname", "stark")
- .startArray("employee")
- .startObject()
- .field("name", "virginia potts")
- .endObject()
- .startObject()
- .field("name", "tony stark")
- .endObject()
- .endArray()
- .endObject()
- ),
- BytesReference.bytes(
- XContentFactory.jsonBuilder()
- .startObject()
- .field("companyname", "stark")
- .startArray("employee")
- .startObject()
- .field("name", "peter parker")
- .endObject()
- .startObject()
- .field("name", "virginia potts")
- .endObject()
- .endArray()
- .endObject()
- ),
- BytesReference.bytes(
- XContentFactory.jsonBuilder()
- .startObject()
- .field("companyname", "stark")
- .startArray("employee")
- .startObject()
- .field("name", "peter parker")
- .endObject()
- .endArray()
- .endObject()
- )
- ),
- XContentType.JSON
- )
- )
- .addSort("id", SortOrder.ASC)
- .get();
+ ).addSort("id", SortOrder.ASC).get();
assertHitCount(response, 2);
assertThat(response.getHits().getAt(0).getId(), equalTo("q1"));
assertThat(response.getHits().getAt(0).getFields().get("_percolator_document_slot").getValues(), equalTo(Arrays.asList(0, 1)));
@@ -1188,9 +1150,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
// Execute with search.allow_expensive_queries = null => default value = false => success
BytesReference source = BytesReference.bytes(jsonBuilder().startObject().field("field1", "value").endObject());
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
- .get();
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
assertThat(response.getHits().getAt(0).getFields().get("_percolator_document_slot").getValue(), equalTo(0));
@@ -1200,7 +1160,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
ElasticsearchException e = expectThrows(
ElasticsearchException.class,
- () -> client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get()
+ () -> prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get()
);
assertEquals(
"[percolate] queries cannot be executed when 'search.allow_expensive_queries' is set to false.",
@@ -1210,7 +1170,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
// Set search.allow_expensive_queries setting to "true" ==> success
updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", true));
- response = client().prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
+ response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON)).get();
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getId(), equalTo("1"));
assertThat(response.getHits().getAt(0).getFields().get("_percolator_document_slot").getValue(), equalTo(0));
diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java
index d3b401ab3541..2f2248e30498 100644
--- a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java
+++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java
@@ -125,12 +125,12 @@ public class DeleteByQueryBasicTests extends ReindexTestCase {
assertHitCount(prepareSearch("test-" + i).setSize(0), remaining);
}
- assertHitCount(client().prepareSearch().setSize(0), (indices * docs) - deletions);
+ assertHitCount(prepareSearch().setSize(0), (indices * docs) - deletions);
}
public void testDeleteByQueryWithMissingIndex() throws Exception {
indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "a"));
- assertHitCount(client().prepareSearch().setSize(0), 1);
+ assertHitCount(prepareSearch().setSize(0), 1);
try {
deleteByQuery().source("missing").filter(QueryBuilders.matchAllQuery()).get();
@@ -154,19 +154,19 @@ public class DeleteByQueryBasicTests extends ReindexTestCase {
indexRandom(true, true, true, builders);
logger.info("--> counting documents with no routing, should be equal to [{}]", docs);
- assertHitCount(client().prepareSearch().setSize(0), docs);
+ assertHitCount(prepareSearch().setSize(0), docs);
String routing = String.valueOf(randomIntBetween(2, docs));
logger.info("--> counting documents with routing [{}]", routing);
- long expected = client().prepareSearch().setSize(0).setRouting(routing).get().getHits().getTotalHits().value;
+ long expected = prepareSearch().setSize(0).setRouting(routing).get().getHits().getTotalHits().value;
logger.info("--> delete all documents with routing [{}] with a delete-by-query", routing);
DeleteByQueryRequestBuilder delete = deleteByQuery().source("test").filter(QueryBuilders.matchAllQuery());
delete.source().setRouting(routing);
assertThat(delete.refresh(true).get(), matcher().deleted(expected));
- assertHitCount(client().prepareSearch().setSize(0), docs - expected);
+ assertHitCount(prepareSearch().setSize(0), docs - expected);
}
public void testDeleteByMatchQuery() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
index b44c49982e31..7af46dd994fb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
@@ -48,12 +48,12 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase {
refresh();
try {
updateIndexSettings(Settings.builder().put(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE, true), "test");
- assertSearchHits(client().prepareSearch(), "1");
+ assertSearchHits(prepareSearch(), "1");
assertBlocked(
client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"),
IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK
);
- assertSearchHits(client().prepareSearch(), "1");
+ assertSearchHits(prepareSearch(), "1");
assertAcked(indicesAdmin().prepareDelete("test"));
} finally {
Settings settings = Settings.builder().putNull(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE).build();
@@ -92,7 +92,7 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase {
refresh();
try {
updateClusterSettings(Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), true));
- assertSearchHits(client().prepareSearch(), "1");
+ assertSearchHits(prepareSearch(), "1");
assertBlocked(
client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"),
Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK
@@ -101,7 +101,7 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase {
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 2)),
Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK
);
- assertSearchHits(client().prepareSearch(), "1");
+ assertSearchHits(prepareSearch(), "1");
assertAcked(indicesAdmin().prepareDelete("test"));
} finally {
updateClusterSettings(Settings.builder().putNull(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey()));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java
index 0f1295951932..9433f93d91f5 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java
@@ -514,7 +514,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase {
refresh();
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
}
public void testFailingVersionedUpdatedOnBulk() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java
index 2f8199297314..e931cd0da822 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java
@@ -83,7 +83,7 @@ public class PointInTimeIT extends ESIntegTestCase {
}
refresh("test");
String pitId = openPointInTime(new String[] { "test" }, TimeValue.timeValueMinutes(2));
- SearchResponse resp1 = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ SearchResponse resp1 = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertThat(resp1.pointInTimeId(), equalTo(pitId));
assertHitCount(resp1, numDocs);
int deletedDocs = 0;
@@ -101,8 +101,7 @@ public class PointInTimeIT extends ESIntegTestCase {
assertHitCount(resp2, numDocs - deletedDocs);
}
try {
- SearchResponse resp3 = client().prepareSearch()
- .setPreference(null)
+ SearchResponse resp3 = prepareSearch().setPreference(null)
.setQuery(new MatchAllQueryBuilder())
.setPointInTime(new PointInTimeBuilder(pitId))
.get();
@@ -128,7 +127,7 @@ public class PointInTimeIT extends ESIntegTestCase {
refresh();
String pitId = openPointInTime(new String[] { "*" }, TimeValue.timeValueMinutes(2));
try {
- SearchResponse resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ SearchResponse resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs);
assertNotNull(resp.pointInTimeId());
@@ -140,11 +139,11 @@ public class PointInTimeIT extends ESIntegTestCase {
client().prepareIndex(index).setId(id).setSource("value", i).get();
}
refresh();
- resp = client().prepareSearch().get();
+ resp = prepareSearch().get();
assertNoFailures(resp);
assertHitCount(resp, numDocs + moreDocs);
- resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs);
assertNotNull(resp.pointInTimeId());
@@ -165,7 +164,7 @@ public class PointInTimeIT extends ESIntegTestCase {
refresh();
String pitId = openPointInTime(new String[] { "test" }, TimeValue.timeValueMinutes(2));
try {
- SearchResponse resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ SearchResponse resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs);
assertThat(resp.pointInTimeId(), equalTo(pitId));
@@ -185,7 +184,7 @@ public class PointInTimeIT extends ESIntegTestCase {
}
refresh();
}
- resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs);
assertThat(resp.pointInTimeId(), equalTo(pitId));
@@ -198,7 +197,7 @@ public class PointInTimeIT extends ESIntegTestCase {
.collect(Collectors.toSet());
assertThat(assignedNodes, everyItem(not(in(excludedNodes))));
}, 30, TimeUnit.SECONDS);
- resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs);
assertThat(resp.pointInTimeId(), equalTo(pitId));
@@ -216,7 +215,7 @@ public class PointInTimeIT extends ESIntegTestCase {
}
refresh();
String pit = openPointInTime(new String[] { "index" }, TimeValue.timeValueSeconds(5));
- SearchResponse resp1 = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get();
+ SearchResponse resp1 = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get();
assertNoFailures(resp1);
assertHitCount(resp1, index1);
if (rarely()) {
@@ -229,7 +228,7 @@ public class PointInTimeIT extends ESIntegTestCase {
}
SearchPhaseExecutionException e = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get()
+ () -> prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get()
);
for (ShardSearchFailure failure : e.shardFailures()) {
assertThat(ExceptionsHelper.unwrapCause(failure.getCause()), instanceOf(SearchContextMissingException.class));
@@ -254,7 +253,7 @@ public class PointInTimeIT extends ESIntegTestCase {
refresh();
String pit = openPointInTime(new String[] { "index-*" }, TimeValue.timeValueMinutes(2));
try {
- SearchResponse resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get();
+ SearchResponse resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pit)).get();
assertNoFailures(resp);
assertHitCount(resp, index1 + index2);
indicesAdmin().prepareDelete("index-1").get();
@@ -265,19 +264,14 @@ public class PointInTimeIT extends ESIntegTestCase {
}
// Allow partial search result
- resp = client().prepareSearch()
- .setPreference(null)
- .setAllowPartialSearchResults(true)
- .setPointInTime(new PointInTimeBuilder(pit))
- .get();
+ resp = prepareSearch().setPreference(null).setAllowPartialSearchResults(true).setPointInTime(new PointInTimeBuilder(pit)).get();
assertFailures(resp);
assertHitCount(resp, index2);
// Do not allow partial search result
expectThrows(
ElasticsearchException.class,
- () -> client().prepareSearch()
- .setPreference(null)
+ () -> prepareSearch().setPreference(null)
.setAllowPartialSearchResults(false)
.setPointInTime(new PointInTimeBuilder(pit))
.get()
@@ -313,8 +307,7 @@ public class PointInTimeIT extends ESIntegTestCase {
}
}
client().prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get();
- SearchResponse resp = client().prepareSearch()
- .setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03"))
+ SearchResponse resp = prepareSearch().setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03"))
.setSearchType(SearchType.QUERY_THEN_FETCH)
.setPreference(null)
.setPreFilterShardSize(randomIntBetween(2, 3))
@@ -373,14 +366,13 @@ public class PointInTimeIT extends ESIntegTestCase {
refresh();
String pitId = openPointInTime(new String[] { "test-*" }, TimeValue.timeValueMinutes(2));
try {
- SearchResponse resp = client().prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
+ SearchResponse resp = prepareSearch().setPreference(null).setPointInTime(new PointInTimeBuilder(pitId)).get();
assertNoFailures(resp);
assertHitCount(resp, numDocs1 + numDocs2);
assertThat(resp.pointInTimeId(), equalTo(pitId));
internalCluster().restartNode(assignedNodeForIndex1);
- resp = client().prepareSearch()
- .setPreference(null)
+ resp = prepareSearch().setPreference(null)
.setAllowPartialSearchResults(true)
.setPointInTime(new PointInTimeBuilder(pitId))
.get();
@@ -491,7 +483,7 @@ public class PointInTimeIT extends ESIntegTestCase {
@SuppressWarnings({ "rawtypes", "unchecked" })
private void assertPagination(PointInTimeBuilder pit, int expectedNumDocs, int size, SortBuilder... sorts) throws Exception {
Set seen = new HashSet<>();
- SearchRequestBuilder builder = client().prepareSearch().setSize(size).setPointInTime(pit);
+ SearchRequestBuilder builder = prepareSearch().setSize(size).setPointInTime(pit);
for (SortBuilder sort : sorts) {
builder.addSort(sort);
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java
index 93f6c83b16c1..d84d4270af24 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java
@@ -388,7 +388,7 @@ public class TransportSearchIT extends ESIntegTestCase {
// no exception
prepareSearch("test1").get();
- e = expectThrows(IllegalArgumentException.class, () -> client().prepareSearch("test1", "test2").get());
+ e = expectThrows(IllegalArgumentException.class, () -> prepareSearch("test1", "test2").get());
assertThat(
e.getMessage(),
containsString(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
index 978b9dda888f..c1ca4c60f176 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java
@@ -311,7 +311,7 @@ public class IndexAliasesIT extends ESIntegTestCase {
terms = searchResponse.getAggregations().get("test");
assertThat(terms.getBuckets().size(), equalTo(2));
- searchResponse = client().prepareSearch("foos", "bars").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("foos", "bars").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2");
logger.info("--> checking single non-filtering alias search");
@@ -319,15 +319,15 @@ public class IndexAliasesIT extends ESIntegTestCase {
assertHits(searchResponse.getHits(), "1", "2", "3", "4");
logger.info("--> checking non-filtering alias and filtering alias search");
- searchResponse = client().prepareSearch("alias1", "foos").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("alias1", "foos").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2", "3", "4");
logger.info("--> checking index and filtering alias search");
- searchResponse = client().prepareSearch("test", "foos").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("test", "foos").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2", "3", "4");
logger.info("--> checking index and alias wildcard search");
- searchResponse = client().prepareSearch("te*", "fo*").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("te*", "fo*").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2", "3", "4");
}
@@ -389,45 +389,34 @@ public class IndexAliasesIT extends ESIntegTestCase {
);
logger.info("--> checking filtering alias for two indices and one complete index");
- searchResponse = client().prepareSearch("foos", "test1").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("foos", "test1").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2", "3", "4", "5");
assertThat(
- client().prepareSearch("foos", "test1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
+ prepareSearch("foos", "test1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(5L)
);
logger.info("--> checking filtering alias for two indices and non-filtering alias for one index");
- searchResponse = client().prepareSearch("foos", "aliasToTest1").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("foos", "aliasToTest1").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "1", "2", "3", "4", "5");
assertThat(
- client().prepareSearch("foos", "aliasToTest1")
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .get()
- .getHits()
- .getTotalHits().value,
+ prepareSearch("foos", "aliasToTest1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(5L)
);
logger.info("--> checking filtering alias for two indices and non-filtering alias for both indices");
- searchResponse = client().prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.matchAllQuery()).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(8L));
assertThat(
- client().prepareSearch("foos", "aliasToTests")
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .get()
- .getHits()
- .getTotalHits().value,
+ prepareSearch("foos", "aliasToTests").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(8L)
);
logger.info("--> checking filtering alias for two indices and non-filtering alias for both indices");
- searchResponse = client().prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.termQuery("name", "something")).get();
+ searchResponse = prepareSearch("foos", "aliasToTests").setQuery(QueryBuilders.termQuery("name", "something")).get();
assertHits(searchResponse.getHits(), "4", "8");
assertThat(
- client().prepareSearch("foos", "aliasToTests")
- .setSize(0)
+ prepareSearch("foos", "aliasToTests").setSize(0)
.setQuery(QueryBuilders.termQuery("name", "something"))
.get()
.getHits()
@@ -488,47 +477,31 @@ public class IndexAliasesIT extends ESIntegTestCase {
refresh();
logger.info("--> checking filtering alias for multiple indices");
- SearchResponse searchResponse = client().prepareSearch("filter23", "filter13").setQuery(QueryBuilders.matchAllQuery()).get();
+ SearchResponse searchResponse = prepareSearch("filter23", "filter13").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "21", "31", "13", "33");
assertThat(
- client().prepareSearch("filter23", "filter13")
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .get()
- .getHits()
- .getTotalHits().value,
+ prepareSearch("filter23", "filter13").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(4L)
);
- searchResponse = client().prepareSearch("filter23", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("filter23", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "21", "31", "11", "12", "13");
assertThat(
- client().prepareSearch("filter23", "filter1")
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .get()
- .getHits()
- .getTotalHits().value,
+ prepareSearch("filter23", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(5L)
);
- searchResponse = client().prepareSearch("filter13", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("filter13", "filter1").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "11", "12", "13", "33");
assertThat(
- client().prepareSearch("filter13", "filter1")
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .get()
- .getHits()
- .getTotalHits().value,
+ prepareSearch("filter13", "filter1").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value,
equalTo(4L)
);
- searchResponse = client().prepareSearch("filter13", "filter1", "filter23").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("filter13", "filter1", "filter23").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "11", "12", "13", "21", "31", "33");
assertThat(
- client().prepareSearch("filter13", "filter1", "filter23")
- .setSize(0)
+ prepareSearch("filter13", "filter1", "filter23").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.get()
.getHits()
@@ -536,11 +509,10 @@ public class IndexAliasesIT extends ESIntegTestCase {
equalTo(6L)
);
- searchResponse = client().prepareSearch("filter23", "filter13", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("filter23", "filter13", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "21", "22", "23", "31", "13", "33");
assertThat(
- client().prepareSearch("filter23", "filter13", "test2")
- .setSize(0)
+ prepareSearch("filter23", "filter13", "test2").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.get()
.getHits()
@@ -548,11 +520,10 @@ public class IndexAliasesIT extends ESIntegTestCase {
equalTo(6L)
);
- searchResponse = client().prepareSearch("filter23", "filter13", "test1", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
+ searchResponse = prepareSearch("filter23", "filter13", "test1", "test2").setQuery(QueryBuilders.matchAllQuery()).get();
assertHits(searchResponse.getHits(), "11", "12", "13", "21", "22", "23", "31", "33");
assertThat(
- client().prepareSearch("filter23", "filter13", "test1", "test2")
- .setSize(0)
+ prepareSearch("filter23", "filter13", "test1", "test2").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.get()
.getHits()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
index c0bd061e3e96..c437f2b5a4c8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java
@@ -107,13 +107,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
logger.info("--> verify we get the data back");
for (int i = 0; i < 10; i++) {
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(100L)
);
}
@@ -161,7 +155,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
logger.info("--> verify we get the data back after cluster reform");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
+ assertHitCount(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
}
logger.info("--> clearing voting config exclusions");
@@ -208,7 +202,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
logger.info("--> verify we the data back");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
+ assertHitCount(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
}
}
@@ -261,7 +255,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
refresh();
logger.info("--> verify we get the data back");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
+ assertHitCount(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
}
List nonMasterNodes = new ArrayList<>(
@@ -290,7 +284,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase {
logger.info("--> verify we the data back");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
+ assertHitCount(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()), 100);
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
index b91fbb1c9b79..f2fb19825371 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java
@@ -52,13 +52,7 @@ public class FilteringAllocationIT extends ESIntegTestCase {
}
indicesAdmin().prepareRefresh().execute().actionGet();
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(100L)
);
@@ -89,13 +83,7 @@ public class FilteringAllocationIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().execute().actionGet();
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(100L)
);
}
@@ -151,13 +139,7 @@ public class FilteringAllocationIT extends ESIntegTestCase {
}
indicesAdmin().prepareRefresh().execute().actionGet();
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(100L)
);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
index a086f3e0b777..73ea91155a08 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
@@ -177,7 +177,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
logger.info("--> check that the up-to-date primary shard gets promoted and that documents are available");
ensureYellow("test");
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2L);
}
public void testFailedAllocationOfStalePrimaryToDataNodeWithNoData() throws Exception {
@@ -475,7 +475,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
internalCluster().restartRandomDataNode();
logger.info("--> checking that index still gets allocated with only 1 shard copy being available");
ensureYellow("test");
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 1L);
}
/**
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
index 0f42b5999920..4d451971a656 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java
@@ -526,8 +526,7 @@ public class ShardRoutingRoleIT extends ESIntegTestCase {
}
String pitId = client().execute(OpenPointInTimeAction.INSTANCE, openRequest).actionGet().getPointInTimeId();
try {
- final var profileResults = client().prepareSearch()
- .setPointInTime(new PointInTimeBuilder(pitId))
+ final var profileResults = prepareSearch().setPointInTime(new PointInTimeBuilder(pitId))
.setProfile(true)
.get()
.getProfileResults();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java
index 848f16b7cd5d..2561799b475a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java
@@ -63,6 +63,6 @@ public class ClusterDisruptionCleanSettingsIT extends ESIntegTestCase {
IndicesStoreIntegrationIT.relocateAndBlockCompletion(logger, "test", 0, node_1, node_2);
// now search for the documents and see if we get a reply
- assertThat(client().prepareSearch().setSize(0).get().getHits().getTotalHits().value, equalTo(100L));
+ assertThat(prepareSearch().setSize(0).get().getHits().getTotalHits().value, equalTo(100L));
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
index f791f527862d..30940c1e154b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java
@@ -238,7 +238,7 @@ public class NodeEnvironmentIT extends ESIntegTestCase {
assertEquals(nodeId, clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId());
assertTrue(indexExists("test"));
ensureYellow("test");
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
}
public void testFailsToStartOnDataPathsFromMultipleNodes() throws IOException {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
index ff47be7ee4e0..e995d815af0f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java
@@ -283,7 +283,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
logger.info("--> verify 1 doc in the index");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
}
logger.info("--> closing test index...");
@@ -306,9 +306,9 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
assertThat(health.isTimedOut(), equalTo(false));
logger.info("--> verify 1 doc in the index");
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
}
}
@@ -548,7 +548,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase {
assertNull(
state.metadata().persistentSettings().get("archived." + ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE.getKey())
);
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L);
}
public void testHalfDeletedIndexImport() throws Exception {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
index 1e2b03d775ee..a77201e1e141 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java
@@ -50,7 +50,7 @@ public class QuorumGatewayIT extends ESIntegTestCase {
refresh();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2L);
}
logger.info("--> restart all nodes");
internalCluster().fullRestart(new RestartCallback() {
@@ -90,7 +90,7 @@ public class QuorumGatewayIT extends ESIntegTestCase {
ensureGreen();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 3L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 3L);
}
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
index 6d923bf5821b..81149efb1596 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java
@@ -123,7 +123,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
.actionGet();
refresh();
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
ensureYellow("test"); // wait for primary allocations here otherwise if we have a lot of shards we might have a
// shard that is still in post recovery when we restart and the ensureYellow() below will timeout
@@ -135,7 +135,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
indicesAdmin().prepareRefresh().execute().actionGet();
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
internalCluster().fullRestart();
@@ -144,7 +144,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
indicesAdmin().prepareRefresh().execute().actionGet();
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("appAccountIds", 179)), 2);
}
private Map assertAndCapturePrimaryTerms(Map previousTerms) {
@@ -233,10 +233,10 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
refresh();
for (int i = 0; i <= randomInt(10); i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
}
if (indexToAllShards == false) {
// we have to verify primaries are started for them to be restored
@@ -253,10 +253,10 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
for (int i = 0; i <= randomInt(10); i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
}
internalCluster().fullRestart();
@@ -266,10 +266,10 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
for (int i = 0; i <= randomInt(10); i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
- assertHitCount(client().prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), value1Docs + value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value1")), value1Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("field", "value2")), value2Docs);
+ assertHitCount(prepareSearch().setSize(0).setQuery(termQuery("num", 179)), value1Docs);
}
}
@@ -288,7 +288,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
.actionGet();
refresh();
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
ensureYellow("test"); // wait for primary allocations here otherwise if we have a lot of shards we might have a
// shard that is still in post recovery when we restart and the ensureYellow() below will timeout
@@ -302,7 +302,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
}
internalCluster().fullRestart();
@@ -312,7 +312,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
}
}
@@ -337,7 +337,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
ensureGreen();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
}
Map primaryTerms = assertAndCapturePrimaryTerms(null);
@@ -365,7 +365,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
primaryTerms = assertAndCapturePrimaryTerms(primaryTerms);
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
}
client().execute(ClearVotingConfigExclusionsAction.INSTANCE, new ClearVotingConfigExclusionsRequest()).get();
@@ -395,7 +395,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
ensureGreen();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2);
}
String metadataUuid = clusterAdmin().prepareState().execute().get().getState().getMetadata().clusterUUID();
@@ -418,7 +418,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
logger.info("--> checking if documents exist, there should be 3");
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 3);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 3);
}
logger.info("--> add some metadata and additional template");
@@ -462,7 +462,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase {
assertThat(clusterAdmin().prepareState().execute().get().getState().getMetadata().clusterUUID(), equalTo(metadataUuid));
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 3);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 3);
}
ClusterState state = clusterAdmin().prepareState().execute().actionGet().getState();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
index 29475583dc44..9219b732ddb0 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java
@@ -166,7 +166,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).get());
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).get());
// we have to flush at least once here since we don't corrupt the translog
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
final int numShards = numShards("test");
ShardRouting corruptedShardRouting = corruptRandomPrimaryFile();
@@ -192,7 +192,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
assertThat(health.getStatus(), equalTo(ClusterHealthStatus.GREEN));
final int numIterations = scaledRandomIntBetween(5, 20);
for (int i = 0; i < numIterations; i++) {
- assertHitCount(client().prepareSearch().setSize(numDocs), numDocs);
+ assertHitCount(prepareSearch().setSize(numDocs), numDocs);
}
/*
@@ -277,7 +277,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).get());
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).get());
// we have to flush at least once here since we don't corrupt the translog
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
ShardRouting shardRouting = corruptRandomPrimaryFile();
/*
@@ -411,7 +411,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
ensureGreen();
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).execute().actionGet());
// we have to flush at least once here since we don't corrupt the translog
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
var source = (MockTransportService) internalCluster().getInstance(TransportService.class, primariesNode.getName());
var target = internalCluster().getInstance(TransportService.class, unluckyNode.getName());
@@ -509,7 +509,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
final int numIterations = scaledRandomIntBetween(5, 20);
for (int i = 0; i < numIterations; i++) {
- assertHitCount(client().prepareSearch().setSize(numDocs), numDocs);
+ assertHitCount(prepareSearch().setSize(numDocs), numDocs);
}
}
@@ -550,7 +550,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
ensureGreen();
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).execute().actionGet());
// we have to flush at least once here since we don't corrupt the translog
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
ShardRouting shardRouting = corruptRandomPrimaryFile(false);
logger.info("--> shard {} has a corrupted file", shardRouting);
@@ -617,7 +617,7 @@ public class CorruptedFileIT extends ESIntegTestCase {
ensureGreen();
assertAllSuccessful(indicesAdmin().prepareFlush().setForce(true).execute().actionGet());
// we have to flush at least once here since we don't corrupt the translog
- assertHitCount(client().prepareSearch().setSize(0), numDocs);
+ assertHitCount(prepareSearch().setSize(0), numDocs);
// disable allocations of replicas post restart (the restart will change replicas to primaries, so we have
// to capture replicas post restart)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
index cbe7af4d05d9..211e34c99ec2 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java
@@ -87,7 +87,7 @@ public class DateMathIndexExpressionsIntegrationIT extends ESIntegTestCase {
client().prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get();
refresh();
- SearchResponse searchResponse = dateSensitiveGet(client().prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
+ SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
assertHitCount(searchResponse, 3);
assertSearchHits(searchResponse, "1", "2", "3");
@@ -144,7 +144,7 @@ public class DateMathIndexExpressionsIntegrationIT extends ESIntegTestCase {
client().prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get();
refresh();
- SearchResponse searchResponse = dateSensitiveGet(client().prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
+ SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3));
assertHitCount(searchResponse, 3);
assertSearchHits(searchResponse, "1", "2", "3");
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
index e46564314326..7bedd163c253 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java
@@ -396,25 +396,19 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase {
createIndex("test1");
client().prepareIndex("test1").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get();
assertHitCount(prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 0L);
- assertHitCount(
- client().prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen()),
- 0L
- );
+ assertHitCount(prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen()), 0L);
// you should still be able to run empty searches without things blowing up
- assertHitCount(client().prepareSearch().setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 1L);
+ assertHitCount(prepareSearch().setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 1L);
}
public void testAllMissingStrict() throws Exception {
createIndex("test1");
expectThrows(IndexNotFoundException.class, () -> prepareSearch("test2").setQuery(matchAllQuery()).execute().actionGet());
- expectThrows(
- IndexNotFoundException.class,
- () -> client().prepareSearch("test2", "test3").setQuery(matchAllQuery()).execute().actionGet()
- );
+ expectThrows(IndexNotFoundException.class, () -> prepareSearch("test2", "test3").setQuery(matchAllQuery()).execute().actionGet());
// you should still be able to run empty searches without things blowing up
- client().prepareSearch().setQuery(matchAllQuery()).execute().actionGet();
+ prepareSearch().setQuery(matchAllQuery()).execute().actionGet();
}
// For now don't handle closed indices
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java
index 1e8f5b7f1f5e..5958f1ad5793 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java
@@ -152,7 +152,7 @@ public class RandomExceptionCircuitBreakerIT extends ESIntegTestCase {
}
for (int i = 0; i < numSearches; i++) {
- SearchRequestBuilder searchRequestBuilder = client().prepareSearch().setQuery(QueryBuilders.matchAllQuery());
+ SearchRequestBuilder searchRequestBuilder = prepareSearch().setQuery(QueryBuilders.matchAllQuery());
if (random().nextBoolean()) {
searchRequestBuilder.addSort("test-str", SortOrder.ASC);
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
index 7ab3cecb95d8..60be1f11371d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
@@ -1076,7 +1076,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase {
}
indicesAdmin().prepareRefresh("test").get();
- assertHitCount(client().prepareSearch(), numDocs);
+ assertHitCount(prepareSearch(), numDocs);
}
/** Makes sure the new master does not repeatedly fetch index metadata from recovering replicas */
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
index 4631a4fb7cf4..0a8c7ffc9d29 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
@@ -62,7 +62,7 @@ public class UpdateNumberOfReplicasIT extends ESIntegTestCase {
refresh();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 10L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 10L);
}
final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
@@ -118,7 +118,7 @@ public class UpdateNumberOfReplicasIT extends ESIntegTestCase {
assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries * 3));
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 10L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 10L);
}
logger.info("Decreasing number of replicas from 2 to 0");
@@ -141,7 +141,7 @@ public class UpdateNumberOfReplicasIT extends ESIntegTestCase {
assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.numPrimaries));
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setQuery(matchAllQuery()), 10);
+ assertHitCount(prepareSearch().setQuery(matchAllQuery()), 10);
}
final long afterReplicaDecreaseSettingsVersion = clusterAdmin().prepareState()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
index 70ef73862016..1ce0c0985b70 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java
@@ -296,7 +296,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase {
// check the index still contains the records that we indexed
indicesAdmin().prepareOpen("test").execute().get();
ensureGreen();
- SearchResponse searchResponse = client().prepareSearch().setQuery(QueryBuilders.matchQuery("test", "init")).get();
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("test", "init")).get();
assertNoFailures(searchResponse);
assertHitCount(searchResponse, docs);
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
index d4d3596349b9..73f3dd88c9ce 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
@@ -151,8 +151,8 @@ public class IndexStatsIT extends ESIntegTestCase {
assertThat(indicesStats.getTotal().getFieldData().getMemorySizeInBytes(), equalTo(0L));
// sort to load it to field data...
- client().prepareSearch().addSort("field", SortOrder.ASC).execute().actionGet();
- client().prepareSearch().addSort("field", SortOrder.ASC).execute().actionGet();
+ prepareSearch().addSort("field", SortOrder.ASC).execute().actionGet();
+ prepareSearch().addSort("field", SortOrder.ASC).execute().actionGet();
nodesStats = clusterAdmin().prepareNodesStats("data:true").setIndices(true).execute().actionGet();
assertThat(
@@ -167,8 +167,8 @@ public class IndexStatsIT extends ESIntegTestCase {
assertThat(indicesStats.getTotal().getFieldData().getMemorySizeInBytes(), greaterThan(0L));
// sort to load it to field data...
- client().prepareSearch().addSort("field2", SortOrder.ASC).execute().actionGet();
- client().prepareSearch().addSort("field2", SortOrder.ASC).execute().actionGet();
+ prepareSearch().addSort("field2", SortOrder.ASC).execute().actionGet();
+ prepareSearch().addSort("field2", SortOrder.ASC).execute().actionGet();
// now check the per field stats
nodesStats = clusterAdmin().prepareNodesStats("data:true")
@@ -272,16 +272,8 @@ public class IndexStatsIT extends ESIntegTestCase {
assertThat(indicesStats.getTotal().getQueryCache().getMemorySizeInBytes(), equalTo(0L));
// sort to load it to field data and filter to load filter cache
- client().prepareSearch()
- .setPostFilter(QueryBuilders.termQuery("field", "value1"))
- .addSort("field", SortOrder.ASC)
- .execute()
- .actionGet();
- client().prepareSearch()
- .setPostFilter(QueryBuilders.termQuery("field", "value2"))
- .addSort("field", SortOrder.ASC)
- .execute()
- .actionGet();
+ prepareSearch().setPostFilter(QueryBuilders.termQuery("field", "value1")).addSort("field", SortOrder.ASC).execute().actionGet();
+ prepareSearch().setPostFilter(QueryBuilders.termQuery("field", "value2")).addSort("field", SortOrder.ASC).execute().actionGet();
nodesStats = clusterAdmin().prepareNodesStats("data:true").setIndices(true).execute().actionGet();
assertThat(
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
index fa8b782ff930..f4aa261b0962 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java
@@ -95,7 +95,7 @@ public class FullRollingRestartIT extends ESIntegTestCase {
logger.info("--> refreshing and checking data");
refresh();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
}
// now start shutting nodes down
@@ -124,7 +124,7 @@ public class FullRollingRestartIT extends ESIntegTestCase {
logger.info("--> stopped two nodes, verifying data");
refresh();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
}
// closing the 3rd node
@@ -154,7 +154,7 @@ public class FullRollingRestartIT extends ESIntegTestCase {
logger.info("--> one node left, verifying data");
refresh();
for (int i = 0; i < 10; i++) {
- assertHitCount(client().prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
+ assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2000L);
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
index a05d9bffa48f..bfd16adaa405 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java
@@ -319,8 +319,7 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase {
SearchResponse[] iterationResults = new SearchResponse[iterations];
boolean error = false;
for (int i = 0; i < iterations; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setSize((int) numberOfDocs)
+ SearchResponse searchResponse = prepareSearch().setSize((int) numberOfDocs)
.setQuery(matchAllQuery())
.setTrackTotalHits(true)
.addSort("id", SortOrder.ASC)
@@ -370,11 +369,7 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase {
assertBusy(() -> {
boolean errorOccurred = false;
for (int i = 0; i < iterations; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setTrackTotalHits(true)
- .setSize(0)
- .setQuery(matchAllQuery())
- .get();
+ SearchResponse searchResponse = prepareSearch().setTrackTotalHits(true).setSize(0).setQuery(matchAllQuery()).get();
if (searchResponse.getHits().getTotalHits().value != numberOfDocs) {
errorOccurred = true;
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
index c221fbf78ccc..ea392e14104f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java
@@ -522,7 +522,7 @@ public class RelocationIT extends ESIntegTestCase {
final int numIters = randomIntBetween(10, 20);
for (int i = 0; i < numIters; i++) {
logger.info(" --> checking iteration {}", i);
- assertSearchHitsWithoutFailures(client().prepareSearch().setSize(ids.size()), ids.toArray(Strings.EMPTY_ARRAY));
+ assertSearchHitsWithoutFailures(prepareSearch().setSize(ids.size()), ids.toArray(Strings.EMPTY_ARRAY));
}
stopped.set(true);
for (Thread searchThread : searchThreads) {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java
index ba845d3525df..74b0b5a1ef86 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java
@@ -93,7 +93,7 @@ public class TruncatedRecoveryIT extends ESIntegTestCase {
indexRandom(true, builder);
for (int i = 0; i < numDocs; i++) {
String id = Integer.toString(i);
- assertHitCount(client().prepareSearch().setQuery(QueryBuilders.termQuery("the_id", id)), 1);
+ assertHitCount(prepareSearch().setQuery(QueryBuilders.termQuery("the_id", id)), 1);
}
ensureGreen();
// ensure we have flushed segments and make them a big one via optimize
@@ -143,7 +143,7 @@ public class TruncatedRecoveryIT extends ESIntegTestCase {
ensureGreen("test");
for (int i = 0; i < numDocs; i++) {
String id = Integer.toString(i);
- assertHitCount(client().prepareSearch().setQuery(QueryBuilders.termQuery("the_id", id)), 1);
+ assertHitCount(prepareSearch().setQuery(QueryBuilders.termQuery("the_id", id)), 1);
}
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
index 70c306a08d60..478cae8746f8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java
@@ -43,10 +43,7 @@ public class AliasResolveRoutingIT extends ESIntegTestCase {
);
refresh("test-*");
assertHitCount(
- client().prepareSearch()
- .setIndices("alias-*")
- .setIndicesOptions(IndicesOptions.lenientExpandOpen())
- .setQuery(queryStringQuery("quick")),
+ prepareSearch().setIndices("alias-*").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(queryStringQuery("quick")),
3L
);
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java
index 7acd0e8b62ff..7ee081ffd433 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java
@@ -121,7 +121,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with no routing, should fine one");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
+ prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(1L)
);
}
@@ -129,8 +129,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with wrong routing, should not find");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("1")
+ prepareSearch().setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -140,8 +139,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -171,8 +169,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("0")
+ prepareSearch().setRouting("0")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -181,8 +178,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("0")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -212,17 +208,11 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with no routing, should fine two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
+ prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(2L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(2L)
);
}
@@ -230,8 +220,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with 0 routing, should find one");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("0")
+ prepareSearch().setRouting("0")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -240,8 +229,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("0")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -268,8 +256,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with 1 routing, should find one");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("1")
+ prepareSearch().setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -278,8 +265,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -306,8 +292,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with 0,1 indexRoutings , should find two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("0", "1")
+ prepareSearch().setRouting("0", "1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -316,8 +301,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("0", "1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -344,8 +328,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with two routing aliases , should find two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch("alias0", "alias1")
- .setQuery(QueryBuilders.matchAllQuery())
+ prepareSearch("alias0", "alias1").setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
.getHits()
@@ -353,8 +336,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch("alias0", "alias1")
- .setSize(0)
+ prepareSearch("alias0", "alias1").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -367,8 +349,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with alias0, alias1 and alias01, should find two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch("alias0", "alias1", "alias01")
- .setQuery(QueryBuilders.matchAllQuery())
+ prepareSearch("alias0", "alias1", "alias01").setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
.getHits()
@@ -376,8 +357,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch("alias0", "alias1", "alias01")
- .setSize(0)
+ prepareSearch("alias0", "alias1", "alias01").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -390,8 +370,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with test, alias0 and alias1, should find two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch("test", "alias0", "alias1")
- .setQuery(QueryBuilders.matchAllQuery())
+ prepareSearch("test", "alias0", "alias1").setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
.getHits()
@@ -399,8 +378,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch("test", "alias0", "alias1")
- .setSize(0)
+ prepareSearch("test", "alias0", "alias1").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -458,8 +436,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with alias-a1,alias-b0, should not find");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch("alias-a1", "alias-b0")
- .setQuery(QueryBuilders.matchAllQuery())
+ prepareSearch("alias-a1", "alias-b0").setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
.getHits()
@@ -467,8 +444,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(0L)
);
assertThat(
- client().prepareSearch("alias-a1", "alias-b0")
- .setSize(0)
+ prepareSearch("alias-a1", "alias-b0").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -498,8 +474,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
logger.info("--> search with alias-a0,alias-b1 should find two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch("alias-a0", "alias-b1")
- .setQuery(QueryBuilders.matchAllQuery())
+ prepareSearch("alias-a0", "alias-b1").setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
.getHits()
@@ -507,8 +482,7 @@ public class AliasRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch("alias-a0", "alias-b1")
- .setSize(0)
+ prepareSearch("alias-a0", "alias-b1").setSize(0)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
index 72729172d6c5..4b685ca2699b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java
@@ -145,8 +145,7 @@ public class PartitionedRoutingIT extends ESIntegTestCase {
String routing = routingEntry.getKey();
int expectedDocuments = routingEntry.getValue().size();
- SearchResponse response = client().prepareSearch()
- .setQuery(QueryBuilders.termQuery("_routing", routing))
+ SearchResponse response = prepareSearch().setQuery(QueryBuilders.termQuery("_routing", routing))
.setRouting(routing)
.setIndices(index)
.setSize(100)
@@ -183,8 +182,7 @@ public class PartitionedRoutingIT extends ESIntegTestCase {
String routing = routingEntry.getKey();
int expectedDocuments = routingEntry.getValue().size();
- SearchResponse response = client().prepareSearch()
- .setQuery(QueryBuilders.termQuery("_routing", routing))
+ SearchResponse response = prepareSearch().setQuery(QueryBuilders.termQuery("_routing", routing))
.setIndices(index)
.setSize(100)
.execute()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
index f1417d2f230a..93b1ac68be6a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java
@@ -138,7 +138,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with no routing, should fine one");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
+ prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(1L)
);
}
@@ -146,8 +146,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with wrong routing, should not find");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("1")
+ prepareSearch().setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -156,8 +155,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(0L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -171,8 +169,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with correct routing, should find");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting(routingValue)
+ prepareSearch().setRouting(routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -181,8 +178,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting(routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -205,17 +201,11 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with no routing, should fine two");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
+ prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(2L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
- .setQuery(QueryBuilders.matchAllQuery())
- .execute()
- .actionGet()
- .getHits()
- .getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value,
equalTo(2L)
);
}
@@ -223,8 +213,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with {} routing, should find one", routingValue);
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting(routingValue)
+ prepareSearch().setRouting(routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -233,8 +222,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting(routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -248,8 +236,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with {} routing, should find one", secondRoutingValue);
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting("1")
+ prepareSearch().setRouting("1")
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -258,8 +245,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(1L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting(secondRoutingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -273,8 +259,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with {},{} indexRoutings , should find two", routingValue, "1");
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting(routingValue, secondRoutingValue)
+ prepareSearch().setRouting(routingValue, secondRoutingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -283,8 +268,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting(routingValue, secondRoutingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
@@ -298,8 +282,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
logger.info("--> search with {},{},{} indexRoutings , should find two", routingValue, secondRoutingValue, routingValue);
for (int i = 0; i < 5; i++) {
assertThat(
- client().prepareSearch()
- .setRouting(routingValue, secondRoutingValue, routingValue)
+ prepareSearch().setRouting(routingValue, secondRoutingValue, routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
.actionGet()
@@ -308,8 +291,7 @@ public class SimpleRoutingIT extends ESIntegTestCase {
equalTo(2L)
);
assertThat(
- client().prepareSearch()
- .setSize(0)
+ prepareSearch().setSize(0)
.setRouting(routingValue, secondRoutingValue, routingValue)
.setQuery(QueryBuilders.matchAllQuery())
.execute()
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
index b452b4da6e2d..3202037c8486 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java
@@ -48,7 +48,7 @@ public class SearchWithRejectionsIT extends ESIntegTestCase {
SearchType searchType = randomFrom(SearchType.DEFAULT, SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_THEN_FETCH);
logger.info("search type is {}", searchType);
for (int i = 0; i < numSearches; i++) {
- responses[i] = client().prepareSearch().setQuery(matchAllQuery()).setSearchType(searchType).execute();
+ responses[i] = prepareSearch().setQuery(matchAllQuery()).setSearchType(searchType).execute();
}
for (int i = 0; i < numSearches; i++) {
try {
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
index 8031c467a47a..d0a4fa486569 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
@@ -900,9 +900,9 @@ public class DateHistogramIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH))
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
index 79b9b0b3628d..f67a7461d3ba 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
@@ -510,14 +510,9 @@ public class DateRangeIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- dateRange("range").field("date")
- .addUnboundedTo(date(2, 15))
- .addRange(date(2, 15), date(3, 15))
- .addUnboundedFrom(date(3, 15))
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ dateRange("range").field("date").addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15))
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java
index 49e27ff40174..612b4bf006aa 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DiversifiedSamplerIT.java
@@ -205,8 +205,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase {
.field("author")
.maxDocsPerValue(1);
sampleAgg.subAggregation(terms("authors").field("author"));
- SearchResponse response = client().prepareSearch("idx_unmapped_author", "test")
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse response = prepareSearch("idx_unmapped_author", "test").setSearchType(SearchType.QUERY_THEN_FETCH)
.setQuery(new TermQueryBuilder("genre", "fantasy"))
.setFrom(0)
.setSize(60)
@@ -225,8 +224,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase {
DiversifiedAggregationBuilder sampleAgg = new DiversifiedAggregationBuilder("sample").shardSize(100);
sampleAgg.field("author").maxDocsPerValue(MAX_DOCS_PER_AUTHOR).executionHint(randomExecutionHint());
sampleAgg.subAggregation(terms("authors").field("author"));
- SearchResponse response = client().prepareSearch("idx_unmapped", "idx_unmapped_author")
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse response = prepareSearch("idx_unmapped", "idx_unmapped_author").setSearchType(SearchType.QUERY_THEN_FETCH)
.setQuery(new TermQueryBuilder("genre", "fantasy"))
.setFrom(0)
.setSize(60)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java
index 7f18e532d7d7..0c0209df7d5a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java
@@ -453,11 +453,9 @@ public class DoubleTermsIT extends AbstractTermsTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx_unmapped", "idx")
- .addAggregation(
- new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
- )
- .get();
+ SearchResponse response = prepareSearch("idx_unmapped", "idx").addAggregation(
+ new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+ ).get();
assertNoFailures(response);
@@ -476,13 +474,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase {
}
public void testPartiallyUnmappedWithFormat() throws Exception {
- SearchResponse response = client().prepareSearch("idx_unmapped", "idx")
- .addAggregation(
- new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME)
- .collectMode(randomFrom(SubAggCollectionMode.values()))
- .format("0000.00")
- )
- .get();
+ SearchResponse response = prepareSearch("idx_unmapped", "idx").addAggregation(
+ new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME)
+ .collectMode(randomFrom(SubAggCollectionMode.values()))
+ .format("0000.00")
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
index 64441466c795..7639445f1f5a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java
@@ -273,15 +273,13 @@ public class GeoDistanceIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location")
- .unit(DistanceUnit.KILOMETERS)
- .addUnboundedTo(500)
- .addRange(500, 1000)
- .addUnboundedFrom(1000)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location")
+ .unit(DistanceUnit.KILOMETERS)
+ .addUnboundedTo(500)
+ .addRange(500, 1000)
+ .addUnboundedFrom(1000)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java
index 2767a1878c11..1cd8d5bc2fc3 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java
@@ -218,9 +218,9 @@ public class GeoHashGridIT extends ESIntegTestCase {
public void testPartiallyUnmapped() throws Exception {
for (int precision = 1; precision <= PRECISION; precision++) {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(geohashGrid("geohashgrid").field("location").precision(precision))
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ geohashGrid("geohashgrid").field("location").precision(precision)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
index f644c89ddbc5..cea3872b9a7c 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
@@ -825,9 +825,9 @@ public class HistogramIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval))
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval)
+ ).get();
assertNoFailures(response);
@@ -846,13 +846,11 @@ public class HistogramIT extends ESIntegTestCase {
}
public void testPartiallyUnmappedWithExtendedBounds() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- histogram("histo").field(SINGLE_VALUED_FIELD_NAME)
- .interval(interval)
- .extendedBounds(-1 * 2 * interval, valueCounts.length * interval)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(SINGLE_VALUED_FIELD_NAME)
+ .interval(interval)
+ .extendedBounds(-1 * 2 * interval, valueCounts.length * interval)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java
index 0a076721c2e0..8e4c503b89bb 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpRangeIT.java
@@ -151,15 +151,13 @@ public class IpRangeIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() {
- SearchResponse rsp = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- AggregationBuilders.ipRange("my_range")
- .field("ip")
- .addUnboundedTo("192.168.1.0")
- .addRange("192.168.1.0", "192.168.1.10")
- .addUnboundedFrom("192.168.1.10")
- )
- .get();
+ SearchResponse rsp = prepareSearch("idx", "idx_unmapped").addAggregation(
+ AggregationBuilders.ipRange("my_range")
+ .field("ip")
+ .addUnboundedTo("192.168.1.0")
+ .addRange("192.168.1.0", "192.168.1.10")
+ .addUnboundedFrom("192.168.1.10")
+ ).get();
assertNoFailures(rsp);
Range range = rsp.getAggregations().get("my_range");
assertEquals(3, range.getBuckets().size());
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java
index 67f244eabbd3..6feee8e36701 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java
@@ -450,11 +450,9 @@ public class LongTermsIT extends AbstractTermsTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx_unmapped", "idx")
- .addAggregation(
- new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
- )
- .get();
+ SearchResponse response = prepareSearch("idx_unmapped", "idx").addAggregation(
+ new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values()))
+ ).get();
assertNoFailures(response);
@@ -473,13 +471,11 @@ public class LongTermsIT extends AbstractTermsTestCase {
}
public void testPartiallyUnmappedWithFormat() throws Exception {
- SearchResponse response = client().prepareSearch("idx_unmapped", "idx")
- .addAggregation(
- new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME)
- .collectMode(randomFrom(SubAggCollectionMode.values()))
- .format("0000")
- )
- .get();
+ SearchResponse response = prepareSearch("idx_unmapped", "idx").addAggregation(
+ new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME)
+ .collectMode(randomFrom(SubAggCollectionMode.values()))
+ .format("0000")
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
index 2b5b4d5b1d79..cfe3a6708341 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
@@ -759,9 +759,9 @@ public class RangeIT extends ESIntegTestCase {
public void testPartiallyUnmapped() throws Exception {
clusterAdmin().prepareHealth("idx_unmapped").setWaitForYellowStatus().get();
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6))
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)
+ ).get();
assertNoFailures(response);
@@ -961,9 +961,9 @@ public class RangeIT extends ESIntegTestCase {
}
public void testFieldAlias() {
- SearchResponse response = client().prepareSearch("old_index", "new_index")
- .addAggregation(range("range").field("route_length_miles").addUnboundedTo(50.0).addRange(50.0, 150.0).addUnboundedFrom(150.0))
- .get();
+ SearchResponse response = prepareSearch("old_index", "new_index").addAggregation(
+ range("range").field("route_length_miles").addUnboundedTo(50.0).addRange(50.0, 150.0).addUnboundedFrom(150.0)
+ ).get();
assertNoFailures(response);
@@ -990,11 +990,9 @@ public class RangeIT extends ESIntegTestCase {
}
public void testFieldAliasWithMissingValue() {
- SearchResponse response = client().prepareSearch("old_index", "new_index")
- .addAggregation(
- range("range").field("route_length_miles").missing(0.0).addUnboundedTo(50.0).addRange(50.0, 150.0).addUnboundedFrom(150.0)
- )
- .get();
+ SearchResponse response = prepareSearch("old_index", "new_index").addAggregation(
+ range("range").field("route_length_miles").missing(0.0).addUnboundedTo(50.0).addRange(50.0, 150.0).addUnboundedFrom(150.0)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
index 2e1bd1812ea4..f6d7d37a2913 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java
@@ -158,8 +158,7 @@ public class SamplerIT extends ESIntegTestCase {
public void testPartiallyUnmappedChildAggNoDiversity() throws Exception {
SamplerAggregationBuilder sampleAgg = sampler("sample").shardSize(100);
sampleAgg.subAggregation(terms("authors").field("author"));
- SearchResponse response = client().prepareSearch("idx_unmapped", "test")
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse response = prepareSearch("idx_unmapped", "test").setSearchType(SearchType.QUERY_THEN_FETCH)
.setQuery(new TermQueryBuilder("genre", "fantasy"))
.setFrom(0)
.setSize(60)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java
index 109c2ec356f1..58609df7ae8f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java
@@ -960,16 +960,14 @@ public class TermsDocCountErrorIT extends ESIntegTestCase {
* 3 one-shard indices.
*/
public void testFixedDocs() throws Exception {
- SearchResponse response = client().prepareSearch("idx_fixed_docs_0", "idx_fixed_docs_1", "idx_fixed_docs_2")
- .addAggregation(
- terms("terms").executionHint(randomExecutionHint())
- .field(STRING_FIELD_NAME)
- .showTermDocCountError(true)
- .size(5)
- .shardSize(5)
- .collectMode(randomFrom(SubAggCollectionMode.values()))
- )
- .get();
+ SearchResponse response = prepareSearch("idx_fixed_docs_0", "idx_fixed_docs_1", "idx_fixed_docs_2").addAggregation(
+ terms("terms").executionHint(randomExecutionHint())
+ .field(STRING_FIELD_NAME)
+ .showTermDocCountError(true)
+ .size(5)
+ .shardSize(5)
+ .collectMode(randomFrom(SubAggCollectionMode.values()))
+ ).get();
assertNoFailures(response);
Terms terms = response.getAggregations().get("terms");
@@ -1015,16 +1013,14 @@ public class TermsDocCountErrorIT extends ESIntegTestCase {
* See https://github.com/elastic/elasticsearch/issues/40005 for more details
*/
public void testIncrementalReduction() {
- SearchResponse response = client().prepareSearch("idx_fixed_docs_3", "idx_fixed_docs_4", "idx_fixed_docs_5")
- .addAggregation(
- terms("terms").executionHint(randomExecutionHint())
- .field(STRING_FIELD_NAME)
- .showTermDocCountError(true)
- .size(5)
- .shardSize(5)
- .collectMode(randomFrom(SubAggCollectionMode.values()))
- )
- .get();
+ SearchResponse response = prepareSearch("idx_fixed_docs_3", "idx_fixed_docs_4", "idx_fixed_docs_5").addAggregation(
+ terms("terms").executionHint(randomExecutionHint())
+ .field(STRING_FIELD_NAME)
+ .showTermDocCountError(true)
+ .size(5)
+ .shardSize(5)
+ .collectMode(randomFrom(SubAggCollectionMode.values()))
+ ).get();
assertNoFailures(response);
Terms terms = response.getAggregations().get("terms");
assertThat(terms.getDocCountError(), equalTo(0L));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java
index 58976326a8e9..5d337500ea14 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java
@@ -533,13 +533,11 @@ public class StringTermsIT extends AbstractTermsTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- new TermsAggregationBuilder("terms").executionHint(randomExecutionHint())
- .field(SINGLE_VALUED_FIELD_NAME)
- .collectMode(randomFrom(SubAggCollectionMode.values()))
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ new TermsAggregationBuilder("terms").executionHint(randomExecutionHint())
+ .field(SINGLE_VALUED_FIELD_NAME)
+ .collectMode(randomFrom(SubAggCollectionMode.values()))
+ ).get();
assertNoFailures(response);
@@ -1125,13 +1123,11 @@ public class StringTermsIT extends AbstractTermsTestCase {
}
public void testIndexMetaField() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "empty_bucket_idx")
- .addAggregation(
- new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
- .executionHint(randomExecutionHint())
- .field(IndexFieldMapper.NAME)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "empty_bucket_idx").addAggregation(
+ new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values()))
+ .executionHint(randomExecutionHint())
+ .field(IndexFieldMapper.NAME)
+ ).get();
assertNoFailures(response);
StringTerms terms = response.getAggregations().get("terms");
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java
index ce3140891871..ff94a9f5cad8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java
@@ -160,8 +160,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase {
.get()
.getAggregations()
.get("stats");
- ExtendedStats s2 = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(extendedStats("stats").field("value").sigma(sigma))
+ ExtendedStats s2 = prepareSearch("idx", "idx_unmapped").addAggregation(extendedStats("stats").field("value").sigma(sigma))
.get()
.getAggregations()
.get("stats");
@@ -343,8 +342,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase {
@Override
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
double sigma = randomDouble() * randomIntBetween(1, 10);
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(extendedStats("stats").field("value").sigma(sigma))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java
index 29592bb1d5d0..841419a04424 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java
@@ -248,8 +248,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase {
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
int sigDigits = randomSignificantDigits();
final double[] pcts = randomPercents(minValue, maxValue);
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(
percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR)
.numberOfSignificantValueDigits(sigDigits)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java
index d0c173f8f14b..fe48fe4fe48b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java
@@ -206,8 +206,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase {
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
final double[] pcts = randomPercentiles();
int sigDigits = randomSignificantDigits();
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(
percentiles("percentiles").numberOfSignificantValueDigits(sigDigits)
.method(PercentilesMethod.HDR)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationIT.java
index 0b15180e3944..9e150e4d8b76 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationIT.java
@@ -195,8 +195,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase {
@Override
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
- final SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ final SearchResponse response = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(randomBuilder().field("value"))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/SumIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
index 5504dd9148e8..b100e7eb9f95 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
@@ -270,9 +270,7 @@ public class SumIT extends AbstractNumericTestCase {
}
public void testFieldAlias() {
- SearchResponse response = client().prepareSearch("old_index", "new_index")
- .addAggregation(sum("sum").field("route_length_miles"))
- .get();
+ SearchResponse response = prepareSearch("old_index", "new_index").addAggregation(sum("sum").field("route_length_miles")).get();
assertNoFailures(response);
@@ -283,9 +281,9 @@ public class SumIT extends AbstractNumericTestCase {
}
public void testFieldAliasInSubAggregation() {
- SearchResponse response = client().prepareSearch("old_index", "new_index")
- .addAggregation(terms("terms").field("transit_mode").subAggregation(sum("sum").field("route_length_miles")))
- .get();
+ SearchResponse response = prepareSearch("old_index", "new_index").addAggregation(
+ terms("terms").field("transit_mode").subAggregation(sum("sum").field("route_length_miles"))
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java
index edcb65f169bc..cdede393bd4f 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java
@@ -207,8 +207,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase {
@Override
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
final double[] pcts = randomPercents(minValue, maxValue);
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).field("value"))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java
index 3e7f4f978032..28b1911c9441 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java
@@ -179,8 +179,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase {
@Override
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
final double[] pcts = randomPercentiles();
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(randomCompression(percentiles("percentiles")).field("value").percentiles(pcts))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
index 4d5c06d8acdd..719a5831375d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
@@ -114,8 +114,7 @@ public class ValueCountIT extends ESIntegTestCase {
}
public void testSingleValuedFieldPartiallyUnmapped() throws Exception {
- SearchResponse searchResponse = client().prepareSearch("idx", "idx_unmapped")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("idx", "idx_unmapped").setQuery(matchAllQuery())
.addAggregation(count("count").field("value"))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java
index c53f6c276cea..9a9dc44b71ef 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java
@@ -588,24 +588,22 @@ public class BucketScriptIT extends ESIntegTestCase {
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- histogram("histo").field(FIELD_1_NAME)
- .interval(interval)
- .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
- .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
- .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
- .subAggregation(
- bucketScript(
- "seriesArithmetic",
- new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()),
- "field2Sum",
- "field3Sum",
- "field4Sum"
- )
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(FIELD_1_NAME)
+ .interval(interval)
+ .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
+ .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
+ .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
+ .subAggregation(
+ bucketScript(
+ "seriesArithmetic",
+ new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()),
+ "field2Sum",
+ "field3Sum",
+ "field4Sum"
)
- )
- .get();
+ )
+ ).get();
assertNoFailures(response);
@@ -651,14 +649,12 @@ public class BucketScriptIT extends ESIntegTestCase {
"seriesArithmetic"
);
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- histogram("histo").field(FIELD_1_NAME)
- .interval(interval)
- .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
- .subAggregation(bucketScriptAgg)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(FIELD_1_NAME)
+ .interval(interval)
+ .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
+ .subAggregation(bucketScriptAgg)
+ ).get();
assertNoFailures(response);
@@ -698,16 +694,14 @@ public class BucketScriptIT extends ESIntegTestCase {
"seriesArithmetic"
);
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- histogram("histo").field(FIELD_1_NAME)
- .interval(interval)
- .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
- .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
- .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
- .subAggregation(bucketScriptAgg)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(FIELD_1_NAME)
+ .interval(interval)
+ .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
+ .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
+ .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
+ .subAggregation(bucketScriptAgg)
+ ).get();
assertNoFailures(response);
@@ -757,16 +751,14 @@ public class BucketScriptIT extends ESIntegTestCase {
"seriesArithmetic"
);
- SearchResponse response = client().prepareSearch("idx", "idx_unmapped")
- .addAggregation(
- histogram("histo").field(FIELD_1_NAME)
- .interval(interval)
- .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
- .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
- .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
- .subAggregation(bucketScriptAgg)
- )
- .get();
+ SearchResponse response = prepareSearch("idx", "idx_unmapped").addAggregation(
+ histogram("histo").field(FIELD_1_NAME)
+ .interval(interval)
+ .subAggregation(sum("field2Sum").field(FIELD_2_NAME))
+ .subAggregation(sum("field3Sum").field(FIELD_3_NAME))
+ .subAggregation(sum("field4Sum").field(FIELD_4_NAME))
+ .subAggregation(bucketScriptAgg)
+ ).get();
assertNoFailures(response);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
index a79c09a72f7d..74acaf95bd24 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java
@@ -43,7 +43,7 @@ public class SearchRedStateIndexIT extends ESIntegTestCase {
final int numShards = cluster().numDataNodes() + 2;
buildRedIndex(numShards);
- SearchResponse searchResponse = client().prepareSearch().setSize(0).setAllowPartialSearchResults(true).get();
+ SearchResponse searchResponse = prepareSearch().setSize(0).setAllowPartialSearchResults(true).get();
assertThat(RestStatus.OK, equalTo(searchResponse.status()));
assertThat("Expect some shards failed", searchResponse.getFailedShards(), allOf(greaterThan(0), lessThanOrEqualTo(numShards)));
assertThat("Expect no shards skipped", searchResponse.getSkippedShards(), equalTo(0));
@@ -60,7 +60,7 @@ public class SearchRedStateIndexIT extends ESIntegTestCase {
setClusterDefaultAllowPartialResults(true);
- SearchResponse searchResponse = client().prepareSearch().setSize(0).get();
+ SearchResponse searchResponse = prepareSearch().setSize(0).get();
assertThat(RestStatus.OK, equalTo(searchResponse.status()));
assertThat("Expect some shards failed", searchResponse.getFailedShards(), allOf(greaterThan(0), lessThanOrEqualTo(numShards)));
assertThat("Expect no shards skipped", searchResponse.getSkippedShards(), equalTo(0));
@@ -79,7 +79,7 @@ public class SearchRedStateIndexIT extends ESIntegTestCase {
SearchPhaseExecutionException ex = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch().setSize(0).setAllowPartialSearchResults(false).get()
+ () -> prepareSearch().setSize(0).setAllowPartialSearchResults(false).get()
);
assertThat(ex.getDetailedMessage(), containsString("Search rejected due to missing shard"));
}
@@ -88,10 +88,7 @@ public class SearchRedStateIndexIT extends ESIntegTestCase {
buildRedIndex(cluster().numDataNodes() + 2);
setClusterDefaultAllowPartialResults(false);
- SearchPhaseExecutionException ex = expectThrows(
- SearchPhaseExecutionException.class,
- () -> client().prepareSearch().setSize(0).get()
- );
+ SearchPhaseExecutionException ex = expectThrows(SearchPhaseExecutionException.class, () -> prepareSearch().setSize(0).get());
assertThat(ex.getDetailedMessage(), containsString("Search rejected due to missing shard"));
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
index a4a5765926a3..24df07217a5a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java
@@ -61,7 +61,7 @@ public class SearchWhileRelocatingIT extends ESIntegTestCase {
);
}
indexRandom(true, indexBuilders.toArray(new IndexRequestBuilder[indexBuilders.size()]));
- assertHitCount(client().prepareSearch(), (numDocs));
+ assertHitCount(prepareSearch(), (numDocs));
final int numIters = scaledRandomIntBetween(5, 20);
for (int i = 0; i < numIters; i++) {
final AtomicBoolean stop = new AtomicBoolean(false);
@@ -74,7 +74,7 @@ public class SearchWhileRelocatingIT extends ESIntegTestCase {
public void run() {
try {
while (stop.get() == false) {
- SearchResponse sr = client().prepareSearch().setSize(numDocs).get();
+ SearchResponse sr = prepareSearch().setSize(numDocs).get();
if (sr.getHits().getTotalHits().value != numDocs) {
// if we did not search all shards but had no serious failures that is potentially fine
// if only the hit-count is wrong. this can happen if the cluster-state is behind when the
@@ -134,7 +134,7 @@ public class SearchWhileRelocatingIT extends ESIntegTestCase {
if (nonCriticalExceptions.isEmpty() == false) {
logger.info("non-critical exceptions: {}", nonCriticalExceptions);
for (int j = 0; j < 10; j++) {
- assertHitCount(client().prepareSearch(), numDocs);
+ assertHitCount(prepareSearch(), numDocs);
}
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java
index 519e839c5d32..6f701e956788 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java
@@ -131,8 +131,7 @@ public class SearchWithRandomExceptionsIT extends ESIntegTestCase {
int docToQuery = between(0, numDocs - 1);
int expectedResults = added[docToQuery] ? 1 : 0;
logger.info("Searching for [test:{}]", English.intToEnglish(docToQuery));
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery)))
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery)))
.setSize(expectedResults)
.get();
logger.info("Successful shards: [{}] numShards: [{}]", searchResponse.getSuccessfulShards(), test.numPrimaries);
@@ -140,8 +139,7 @@ public class SearchWithRandomExceptionsIT extends ESIntegTestCase {
assertResultsAndLogOnFailure(expectedResults, searchResponse);
}
// check match all
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchAllQuery())
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchAllQuery())
.setSize(numCreated)
.addSort("_id", SortOrder.ASC)
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
index 6279450e99f4..54ad0cd7e0cf 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java
@@ -154,8 +154,7 @@ public class SearchWithRandomIOExceptionsIT extends ESIntegTestCase {
int docToQuery = between(0, numDocs - 1);
int expectedResults = added[docToQuery] ? 1 : 0;
logger.info("Searching for [test:{}]", English.intToEnglish(docToQuery));
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery)))
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("test", English.intToEnglish(docToQuery)))
.setSize(expectedResults)
.get();
logger.info("Successful shards: [{}] numShards: [{}]", searchResponse.getSuccessfulShards(), numShards.numPrimaries);
@@ -163,8 +162,7 @@ public class SearchWithRandomIOExceptionsIT extends ESIntegTestCase {
assertResultsAndLogOnFailure(expectedResults, searchResponse);
}
// check match all
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchAllQuery())
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchAllQuery())
.setSize(numCreated + numInitialDocs)
.addSort("_uid", SortOrder.ASC)
.get();
@@ -192,7 +190,7 @@ public class SearchWithRandomIOExceptionsIT extends ESIntegTestCase {
indicesAdmin().prepareClose("test").execute().get();
indicesAdmin().prepareOpen("test").execute().get();
ensureGreen();
- assertHitCountAndNoFailures(client().prepareSearch().setQuery(QueryBuilders.matchQuery("test", "init")), numInitialDocs);
+ assertHitCountAndNoFailures(prepareSearch().setQuery(QueryBuilders.matchQuery("test", "init")), numInitialDocs);
}
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java
index fff6386b643f..b600098d82b3 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java
@@ -72,9 +72,9 @@ public class FetchSubPhasePluginIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse response = client().prepareSearch()
- .setSource(new SearchSourceBuilder().ext(Collections.singletonList(new TermVectorsFetchBuilder("test"))))
- .get();
+ SearchResponse response = prepareSearch().setSource(
+ new SearchSourceBuilder().ext(Collections.singletonList(new TermVectorsFetchBuilder("test")))
+ ).get();
assertNoFailures(response);
assertThat(
((Map) response.getHits().getAt(0).field("term_vectors_fetch").getValues().get(0)).get("i"),
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java
index 626417d1cf77..00c534257723 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/InnerHitsIT.java
@@ -812,13 +812,11 @@ public class InnerHitsIT extends ESIntegTestCase {
// the field name (comments.message) used for source filtering should be the same as when using that field for
// other features (like in the query dsl or aggs) in order for consistency:
- SearchResponse response = client().prepareSearch()
- .setQuery(
- nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.None).innerHit(
- new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.of(true, new String[] { "comments.message" }, null))
- )
+ SearchResponse response = prepareSearch().setQuery(
+ nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.None).innerHit(
+ new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.of(true, new String[] { "comments.message" }, null))
)
- .get();
+ ).get();
assertNoFailures(response);
assertHitCount(response, 1);
@@ -834,9 +832,9 @@ public class InnerHitsIT extends ESIntegTestCase {
equalTo("fox ate rabbit x y z")
);
- response = client().prepareSearch()
- .setQuery(nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.None).innerHit(new InnerHitBuilder()))
- .get();
+ response = prepareSearch().setQuery(
+ nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.None).innerHit(new InnerHitBuilder())
+ ).get();
assertNoFailures(response);
assertHitCount(response, 1);
@@ -854,23 +852,18 @@ public class InnerHitsIT extends ESIntegTestCase {
// Source filter on a field that does not exist inside the nested document and just check that we do not fail and
// return an empty _source:
- response = client().prepareSearch()
- .setQuery(
- nestedQuery("comments", matchQuery("comments.message", "away"), ScoreMode.None).innerHit(
- new InnerHitBuilder().setFetchSourceContext(
- FetchSourceContext.of(true, new String[] { "comments.missing_field" }, null)
- )
- )
+ response = prepareSearch().setQuery(
+ nestedQuery("comments", matchQuery("comments.message", "away"), ScoreMode.None).innerHit(
+ new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.of(true, new String[] { "comments.missing_field" }, null))
)
- .get();
+ ).get();
assertNoFailures(response);
assertHitCount(response, 1);
assertThat(response.getHits().getAt(0).getInnerHits().get("comments").getTotalHits().value, equalTo(1L));
assertThat(response.getHits().getAt(0).getInnerHits().get("comments").getAt(0).getSourceAsMap().size(), equalTo(0));
// Check that inner hits contain _source even when it's disabled on the root request.
- response = client().prepareSearch()
- .setFetchSource(false)
+ response = prepareSearch().setFetchSource(false)
.setQuery(nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.None).innerHit(new InnerHitBuilder()))
.get();
assertNoFailures(response);
@@ -887,13 +880,12 @@ public class InnerHitsIT extends ESIntegTestCase {
refresh();
assertSearchHitsWithoutFailures(
- client().prepareSearch("index1", "index2")
- .setQuery(
- boolQuery().should(
- nestedQuery("nested_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true)
- .innerHit(new InnerHitBuilder().setIgnoreUnmapped(true))
- ).should(termQuery("key", "value"))
- ),
+ prepareSearch("index1", "index2").setQuery(
+ boolQuery().should(
+ nestedQuery("nested_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true)
+ .innerHit(new InnerHitBuilder().setIgnoreUnmapped(true))
+ ).should(termQuery("key", "value"))
+ ),
"1",
"3"
);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java
index c0bbbb48c09a..d7347ef21328 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java
@@ -46,15 +46,12 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test").setId("3").setSource("name", "test3", "number", 3).get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().must(matchAllQuery())
- .filter(
- boolQuery().should(rangeQuery("number").lt(2).queryName("test1"))
- .should(rangeQuery("number").gte(2).queryName("test2"))
- )
- )
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ boolQuery().must(matchAllQuery())
+ .filter(
+ boolQuery().should(rangeQuery("number").lt(2).queryName("test1")).should(rangeQuery("number").gte(2).queryName("test2"))
+ )
+ ).get();
assertHitCount(searchResponse, 3L);
for (SearchHit hit : searchResponse.getHits()) {
if (hit.getId().equals("3") || hit.getId().equals("2")) {
@@ -70,11 +67,9 @@ public class MatchedQueriesIT extends ESIntegTestCase {
}
}
- searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().should(rangeQuery("number").lte(2).queryName("test1")).should(rangeQuery("number").gt(2).queryName("test2"))
- )
- .get();
+ searchResponse = prepareSearch().setQuery(
+ boolQuery().should(rangeQuery("number").lte(2).queryName("test1")).should(rangeQuery("number").gt(2).queryName("test2"))
+ ).get();
assertHitCount(searchResponse, 3L);
for (SearchHit hit : searchResponse.getHits()) {
if (hit.getId().equals("1") || hit.getId().equals("2")) {
@@ -100,8 +95,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test").setId("3").setSource("name", "test").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setPostFilter(
boolQuery().should(termQuery("name", "test").queryName("name")).should(termQuery("title", "title1").queryName("title"))
)
@@ -123,8 +117,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
}
}
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.setPostFilter(
boolQuery().should(termQuery("name", "test").queryName("name")).should(termQuery("title", "title1").queryName("title"))
)
@@ -157,10 +150,9 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test").setId("3").setSource("name", "test", "title", "title3").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(boolQuery().must(matchAllQuery()).filter(termsQuery("title", "title1", "title2", "title3").queryName("title")))
- .setPostFilter(termQuery("name", "test").queryName("name"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ boolQuery().must(matchAllQuery()).filter(termsQuery("title", "title1", "title2", "title3").queryName("title"))
+ ).setPostFilter(termQuery("name", "test").queryName("name")).get();
assertHitCount(searchResponse, 3L);
for (SearchHit hit : searchResponse.getHits()) {
if (hit.getId().equals("1") || hit.getId().equals("2") || hit.getId().equals("3")) {
@@ -174,8 +166,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
}
}
- searchResponse = client().prepareSearch()
- .setQuery(termsQuery("title", "title1", "title2", "title3").queryName("title"))
+ searchResponse = prepareSearch().setQuery(termsQuery("title", "title1", "title2", "title3").queryName("title"))
.setPostFilter(matchQuery("name", "test").queryName("name"))
.get();
assertHitCount(searchResponse, 3L);
@@ -199,9 +190,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test1").setId("1").setSource("title", "title1").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.regexpQuery("title", "title1").queryName("regex"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.regexpQuery("title", "title1").queryName("regex")).get();
assertHitCount(searchResponse, 1L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -222,9 +211,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test1").setId("1").setSource("title", "title1").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.prefixQuery("title", "title").queryName("prefix"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.prefixQuery("title", "title").queryName("prefix")).get();
assertHitCount(searchResponse, 1L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -245,9 +232,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test1").setId("1").setSource("title", "title1").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.fuzzyQuery("title", "titel1").queryName("fuzzy"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.fuzzyQuery("title", "titel1").queryName("fuzzy")).get();
assertHitCount(searchResponse, 1L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -268,9 +253,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test1").setId("1").setSource("title", "title1").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.wildcardQuery("title", "titl*").queryName("wildcard"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.wildcardQuery("title", "titl*").queryName("wildcard")).get();
assertHitCount(searchResponse, 1L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -291,9 +274,9 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test1").setId("1").setSource("title", "title1 title2").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.spanFirstQuery(QueryBuilders.spanTermQuery("title", "title1"), 10).queryName("span"))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ QueryBuilders.spanFirstQuery(QueryBuilders.spanTermQuery("title", "title1"), 10).queryName("span")
+ ).get();
assertHitCount(searchResponse, 1L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -321,13 +304,11 @@ public class MatchedQueriesIT extends ESIntegTestCase {
// Execute search at least two times to load it in cache
int iter = scaledRandomIntBetween(2, 10);
for (int i = 0; i < iter; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(
- boolQuery().minimumShouldMatch(1)
- .should(queryStringQuery("dolor").queryName("dolor"))
- .should(queryStringQuery("elit").queryName("elit"))
- )
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ boolQuery().minimumShouldMatch(1)
+ .should(queryStringQuery("dolor").queryName("dolor"))
+ .should(queryStringQuery("elit").queryName("elit"))
+ ).get();
assertHitCount(searchResponse, 2L);
for (SearchHit hit : searchResponse.getHits()) {
@@ -359,7 +340,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
BytesReference termBytes = XContentHelper.toXContent(termQueryBuilder, XContentType.JSON, false);
QueryBuilder[] queries = new QueryBuilder[] { wrapperQuery(matchBytes), constantScoreQuery(wrapperQuery(termBytes)) };
for (QueryBuilder query : queries) {
- SearchResponse searchResponse = client().prepareSearch().setQuery(query).get();
+ SearchResponse searchResponse = prepareSearch().setQuery(query).get();
assertHitCount(searchResponse, 1L);
SearchHit hit = searchResponse.getHits().getAt(0);
assertThat(hit.getMatchedQueriesAndScores().size(), equalTo(1));
@@ -376,8 +357,7 @@ public class MatchedQueriesIT extends ESIntegTestCase {
client().prepareIndex("test").setId("2").setSource("content", "hello you").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(new MatchAllQueryBuilder().queryName("all"))
+ SearchResponse searchResponse = prepareSearch().setQuery(new MatchAllQueryBuilder().queryName("all"))
.setRescorer(
new QueryRescorerBuilder(new MatchPhraseQueryBuilder("content", "hello you").boost(10).queryName("rescore_phrase"))
)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java
index dc1b14cd5bfd..89d001df58d1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java
@@ -189,33 +189,32 @@ public class SearchFieldsIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("field1").get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("field1").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field1").getValue().toString(), equalTo("value1"));
// field2 is not stored, check that it is not extracted from source.
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("field2").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("field2").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(0));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field2"), nullValue());
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("field3").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("field3").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("*3").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("*3").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addStoredField("*3")
.addStoredField("field1")
.addStoredField("field2")
@@ -226,20 +225,20 @@ public class SearchFieldsIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field1").getValue().toString(), equalTo("value1"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("field*").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("field*").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(2));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field1").getValue().toString(), equalTo("value1"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("f*3").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("f*3").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().size(), equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("*").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("*").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getSourceAsMap(), nullValue());
@@ -247,7 +246,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(0).getFields().get("field1").getValue().toString(), equalTo("value1"));
assertThat(searchResponse.getHits().getAt(0).getFields().get("field3").getValue().toString(), equalTo("value3"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("*").addStoredField("_source").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("*").addStoredField("_source").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
assertThat(searchResponse.getHits().getAt(0).getSourceAsMap(), notNullValue());
@@ -298,8 +297,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indicesAdmin().refresh(new RefreshRequest()).actionGet();
logger.info("running doc['num1'].value");
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.addSort("num1", SortOrder.ASC)
.addScriptField("sNum1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value", Collections.emptyMap()))
.addScriptField(
@@ -336,8 +334,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
assertThat(response.getHits().getAt(2).getFields().get("date1").getValues().get(0), equalTo(120000L));
logger.info("running doc['num1'].value * factor");
- response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ response = prepareSearch().setQuery(matchAllQuery())
.addSort("num1", SortOrder.ASC)
.addScriptField(
"sNum1",
@@ -387,8 +384,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("date", date).endObject())
);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.addSort("date", SortOrder.ASC)
.addScriptField(
"date1",
@@ -428,8 +424,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
}
indexRandom(true, indexRequestBuilders);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.addSort("num1", SortOrder.ASC)
.setSize(numDocs)
.addScriptField("id", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_fields._id.value", Collections.emptyMap()))
@@ -472,8 +467,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
.get();
indicesAdmin().refresh(new RefreshRequest()).actionGet();
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.addScriptField("s_obj1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_source.obj1", Collections.emptyMap()))
.addScriptField(
"s_obj1_test",
@@ -513,8 +507,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
public void testScriptFieldsForNullReturn() throws Exception {
client().prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy("true").get();
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.addScriptField("test_script_1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "return null", Collections.emptyMap()))
.get();
@@ -631,8 +624,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addStoredField("byte_field")
.addStoredField("short_field")
.addStoredField("integer_field")
@@ -852,8 +844,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchRequestBuilder builder = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchRequestBuilder builder = prepareSearch().setQuery(matchAllQuery())
.addDocValueField("text_field")
.addDocValueField("keyword_field")
.addDocValueField("byte_field")
@@ -910,7 +901,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(0).getFields().get("binary_field").getValues(), equalTo(List.of("KmQ=")));
assertThat(searchResponse.getHits().getAt(0).getFields().get("ip_field").getValues(), equalTo(List.of("::1")));
- builder = client().prepareSearch().setQuery(matchAllQuery()).addDocValueField("*field");
+ builder = prepareSearch().setQuery(matchAllQuery()).addDocValueField("*field");
searchResponse = builder.get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
@@ -952,8 +943,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(0).getFields().get("binary_field").getValues(), equalTo(List.of("KmQ=")));
assertThat(searchResponse.getHits().getAt(0).getFields().get("ip_field").getValues(), equalTo(List.of("::1")));
- builder = client().prepareSearch()
- .setQuery(matchAllQuery())
+ builder = prepareSearch().setQuery(matchAllQuery())
.addDocValueField("byte_field", "#.0")
.addDocValueField("short_field", "#.0")
.addDocValueField("integer_field", "#.0")
@@ -1081,8 +1071,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indexDoc("test", "1", "text_field", "foo", "date_field", formatter.format(date));
refresh("test");
- SearchRequestBuilder builder = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchRequestBuilder builder = prepareSearch().setQuery(matchAllQuery())
.addDocValueField("text_field_alias")
.addDocValueField("date_field_alias")
.addDocValueField("date_field");
@@ -1144,10 +1133,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indexDoc("test", "1", "text_field", "foo", "date_field", formatter.format(date));
refresh("test");
- SearchRequestBuilder builder = client().prepareSearch()
- .setQuery(matchAllQuery())
- .addDocValueField("*alias")
- .addDocValueField("date_field");
+ SearchRequestBuilder builder = prepareSearch().setQuery(matchAllQuery()).addDocValueField("*alias").addDocValueField("date_field");
SearchResponse searchResponse = builder.get();
assertNoFailures(searchResponse);
@@ -1199,8 +1185,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indexDoc("test", "1", "field1", "value1", "field2", "value2");
refresh("test");
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addStoredField("field1-alias")
.addStoredField("field2-alias")
.get();
@@ -1243,7 +1228,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
indexDoc("test", "1", "field1", "value1", "field2", "value2");
refresh("test");
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addStoredField("field*").get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).addStoredField("field*").get();
assertHitCount(searchResponse, 1L);
SearchHit hit = searchResponse.getHits().getAt(0);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java
index ecb4be2685ab..14df03bb86e8 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java
@@ -72,8 +72,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
int numShards = getNumShards("test").numPrimaries;
for (int j = 0; j < iters; j++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchAllQuery())
.setRescorer(
new QueryRescorerBuilder(
functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.weightFactorFunction(100)).boostMode(
@@ -122,8 +121,9 @@ public class QueryRescorerIT extends ESIntegTestCase {
.setSource("field1", "quick huge brown", "field2", "the quick lazy huge brown fox jumps over the tree")
.get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR)
+ )
.setRescorer(
new QueryRescorerBuilder(matchPhraseQuery("field1", "quick brown").slop(2).boost(4.0f)).setRescoreQueryWeight(2),
5
@@ -136,8 +136,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("3"));
assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("2"));
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
.setRescorer(new QueryRescorerBuilder(matchPhraseQuery("field1", "the quick brown").slop(3)), 5)
.get();
@@ -146,8 +145,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertSecondHit(searchResponse, hasId("2"));
assertThirdHit(searchResponse, hasId("3"));
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
.setRescorer(new QueryRescorerBuilder(matchPhraseQuery("field1", "the quick brown")), 5)
.get();
@@ -191,8 +189,9 @@ public class QueryRescorerIT extends ESIntegTestCase {
client().prepareIndex("test").setId("11").setSource("field1", "2st street boston massachusetts").get();
client().prepareIndex("test").setId("12").setSource("field1", "3st street boston massachusetts").get();
indicesAdmin().prepareRefresh("test").get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR))
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR)
+ )
.setFrom(0)
.setSize(5)
.setRescorer(
@@ -208,8 +207,9 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertSecondHit(searchResponse, hasId("6"));
assertThirdHit(searchResponse, hasId("3"));
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR))
+ searchResponse = prepareSearch().setQuery(
+ QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR)
+ )
.setFrom(0)
.setSize(5)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
@@ -228,8 +228,9 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertThirdHit(searchResponse, hasId("3"));
// Make sure non-zero from works:
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR))
+ searchResponse = prepareSearch().setQuery(
+ QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR)
+ )
.setFrom(2)
.setSize(5)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
@@ -271,8 +272,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
client().prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get();
indicesAdmin().prepareRefresh("test").get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
.setFrom(0)
.setSize(5)
.get();
@@ -285,8 +285,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertFourthHit(searchResponse, hasId("2"));
// Now, rescore only top 2 hits w/ proximity:
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
.setFrom(0)
.setSize(5)
.setRescorer(
@@ -305,8 +304,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertFourthHit(searchResponse, hasId("2"));
// Now, rescore only top 3 hits w/ proximity:
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts"))
.setFrom(0)
.setSize(5)
.setRescorer(
@@ -351,8 +349,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
client().prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get();
indicesAdmin().prepareRefresh("test").get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "massachusetts").operator(Operator.OR))
+ SearchResponse searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts").operator(Operator.OR))
.setFrom(0)
.setSize(5)
.get();
@@ -365,8 +362,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertFourthHit(searchResponse, hasId("2"));
// Now, penalizing rescore (nothing matches the rescore query):
- searchResponse = client().prepareSearch()
- .setQuery(QueryBuilders.matchQuery("field1", "massachusetts").operator(Operator.OR))
+ searchResponse = prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts").operator(Operator.OR))
.setFrom(0)
.setSize(5)
.setRescorer(
@@ -434,8 +430,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
int rescoreWindow = between(1, 3) * resultSize;
String intToEnglish = English.intToEnglish(between(0, numDocs - 1));
String query = intToEnglish.split(" ")[0];
- SearchResponse rescored = client().prepareSearch()
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse rescored = prepareSearch().setSearchType(SearchType.QUERY_THEN_FETCH)
.setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(Operator.OR))
.setFrom(0)
@@ -448,8 +443,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
)
.get();
- SearchResponse plain = client().prepareSearch()
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse plain = prepareSearch().setSearchType(SearchType.QUERY_THEN_FETCH)
.setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(Operator.OR))
.setFrom(0)
@@ -459,8 +453,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
// check equivalence
assertEquivalent(query, plain, rescored);
- rescored = client().prepareSearch()
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ rescored = prepareSearch().setSearchType(SearchType.QUERY_THEN_FETCH)
.setPreference("test") // ensure we hit the same shards for tie-breaking
.setQuery(QueryBuilders.matchQuery("field1", query).operator(Operator.OR))
.setFrom(0)
@@ -502,8 +495,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
refresh();
{
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
.setRescorer(
new QueryRescorerBuilder(matchPhraseQuery("field1", "the quick brown").slop(2).boost(4.0f)).setQueryWeight(0.5f)
@@ -549,8 +541,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
innerRescoreQuery.setScoreMode(QueryRescoreMode.fromString(scoreModes[innerMode]));
}
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
.setRescorer(innerRescoreQuery, 5)
.setExplain(true)
@@ -573,8 +564,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
outerRescoreQuery.setScoreMode(QueryRescoreMode.fromString(scoreModes[outerMode]));
}
- searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ searchResponse = prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setQuery(QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR))
.addRescorer(innerRescoreQuery, 5)
.addRescorer(outerRescoreQuery.windowSize(10))
@@ -628,8 +618,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
rescoreQuery.setScoreMode(QueryRescoreMode.fromString(scoreMode));
}
- SearchResponse rescored = client().prepareSearch()
- .setPreference("test") // ensure we hit the same shards for tie-breaking
+ SearchResponse rescored = prepareSearch().setPreference("test") // ensure we hit the same shards for tie-breaking
.setFrom(0)
.setSize(10)
.setQuery(query)
@@ -697,7 +686,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
).setScoreMode(QueryRescoreMode.Total);
// First set the rescore window large enough that both rescores take effect
- SearchRequestBuilder request = client().prepareSearch();
+ SearchRequestBuilder request = prepareSearch();
request.addRescorer(eightIsGreat, numDocs).addRescorer(sevenIsBetter, numDocs);
SearchResponse response = request.get();
assertFirstHit(response, hasId("7"));
@@ -771,7 +760,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
}
refresh();
- SearchRequestBuilder request = client().prepareSearch();
+ SearchRequestBuilder request = prepareSearch();
request.setQuery(QueryBuilders.termQuery("text", "hello"));
request.setFrom(1);
request.setSize(4);
@@ -789,8 +778,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
Exception exc = expectThrows(
Exception.class,
- () -> client().prepareSearch()
- .addSort(SortBuilders.fieldSort("number"))
+ () -> prepareSearch().addSort(SortBuilders.fieldSort("number"))
.setTrackScores(true)
.addRescorer(new QueryRescorerBuilder(matchAllQuery()), 50)
.get()
@@ -800,8 +788,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
exc = expectThrows(
Exception.class,
- () -> client().prepareSearch()
- .addSort(SortBuilders.fieldSort("number"))
+ () -> prepareSearch().addSort(SortBuilders.fieldSort("number"))
.addSort(SortBuilders.scoreSort())
.setTrackScores(true)
.addRescorer(new QueryRescorerBuilder(matchAllQuery()), 50)
@@ -810,8 +797,7 @@ public class QueryRescorerIT extends ESIntegTestCase {
assertNotNull(exc.getCause());
assertThat(exc.getCause().getMessage(), containsString("Cannot use [sort] option in conjunction with [rescore]."));
- SearchResponse resp = client().prepareSearch()
- .addSort(SortBuilders.scoreSort())
+ SearchResponse resp = prepareSearch().addSort(SortBuilders.scoreSort())
.setTrackScores(true)
.addRescorer(new QueryRescorerBuilder(matchAllQuery()).setRescoreQueryWeight(100.0f), 50)
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java
index a9ab85bf7917..ef8ffcf0d806 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java
@@ -99,8 +99,7 @@ public class RandomScoreFunctionIT extends ESIntegTestCase {
int innerIters = scaledRandomIntBetween(2, 5);
SearchHit[] hits = null;
for (int i = 0; i < innerIters; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setSize(docCount) // get all docs otherwise we are prone to tie-breaking
+ SearchResponse searchResponse = prepareSearch().setSize(docCount) // get all docs otherwise we are prone to tie-breaking
.setPreference(preference)
.setQuery(functionScoreQuery(matchAllQuery(), randomFunction().seed(seed).setField("foo")))
.get();
@@ -281,8 +280,7 @@ public class RandomScoreFunctionIT extends ESIntegTestCase {
refresh();
int iters = scaledRandomIntBetween(10, 20);
for (int i = 0; i < iters; ++i) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(functionScoreQuery(matchAllQuery(), randomFunction()))
+ SearchResponse searchResponse = prepareSearch().setQuery(functionScoreQuery(matchAllQuery(), randomFunction()))
.setSize(docCount)
.get();
@@ -303,20 +301,17 @@ public class RandomScoreFunctionIT extends ESIntegTestCase {
flushAndRefresh();
assertNoFailures(
- client().prepareSearch()
- .setSize(docCount) // get all docs otherwise we are prone to tie-breaking
+ prepareSearch().setSize(docCount) // get all docs otherwise we are prone to tie-breaking
.setQuery(functionScoreQuery(matchAllQuery(), randomFunction().seed(randomInt()).setField(SeqNoFieldMapper.NAME)))
);
assertNoFailures(
- client().prepareSearch()
- .setSize(docCount) // get all docs otherwise we are prone to tie-breaking
+ prepareSearch().setSize(docCount) // get all docs otherwise we are prone to tie-breaking
.setQuery(functionScoreQuery(matchAllQuery(), randomFunction().seed(randomLong()).setField(SeqNoFieldMapper.NAME)))
);
assertNoFailures(
- client().prepareSearch()
- .setSize(docCount) // get all docs otherwise we are prone to tie-breaking
+ prepareSearch().setSize(docCount) // get all docs otherwise we are prone to tie-breaking
.setQuery(
functionScoreQuery(
matchAllQuery(),
@@ -343,8 +338,7 @@ public class RandomScoreFunctionIT extends ESIntegTestCase {
for (int i = 0; i < count; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(functionScoreQuery(matchAllQuery(), new RandomScoreFunctionBuilder()))
+ SearchResponse searchResponse = prepareSearch().setQuery(functionScoreQuery(matchAllQuery(), new RandomScoreFunctionBuilder()))
.get();
matrix[Integer.valueOf(searchResponse.getHits().getAt(0).getId())]++;
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java
index 7d3e8c7be03c..d5bbf767d104 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java
@@ -126,24 +126,21 @@ public class GeoDistanceIT extends ESIntegTestCase {
refresh();
// Test doc['location'].arcDistance(lat, lon)
- SearchResponse searchResponse1 = client().prepareSearch()
- .addStoredField("_source")
+ SearchResponse searchResponse1 = prepareSearch().addStoredField("_source")
.addScriptField("distance", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "arcDistance", Collections.emptyMap()))
.get();
Double resultDistance1 = searchResponse1.getHits().getHits()[0].getFields().get("distance").getValue();
assertThat(resultDistance1, closeTo(GeoUtils.arcDistance(src_lat, src_lon, tgt_lat, tgt_lon), 0.01d));
// Test doc['location'].planeDistance(lat, lon)
- SearchResponse searchResponse2 = client().prepareSearch()
- .addStoredField("_source")
+ SearchResponse searchResponse2 = prepareSearch().addStoredField("_source")
.addScriptField("distance", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "planeDistance", Collections.emptyMap()))
.get();
Double resultDistance2 = searchResponse2.getHits().getHits()[0].getFields().get("distance").getValue();
assertThat(resultDistance2, closeTo(GeoUtils.planeDistance(src_lat, src_lon, tgt_lat, tgt_lon), 0.01d));
// Test doc['location'].geohashDistance(lat, lon)
- SearchResponse searchResponse4 = client().prepareSearch()
- .addStoredField("_source")
+ SearchResponse searchResponse4 = prepareSearch().addStoredField("_source")
.addScriptField("distance", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "geohashDistance", Collections.emptyMap()))
.get();
Double resultDistance4 = searchResponse4.getHits().getHits()[0].getFields().get("distance").getValue();
@@ -156,8 +153,7 @@ public class GeoDistanceIT extends ESIntegTestCase {
);
// Test doc['location'].arcDistance(lat, lon + 360)/1000d
- SearchResponse searchResponse5 = client().prepareSearch()
- .addStoredField("_source")
+ SearchResponse searchResponse5 = prepareSearch().addStoredField("_source")
.addScriptField(
"distance",
new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "arcDistance(lat, lon + 360)/1000d", Collections.emptyMap())
@@ -167,8 +163,7 @@ public class GeoDistanceIT extends ESIntegTestCase {
assertThat(resultArcDistance5, closeTo(GeoUtils.arcDistance(src_lat, src_lon, tgt_lat, tgt_lon) / 1000d, 0.01d));
// Test doc['location'].arcDistance(lat + 360, lon)/1000d
- SearchResponse searchResponse6 = client().prepareSearch()
- .addStoredField("_source")
+ SearchResponse searchResponse6 = prepareSearch().addStoredField("_source")
.addScriptField(
"distance",
new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "arcDistance(lat + 360, lon)/1000d", Collections.emptyMap())
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java
index 2deedccec419..736796d73f16 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java
@@ -788,8 +788,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
refresh();
// access id = 1, read, max value, asc, should use matt and shay
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("acl.operation.user.username")
.setNestedSort(
@@ -812,8 +811,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("shay"));
// access id = 1, read, min value, asc, should now use adrien and luca
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("acl.operation.user.username")
.setNestedSort(
@@ -836,8 +834,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("luca"));
// execute, by matt or luca, by user id, sort missing first
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("acl.operation.user.id")
.setNestedSort(
@@ -863,8 +860,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[1].getSortValues()[0].toString(), equalTo("1"));
// execute, by matt or luca, by username, sort missing last (default)
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("acl.operation.user.username")
.setNestedSort(
@@ -948,8 +944,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(termQuery("_id", 2))
+ SearchResponse searchResponse = prepareSearch().setQuery(termQuery("_id", 2))
.addSort(
SortBuilders.fieldSort("nested1.nested2.sortVal")
.setNestedSort(
@@ -1131,8 +1126,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
refresh();
// Without nested filter
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child"))
@@ -1151,8 +1145,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
// With nested filter
NestedSortBuilder nestedSort = new NestedSortBuilder("parent.child");
nestedSort.setFilter(QueryBuilders.termQuery("parent.child.filter", true));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("parent.child.child_values").setNestedSort(nestedSort).order(SortOrder.ASC))
.get();
assertHitCount(searchResponse, 3);
@@ -1165,8 +1158,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
// Nested path should be automatically detected, expect same results as above search request
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("parent.child.child_values").setNestedSort(nestedSort).order(SortOrder.ASC))
.get();
@@ -1180,8 +1172,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
nestedSort.setFilter(QueryBuilders.termQuery("parent.filter", false));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("parent.parent_values").setNestedSort(nestedSort).order(SortOrder.ASC))
.get();
@@ -1194,8 +1185,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("3"));
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(
@@ -1217,8 +1207,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("6"));
// Check if closest nested type is resolved
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_obj.value")
.setNestedSort(new NestedSortBuilder("parent.child").setFilter(QueryBuilders.termQuery("parent.child.filter", true)))
@@ -1236,8 +1225,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
// Sort mode: sum
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child"))
@@ -1255,8 +1243,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("11"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child"))
@@ -1275,8 +1262,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("2"));
// Sort mode: sum with filter
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child").setFilter(QueryBuilders.termQuery("parent.child.filter", true)))
@@ -1295,8 +1281,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
// Sort mode: avg
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child"))
@@ -1314,8 +1299,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("3"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child"))
@@ -1334,8 +1318,7 @@ public class SimpleNestedIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("1"));
// Sort mode: avg with filter
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_values")
.setNestedSort(new NestedSortBuilder("parent.child").setFilter(QueryBuilders.termQuery("parent.child.filter", true)))
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java
index fce19a316b34..f7b2b0f4443d 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java
@@ -67,8 +67,7 @@ public class DfsProfilerIT extends ESIntegTestCase {
for (int i = 0; i < iters; i++) {
QueryBuilder q = randomQueryBuilder(List.of(textField), List.of(numericField), numDocs, 3);
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch()
- .setQuery(q)
+ SearchResponse resp = prepareSearch().setQuery(q)
.setTrackTotalHits(true)
.setProfile(true)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java
index 32334deb268b..e7b02faede9b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/query/QueryProfilerIT.java
@@ -63,8 +63,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
QueryBuilder q = randomQueryBuilder(stringFields, numericFields, numDocs, 3);
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch()
- .setQuery(q)
+ SearchResponse resp = prepareSearch().setQuery(q)
.setTrackTotalHits(true)
.setProfile(true)
.setSearchType(SearchType.QUERY_THEN_FETCH)
@@ -186,7 +185,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
QueryBuilder q = QueryBuilders.matchQuery("field1", "one");
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
Map p = resp.getProfileResults();
assertNotNull(p);
@@ -227,7 +226,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
.must(QueryBuilders.matchQuery("field1", "one"))
.must(QueryBuilders.matchQuery("field1", "two"));
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
Map p = resp.getProfileResults();
assertNotNull(p);
@@ -288,7 +287,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
QueryBuilder q = QueryBuilders.boolQuery();
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
assertNotNull("Profile response element should not be null", resp.getProfileResults());
assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
@@ -333,7 +332,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
assertNotNull("Profile response element should not be null", resp.getProfileResults());
assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
@@ -373,7 +372,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
.negativeBoost(randomFloat());
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
assertNotNull("Profile response element should not be null", resp.getProfileResults());
assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
@@ -413,7 +412,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
.add(QueryBuilders.rangeQuery("field2").from(null).to(73).includeLower(true).includeUpper(true));
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
assertNotNull("Profile response element should not be null", resp.getProfileResults());
assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
@@ -452,7 +451,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
logger.info("Query: {}", q.toString());
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(true).setSearchType(SearchType.QUERY_THEN_FETCH).get();
assertNotNull("Profile response element should not be null", resp.getProfileResults());
assertThat("Profile response should not be an empty array", resp.getProfileResults().size(), not(0));
@@ -493,8 +492,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch()
- .setQuery(q)
+ SearchResponse resp = prepareSearch().setQuery(q)
.setIndices("test")
.setProfile(true)
.setSearchType(SearchType.QUERY_THEN_FETCH)
@@ -545,7 +543,7 @@ public class QueryProfilerIT extends ESIntegTestCase {
logger.info("Query: {}", q);
- SearchResponse resp = client().prepareSearch().setQuery(q).setProfile(false).get();
+ SearchResponse resp = prepareSearch().setQuery(q).setProfile(false).get();
assertThat("Profile response element should be an empty map", resp.getProfileResults().size(), equalTo(0));
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
index 3b19d55efef7..1d13bea9e063 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java
@@ -67,10 +67,10 @@ public class SearchPreferenceIT extends ESIntegTestCase {
"_prefer_nodes:somenode,server2" };
for (String pref : preferences) {
logger.info("--> Testing out preference={}", pref);
- SearchResponse searchResponse = client().prepareSearch().setSize(0).setPreference(pref).get();
+ SearchResponse searchResponse = prepareSearch().setSize(0).setPreference(pref).get();
assertThat(RestStatus.OK, equalTo(searchResponse.status()));
assertThat(pref, searchResponse.getFailedShards(), greaterThanOrEqualTo(0));
- searchResponse = client().prepareSearch().setPreference(pref).get();
+ searchResponse = prepareSearch().setPreference(pref).get();
assertThat(RestStatus.OK, equalTo(searchResponse.status()));
assertThat(pref, searchResponse.getFailedShards(), greaterThanOrEqualTo(0));
}
@@ -112,13 +112,13 @@ public class SearchPreferenceIT extends ESIntegTestCase {
client().prepareIndex("test").setSource("field1", "value1").get();
refresh();
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setPreference("_local").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setPreference("_local").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setPreference("1234").get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setPreference("1234").get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
}
@@ -127,7 +127,7 @@ public class SearchPreferenceIT extends ESIntegTestCase {
ensureGreen();
try {
- client().prepareSearch().setQuery(matchAllQuery()).setPreference("_only_nodes:DOES-NOT-EXIST").get();
+ prepareSearch().setQuery(matchAllQuery()).setPreference("_only_nodes:DOES-NOT-EXIST").get();
fail("Expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
assertThat(e, hasToString(containsString("no data nodes with criteria [DOES-NOT-EXIST] found for shard: [test][")));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java
index 294768a319b0..dc460468db60 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java
@@ -114,10 +114,9 @@ public class ScriptQuerySearchIT extends ESIntegTestCase {
flush();
refresh();
- SearchResponse response = client().prepareSearch()
- .setQuery(
- scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['binaryData'].get(0).length > 15", emptyMap()))
- )
+ SearchResponse response = prepareSearch().setQuery(
+ scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['binaryData'].get(0).length > 15", emptyMap()))
+ )
.addScriptField(
"sbinaryData",
new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['binaryData'].get(0).length", emptyMap())
@@ -169,8 +168,9 @@ public class ScriptQuerySearchIT extends ESIntegTestCase {
refresh();
logger.info("running doc['num1'].value > 1");
- SearchResponse response = client().prepareSearch()
- .setQuery(scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > 1", Collections.emptyMap())))
+ SearchResponse response = prepareSearch().setQuery(
+ scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > 1", Collections.emptyMap()))
+ )
.addSort("num1", SortOrder.ASC)
.addScriptField("sNum1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value", Collections.emptyMap()))
.get();
@@ -185,8 +185,9 @@ public class ScriptQuerySearchIT extends ESIntegTestCase {
params.put("param1", 2);
logger.info("running doc['num1'].value > param1");
- response = client().prepareSearch()
- .setQuery(scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > param1", params)))
+ response = prepareSearch().setQuery(
+ scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > param1", params))
+ )
.addSort("num1", SortOrder.ASC)
.addScriptField("sNum1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value", Collections.emptyMap()))
.get();
@@ -198,8 +199,9 @@ public class ScriptQuerySearchIT extends ESIntegTestCase {
params = new HashMap<>();
params.put("param1", -1);
logger.info("running doc['num1'].value > param1");
- response = client().prepareSearch()
- .setQuery(scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > param1", params)))
+ response = prepareSearch().setQuery(
+ scriptQuery(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > param1", params))
+ )
.addSort("num1", SortOrder.ASC)
.addScriptField("sNum1", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value", Collections.emptyMap()))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
index 6fb19890a183..f94e59cbe1ab 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java
@@ -81,8 +81,7 @@ public class SearchScrollIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.addSort("field", SortOrder.ASC)
@@ -134,8 +133,7 @@ public class SearchScrollIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.QUERY_THEN_FETCH)
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.QUERY_THEN_FETCH)
.setQuery(matchAllQuery())
.setSize(3)
.setScroll(TimeValue.timeValueMinutes(2))
@@ -202,26 +200,13 @@ public class SearchScrollIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- assertThat(client().prepareSearch().setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value, equalTo(500L));
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value,
- equalTo(500L)
- );
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value,
- equalTo(500L)
- );
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
- equalTo(0L)
- );
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
- equalTo(0L)
- );
+ assertThat(prepareSearch().setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value, equalTo(500L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value, equalTo(500L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value, equalTo(500L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value, equalTo(0L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value, equalTo(0L));
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(queryStringQuery("user:kimchy"))
+ SearchResponse searchResponse = prepareSearch().setQuery(queryStringQuery("user:kimchy"))
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.addSort("postDate", SortOrder.ASC)
@@ -237,21 +222,15 @@ public class SearchScrollIT extends ESIntegTestCase {
} while (searchResponse.getHits().getHits().length > 0);
indicesAdmin().prepareRefresh().get();
- assertThat(client().prepareSearch().setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value, equalTo(500L));
+ assertThat(prepareSearch().setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value, equalTo(500L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value, equalTo(0L));
+ assertThat(prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value, equalTo(0L));
assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value,
- equalTo(0L)
- );
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "test")).get().getHits().getTotalHits().value,
- equalTo(0L)
- );
- assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
equalTo(500L)
);
assertThat(
- client().prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
+ prepareSearch().setSize(0).setQuery(termQuery("message", "update")).get().getHits().getTotalHits().value,
equalTo(500L)
);
} finally {
@@ -274,16 +253,14 @@ public class SearchScrollIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse1 = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse1 = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.setSearchType(SearchType.QUERY_THEN_FETCH)
.addSort("field", SortOrder.ASC)
.get();
- SearchResponse searchResponse2 = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse2 = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.setSearchType(SearchType.QUERY_THEN_FETCH)
@@ -394,16 +371,14 @@ public class SearchScrollIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh().get();
- SearchResponse searchResponse1 = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse1 = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.setSearchType(SearchType.QUERY_THEN_FETCH)
.addSort("field", SortOrder.ASC)
.get();
- SearchResponse searchResponse2 = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse2 = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.setSearchType(SearchType.QUERY_THEN_FETCH)
@@ -538,8 +513,7 @@ public class SearchScrollIT extends ESIntegTestCase {
client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", i).get();
}
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(35)
.setScroll(TimeValue.timeValueMinutes(2))
.addSort("field", SortOrder.ASC)
@@ -602,7 +576,7 @@ public class SearchScrollIT extends ESIntegTestCase {
Exception exc = expectThrows(
Exception.class,
- () -> client().prepareSearch().setQuery(matchAllQuery()).setSize(1).setScroll(TimeValue.timeValueHours(2)).get()
+ () -> prepareSearch().setQuery(matchAllQuery()).setSize(1).setScroll(TimeValue.timeValueHours(2)).get()
);
IllegalArgumentException illegalArgumentException = (IllegalArgumentException) ExceptionsHelper.unwrap(
exc,
@@ -611,11 +585,7 @@ public class SearchScrollIT extends ESIntegTestCase {
assertNotNull(illegalArgumentException);
assertThat(illegalArgumentException.getMessage(), containsString("Keep alive for request (2h) is too large"));
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
- .setSize(1)
- .setScroll(TimeValue.timeValueMinutes(5))
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(1).setScroll(TimeValue.timeValueMinutes(5)).get();
assertNotNull(searchResponse.getScrollId());
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L));
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java
index 64597a352011..96c007e05e41 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java
@@ -58,8 +58,7 @@ public class SearchScrollWithFailingNodesIT extends ESIntegTestCase {
indexRandom(false, writes);
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(10)
.setScroll(TimeValue.timeValueMinutes(1))
.get();
@@ -75,7 +74,7 @@ public class SearchScrollWithFailingNodesIT extends ESIntegTestCase {
internalCluster().stopRandomNonMasterNode();
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).setScroll(TimeValue.timeValueMinutes(1)).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).setScroll(TimeValue.timeValueMinutes(1)).get();
assertThat(searchResponse.getSuccessfulShards(), lessThan(searchResponse.getTotalShards()));
numHits = 0;
int numberOfSuccessfulShards = searchResponse.getSuccessfulShards();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java
index a1e860ba848b..7edc0ff139a1 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java
@@ -143,12 +143,11 @@ public class SearchSliceIT extends ESIntegTestCase {
.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("test").alias("alias3").routing("baz"))
.get()
);
- SearchResponse sr = client().prepareSearch("alias1", "alias3").setQuery(matchAllQuery()).setSize(0).get();
+ SearchResponse sr = prepareSearch("alias1", "alias3").setQuery(matchAllQuery()).setSize(0).get();
int numDocs = (int) sr.getHits().getTotalHits().value;
int max = randomIntBetween(2, numShards * 3);
int fetchSize = randomIntBetween(10, 100);
- SearchRequestBuilder request = client().prepareSearch("alias1", "alias3")
- .setQuery(matchAllQuery())
+ SearchRequestBuilder request = prepareSearch("alias1", "alias3").setQuery(matchAllQuery())
.setScroll(new Scroll(TimeValue.timeValueSeconds(10)))
.setSize(fetchSize)
.addSort(SortBuilders.fieldSort("_doc"));
@@ -277,7 +276,7 @@ public class SearchSliceIT extends ESIntegTestCase {
setupIndex(0, 1);
SearchPhaseExecutionException exc = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch().setQuery(matchAllQuery()).slice(new SliceBuilder("invalid_random_int", 0, 10)).get()
+ () -> prepareSearch().setQuery(matchAllQuery()).slice(new SliceBuilder("invalid_random_int", 0, 10)).get()
);
Throwable rootCause = findRootCause(exc);
assertThat(rootCause.getClass(), equalTo(SearchException.class));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java
index 2d3af1f555d4..87d87f226073 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java
@@ -120,10 +120,9 @@ public class FieldSortIT extends ESIntegTestCase {
}
refresh();
// sort DESC
- SearchResponse searchResponse = client().prepareSearch()
- .addSort(new FieldSortBuilder("entry").order(SortOrder.DESC).unmappedType(useMapping ? null : "long"))
- .setSize(10)
- .get();
+ SearchResponse searchResponse = prepareSearch().addSort(
+ new FieldSortBuilder("entry").order(SortOrder.DESC).unmappedType(useMapping ? null : "long")
+ ).setSize(10).get();
logClusterState();
assertNoFailures(searchResponse);
@@ -134,10 +133,9 @@ public class FieldSortIT extends ESIntegTestCase {
}
// sort ASC
- searchResponse = client().prepareSearch()
- .addSort(new FieldSortBuilder("entry").order(SortOrder.ASC).unmappedType(useMapping ? null : "long"))
- .setSize(10)
- .get();
+ searchResponse = prepareSearch().addSort(
+ new FieldSortBuilder("entry").order(SortOrder.ASC).unmappedType(useMapping ? null : "long")
+ ).setSize(10).get();
logClusterState();
assertNoFailures(searchResponse);
@@ -174,25 +172,20 @@ public class FieldSortIT extends ESIntegTestCase {
docs += builders.size();
builders.clear();
}
- SearchResponse allDocsResponse = client().prepareSearch()
- .setQuery(
- QueryBuilders.boolQuery()
- .must(QueryBuilders.termQuery("foo", "bar"))
- .must(QueryBuilders.rangeQuery("timeUpdated").gte("2014/0" + randomIntBetween(1, 7) + "/01"))
- )
- .addSort(new FieldSortBuilder("timeUpdated").order(SortOrder.ASC).unmappedType("date"))
- .setSize(docs)
- .get();
+ SearchResponse allDocsResponse = prepareSearch().setQuery(
+ QueryBuilders.boolQuery()
+ .must(QueryBuilders.termQuery("foo", "bar"))
+ .must(QueryBuilders.rangeQuery("timeUpdated").gte("2014/0" + randomIntBetween(1, 7) + "/01"))
+ ).addSort(new FieldSortBuilder("timeUpdated").order(SortOrder.ASC).unmappedType("date")).setSize(docs).get();
assertNoFailures(allDocsResponse);
final int numiters = randomIntBetween(1, 20);
for (int i = 0; i < numiters; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(
- QueryBuilders.boolQuery()
- .must(QueryBuilders.termQuery("foo", "bar"))
- .must(QueryBuilders.rangeQuery("timeUpdated").gte("2014/" + Strings.format("%02d", randomIntBetween(1, 7)) + "/01"))
- )
+ SearchResponse searchResponse = prepareSearch().setQuery(
+ QueryBuilders.boolQuery()
+ .must(QueryBuilders.termQuery("foo", "bar"))
+ .must(QueryBuilders.rangeQuery("timeUpdated").gte("2014/" + Strings.format("%02d", randomIntBetween(1, 7)) + "/01"))
+ )
.addSort(new FieldSortBuilder("timeUpdated").order(SortOrder.ASC).unmappedType("date"))
.setSize(scaledRandomIntBetween(1, docs))
.get();
@@ -221,7 +214,7 @@ public class FieldSortIT extends ESIntegTestCase {
);
refresh();
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addSort("svalue", SortOrder.ASC).get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).addSort("svalue", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getMaxScore(), equalTo(Float.NaN));
for (SearchHit hit : searchResponse.getHits()) {
@@ -229,7 +222,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
// now check with score tracking
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).addSort("svalue", SortOrder.ASC).setTrackScores(true).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addSort("svalue", SortOrder.ASC).setTrackScores(true).get();
assertThat(searchResponse.getHits().getMaxScore(), not(equalTo(Float.NaN)));
for (SearchHit hit : searchResponse.getHits()) {
@@ -298,8 +291,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
if (sparseBytes.isEmpty() == false) {
int size = between(1, sparseBytes.size());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setPostFilter(QueryBuilders.existsQuery("sparse_bytes"))
.setSize(size)
.addSort("sparse_bytes", SortOrder.ASC)
@@ -575,11 +567,7 @@ public class FieldSortIT extends ESIntegTestCase {
// STRING
int size = 1 + random.nextInt(10);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
- .setSize(size)
- .addSort("str_value", SortOrder.ASC)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
for (int i = 0; i < size; i++) {
@@ -590,7 +578,7 @@ public class FieldSortIT extends ESIntegTestCase {
);
}
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -606,7 +594,7 @@ public class FieldSortIT extends ESIntegTestCase {
// BYTE
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -615,7 +603,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(((Number) searchResponse.getHits().getAt(i).getSortValues()[0]).byteValue(), equalTo((byte) i));
}
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("byte_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -628,7 +616,7 @@ public class FieldSortIT extends ESIntegTestCase {
// SHORT
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -637,7 +625,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(((Number) searchResponse.getHits().getAt(i).getSortValues()[0]).shortValue(), equalTo((short) i));
}
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("short_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -650,7 +638,7 @@ public class FieldSortIT extends ESIntegTestCase {
// INTEGER
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -661,7 +649,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.toString(), not(containsString("error")));
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("integer_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -674,7 +662,7 @@ public class FieldSortIT extends ESIntegTestCase {
// LONG
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -685,7 +673,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.toString(), not(containsString("error")));
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("long_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10L);
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -698,7 +686,7 @@ public class FieldSortIT extends ESIntegTestCase {
// FLOAT
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10L);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -709,7 +697,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.toString(), not(containsString("error")));
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("float_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -722,7 +710,7 @@ public class FieldSortIT extends ESIntegTestCase {
// DOUBLE
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.ASC).get();
assertHitCount(searchResponse, 10L);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -733,7 +721,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.toString(), not(containsString("error")));
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("double_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10L);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -780,8 +768,7 @@ public class FieldSortIT extends ESIntegTestCase {
refresh();
logger.info("--> sort with no missing (same as missing _last)");
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("i_value").order(SortOrder.ASC))
.get();
assertNoFailures(searchResponse);
@@ -792,8 +779,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("2"));
logger.info("--> sort with missing _last");
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("i_value").order(SortOrder.ASC).missing("_last"))
.get();
assertNoFailures(searchResponse);
@@ -804,8 +790,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("2"));
logger.info("--> sort with missing _first");
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("i_value").order(SortOrder.ASC).missing("_first"))
.get();
assertNoFailures(searchResponse);
@@ -855,8 +840,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
logger.info("--> sort with no missing (same as missing _last)");
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("value").order(SortOrder.ASC))
.get();
assertThat(Arrays.toString(searchResponse.getShardFailures()), searchResponse.getFailedShards(), equalTo(0));
@@ -867,8 +851,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("2"));
logger.info("--> sort with missing _last");
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("value").order(SortOrder.ASC).missing("_last"))
.get();
assertThat(Arrays.toString(searchResponse.getShardFailures()), searchResponse.getFailedShards(), equalTo(0));
@@ -879,8 +862,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("2"));
logger.info("--> sort with missing _first");
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("value").order(SortOrder.ASC).missing("_first"))
.get();
assertThat(Arrays.toString(searchResponse.getShardFailures()), searchResponse.getFailedShards(), equalTo(0));
@@ -891,8 +873,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3"));
logger.info("--> sort with missing b");
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("value").order(SortOrder.ASC).missing("b"))
.get();
assertThat(Arrays.toString(searchResponse.getShardFailures()), searchResponse.getFailedShards(), equalTo(0));
@@ -1036,7 +1017,7 @@ public class FieldSortIT extends ESIntegTestCase {
logger.info("--> sort with an unmapped field, verify it fails");
try {
- SearchResponse result = client().prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("kkk")).get();
+ SearchResponse result = prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("kkk")).get();
assertThat("Expected exception but returned with", result, nullValue());
} catch (SearchPhaseExecutionException e) {
// we check that it's a parse failure rather than a different shard failure
@@ -1045,12 +1026,11 @@ public class FieldSortIT extends ESIntegTestCase {
}
}
- assertNoFailures(client().prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("kkk").unmappedType("keyword")));
+ assertNoFailures(prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("kkk").unmappedType("keyword")));
// nested field
assertNoFailures(
- client().prepareSearch()
- .setQuery(matchAllQuery())
+ prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("nested.foo")
.unmappedType("keyword")
@@ -1060,8 +1040,7 @@ public class FieldSortIT extends ESIntegTestCase {
// nestedQuery
assertNoFailures(
- client().prepareSearch()
- .setQuery(matchAllQuery())
+ prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("nested.foo")
.unmappedType("keyword")
@@ -1150,11 +1129,7 @@ public class FieldSortIT extends ESIntegTestCase {
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
- .setSize(10)
- .addSort("long_values", SortOrder.ASC)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("long_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1168,7 +1143,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).longValue(), equalTo(7L));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("long_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("long_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1182,8 +1157,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).longValue(), equalTo(3L));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(10)
.addSort(SortBuilders.fieldSort("long_values").order(SortOrder.DESC).sortMode(SortMode.SUM))
.get();
@@ -1200,8 +1174,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).longValue(), equalTo(2L));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(10)
.addSort(SortBuilders.fieldSort("long_values").order(SortOrder.DESC).sortMode(SortMode.AVG))
.get();
@@ -1218,8 +1191,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).longValue(), equalTo(1L));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(10)
.addSort(SortBuilders.fieldSort("long_values").order(SortOrder.DESC).sortMode(SortMode.MEDIAN))
.get();
@@ -1236,7 +1208,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).longValue(), equalTo(2L));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("int_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("int_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1250,7 +1222,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(7));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("int_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("int_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1264,7 +1236,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(3));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("short_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("short_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1278,7 +1250,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(7));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("short_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("short_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1292,7 +1264,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(3));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("byte_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("byte_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1306,7 +1278,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(7));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("byte_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("byte_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1320,7 +1292,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).intValue(), equalTo(3));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("float_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("float_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1334,7 +1306,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).floatValue(), equalTo(7f));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("float_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("float_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1348,7 +1320,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).floatValue(), equalTo(3f));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("double_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("double_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1362,7 +1334,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).doubleValue(), equalTo(7d));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("double_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("double_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1376,7 +1348,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(3)));
assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).doubleValue(), equalTo(3d));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("string_values", SortOrder.ASC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("string_values", SortOrder.ASC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1390,7 +1362,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).getId(), equalTo(Integer.toString(2)));
assertThat(searchResponse.getHits().getAt(2).getSortValues()[0], equalTo("07"));
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("string_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(10).addSort("string_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1427,11 +1399,7 @@ public class FieldSortIT extends ESIntegTestCase {
.get();
refresh();
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
- .setSize(3)
- .addSort("string_values", SortOrder.DESC)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(3).addSort("string_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getHits().length, equalTo(1));
@@ -1450,7 +1418,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
refresh();
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(2).addSort("string_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(2).addSort("string_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getHits().length, equalTo(2));
@@ -1472,7 +1440,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
refresh();
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(3).addSort("string_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(3).addSort("string_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1493,7 +1461,7 @@ public class FieldSortIT extends ESIntegTestCase {
refresh();
}
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(3).addSort("string_values", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(3).addSort("string_values", SortOrder.DESC).get();
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
@@ -1520,8 +1488,7 @@ public class FieldSortIT extends ESIntegTestCase {
indexRandom(true, indexReqs);
SortOrder order = randomFrom(SortOrder.values());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(randomIntBetween(1, numDocs + 5))
.addSort("_id", order)
.get();
@@ -1621,8 +1588,7 @@ public class FieldSortIT extends ESIntegTestCase {
// We sort on nested field
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("nested.foo").setNestedSort(new NestedSortBuilder("nested")).order(SortOrder.DESC))
.get();
assertNoFailures(searchResponse);
@@ -1634,8 +1600,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(hits[1].getSortValues()[0], is("bar"));
// We sort on nested fields with max_children limit
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("nested.foo").setNestedSort(new NestedSortBuilder("nested").setMaxChildren(1)).order(SortOrder.DESC)
)
@@ -1651,8 +1616,7 @@ public class FieldSortIT extends ESIntegTestCase {
{
SearchPhaseExecutionException exc = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch()
- .setQuery(matchAllQuery())
+ () -> prepareSearch().setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("nested.bar.foo")
.setNestedSort(
@@ -1666,8 +1630,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
// We sort on nested sub field
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort("nested.foo.sub").setNestedSort(new NestedSortBuilder("nested")).order(SortOrder.DESC))
.get();
assertNoFailures(searchResponse);
@@ -1681,7 +1644,7 @@ public class FieldSortIT extends ESIntegTestCase {
// missing nested path
SearchPhaseExecutionException exc = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("nested.foo")).get()
+ () -> prepareSearch().setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("nested.foo")).get()
);
assertThat(exc.toString(), containsString("it is mandatory to set the [nested] context"));
}
@@ -1766,8 +1729,7 @@ public class FieldSortIT extends ESIntegTestCase {
{
Script script = new Script(ScriptType.INLINE, NAME, "doc['number'].value", Collections.emptyMap());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(randomIntBetween(1, numDocs + 5))
.addSort(SortBuilders.scriptSort(script, ScriptSortBuilder.ScriptSortType.NUMBER))
.addSort(SortBuilders.scoreSort())
@@ -1783,8 +1745,7 @@ public class FieldSortIT extends ESIntegTestCase {
{
Script script = new Script(ScriptType.INLINE, NAME, "doc['keyword'].value", Collections.emptyMap());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(randomIntBetween(1, numDocs + 5))
.addSort(SortBuilders.scriptSort(script, ScriptSortBuilder.ScriptSortType.STRING))
.addSort(SortBuilders.scoreSort())
@@ -1812,8 +1773,7 @@ public class FieldSortIT extends ESIntegTestCase {
builders.add(client().prepareIndex("new_index").setSource("route_length_miles", 100.2));
indexRandom(true, true, builders);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(builders.size())
.addSort(SortBuilders.fieldSort("route_length_miles"))
.get();
@@ -1838,8 +1798,7 @@ public class FieldSortIT extends ESIntegTestCase {
builders.add(client().prepareIndex("new_index").setSource("route_length_miles", 100.2));
indexRandom(true, true, builders);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(builders.size())
.addSort(SortBuilders.fieldSort("route_length_miles").missing(120.3))
.get();
@@ -1864,8 +1823,7 @@ public class FieldSortIT extends ESIntegTestCase {
indexRandom(true, true, builders);
{
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(builders.size())
.addSort(SortBuilders.fieldSort("field").setNumericType("long"))
.get();
@@ -1881,8 +1839,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
{
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(builders.size())
.addSort(SortBuilders.fieldSort("field").setNumericType("double"))
.get();
@@ -1908,8 +1865,7 @@ public class FieldSortIT extends ESIntegTestCase {
indexRandom(true, true, builders);
{
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(2)
.addSort(SortBuilders.fieldSort("field").setNumericType("date"))
.get();
@@ -1922,8 +1878,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertEquals(1712879236854L, hits.getAt(0).getSortValues()[0]);
assertEquals(1712879237000L, hits.getAt(1).getSortValues()[0]);
- response = client().prepareSearch()
- .setMaxConcurrentShardRequests(1)
+ response = prepareSearch().setMaxConcurrentShardRequests(1)
.setQuery(matchAllQuery())
.setSize(1)
.addSort(SortBuilders.fieldSort("field").setNumericType("date"))
@@ -1934,8 +1889,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(hits.getAt(0).getSortValues()[0].getClass(), equalTo(Long.class));
assertEquals(1712879236854L, hits.getAt(0).getSortValues()[0]);
- response = client().prepareSearch()
- .setMaxConcurrentShardRequests(1)
+ response = prepareSearch().setMaxConcurrentShardRequests(1)
.setQuery(matchAllQuery())
.setSize(1)
.addSort(SortBuilders.fieldSort("field").order(SortOrder.DESC).setNumericType("date"))
@@ -1948,8 +1902,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
{
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(2)
.addSort(SortBuilders.fieldSort("field").setNumericType("date_nanos"))
.get();
@@ -1961,8 +1914,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertEquals(1712879236854775807L, hits.getAt(0).getSortValues()[0]);
assertEquals(1712879237000000000L, hits.getAt(1).getSortValues()[0]);
- response = client().prepareSearch()
- .setMaxConcurrentShardRequests(1)
+ response = prepareSearch().setMaxConcurrentShardRequests(1)
.setQuery(matchAllQuery())
.setSize(1)
.addSort(SortBuilders.fieldSort("field").setNumericType("date_nanos"))
@@ -1972,8 +1924,7 @@ public class FieldSortIT extends ESIntegTestCase {
assertThat(hits.getAt(0).getSortValues()[0].getClass(), equalTo(Long.class));
assertEquals(1712879236854775807L, hits.getAt(0).getSortValues()[0]);
- response = client().prepareSearch()
- .setMaxConcurrentShardRequests(1)
+ response = prepareSearch().setMaxConcurrentShardRequests(1)
.setQuery(matchAllQuery())
.setSize(1)
.addSort(SortBuilders.fieldSort("field").order(SortOrder.DESC).setNumericType("date_nanos"))
@@ -1988,8 +1939,7 @@ public class FieldSortIT extends ESIntegTestCase {
builders.clear();
builders.add(client().prepareIndex("index_date").setSource("field", "1905-04-11T23:47:17"));
indexRandom(true, true, builders);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setSize(1)
.addSort(SortBuilders.fieldSort("field").setNumericType("date_nanos"))
.get();
@@ -2002,8 +1952,7 @@ public class FieldSortIT extends ESIntegTestCase {
builders.clear();
builders.add(client().prepareIndex("index_date").setSource("field", "2346-04-11T23:47:17"));
indexRandom(true, true, builders);
- SearchResponse response = client().prepareSearch()
- .setQuery(QueryBuilders.rangeQuery("field").gt("1970-01-01"))
+ SearchResponse response = prepareSearch().setQuery(QueryBuilders.rangeQuery("field").gt("1970-01-01"))
.setSize(10)
.addSort(SortBuilders.fieldSort("field").setNumericType("date_nanos"))
.get();
@@ -2020,8 +1969,7 @@ public class FieldSortIT extends ESIntegTestCase {
for (String numericType : new String[] { "long", "double", "date", "date_nanos" }) {
ElasticsearchException exc = expectThrows(
ElasticsearchException.class,
- () -> client().prepareSearch()
- .setQuery(matchAllQuery())
+ () -> prepareSearch().setQuery(matchAllQuery())
.addSort(SortBuilders.fieldSort(invalidField).setNumericType(numericType))
.get()
);
@@ -2050,10 +1998,7 @@ public class FieldSortIT extends ESIntegTestCase {
refresh();
// *** 1. sort DESC on long_field
- SearchResponse searchResponse = client().prepareSearch()
- .addSort(new FieldSortBuilder("long_field").order(SortOrder.DESC))
- .setSize(10)
- .get();
+ SearchResponse searchResponse = prepareSearch().addSort(new FieldSortBuilder("long_field").order(SortOrder.DESC)).setSize(10).get();
assertNoFailures(searchResponse);
long previousLong = Long.MAX_VALUE;
for (int i = 0; i < searchResponse.getHits().getHits().length; i++) {
@@ -2065,7 +2010,7 @@ public class FieldSortIT extends ESIntegTestCase {
}
// *** 2. sort ASC on long_field
- searchResponse = client().prepareSearch().addSort(new FieldSortBuilder("long_field").order(SortOrder.ASC)).setSize(10).get();
+ searchResponse = prepareSearch().addSort(new FieldSortBuilder("long_field").order(SortOrder.ASC)).setSize(10).get();
assertNoFailures(searchResponse);
previousLong = Long.MIN_VALUE;
for (int i = 0; i < searchResponse.getHits().getHits().length; i++) {
@@ -2090,8 +2035,7 @@ public class FieldSortIT extends ESIntegTestCase {
refresh();
{ // mixing long and integer types is ok, as we convert integer sort to long sort
- SearchResponse searchResponse = client().prepareSearch("index_long", "index_integer")
- .addSort(new FieldSortBuilder("foo"))
+ SearchResponse searchResponse = prepareSearch("index_long", "index_integer").addSort(new FieldSortBuilder("foo"))
.setSize(10)
.get();
assertNoFailures(searchResponse);
@@ -2102,7 +2046,7 @@ public class FieldSortIT extends ESIntegTestCase {
{ // mixing long and double types is not allowed
SearchPhaseExecutionException exc = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch("index_long", "index_double").addSort(new FieldSortBuilder("foo")).setSize(10).get()
+ () -> prepareSearch("index_long", "index_double").addSort(new FieldSortBuilder("foo")).setSize(10).get()
);
assertThat(exc.getCause().toString(), containsString(errMsg));
}
@@ -2110,7 +2054,7 @@ public class FieldSortIT extends ESIntegTestCase {
{ // mixing long and keyword types is not allowed
SearchPhaseExecutionException exc = expectThrows(
SearchPhaseExecutionException.class,
- () -> client().prepareSearch("index_long", "index_keyword").addSort(new FieldSortBuilder("foo")).setSize(10).get()
+ () -> prepareSearch("index_long", "index_keyword").addSort(new FieldSortBuilder("foo")).setSize(10).get()
);
assertThat(exc.getCause().toString(), containsString(errMsg));
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java
index 051852548638..777db15b596e 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java
@@ -614,8 +614,7 @@ public class GeoDistanceIT extends ESIntegTestCase {
refresh();
// Order: Asc
- SearchResponse searchResponse = client().prepareSearch("test1", "test2")
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch("test1", "test2").setQuery(matchAllQuery())
.addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).ignoreUnmapped(true).order(SortOrder.ASC))
.get();
@@ -625,8 +624,7 @@ public class GeoDistanceIT extends ESIntegTestCase {
assertThat(((Number) searchResponse.getHits().getAt(1).getSortValues()[0]).doubleValue(), equalTo(Double.POSITIVE_INFINITY));
// Order: Desc
- searchResponse = client().prepareSearch("test1", "test2")
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch("test1", "test2").setQuery(matchAllQuery())
.addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).ignoreUnmapped(true).order(SortOrder.DESC))
.get();
@@ -637,8 +635,7 @@ public class GeoDistanceIT extends ESIntegTestCase {
assertThat(((Number) searchResponse.getHits().getAt(1).getSortValues()[0]).doubleValue(), closeTo(5286d, 10d));
// Make sure that by default the unmapped fields continue to fail
- searchResponse = client().prepareSearch("test1", "test2")
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch("test1", "test2").setQuery(matchAllQuery())
.addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.DESC))
.get();
assertThat(searchResponse.getFailedShards(), greaterThan(0));
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java
index 0862d919843d..a04090e9d04b 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java
@@ -84,8 +84,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
q[0] = new GeoPoint(2, 1);
}
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.MIN).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d1", "d2");
@@ -98,8 +97,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
closeTo(GeoDistance.ARC.calculate(2, 1, 5, 1, DistanceUnit.METERS), 10d)
);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.MIN).order(SortOrder.DESC))
.get();
assertOrderedSearchHits(searchResponse, "d2", "d1");
@@ -112,8 +110,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
closeTo(GeoDistance.ARC.calculate(2, 2, 3, 2, DistanceUnit.METERS), 10d)
);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.MAX).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d1", "d2");
@@ -126,8 +123,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
closeTo(GeoDistance.ARC.calculate(2, 1, 6, 2, DistanceUnit.METERS), 10d)
);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.MAX).order(SortOrder.DESC))
.get();
assertOrderedSearchHits(searchResponse, "d2", "d1");
@@ -168,8 +164,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
);
GeoPoint q = new GeoPoint(0, 0);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.AVG).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d2", "d1");
@@ -182,8 +177,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
closeTo(GeoDistance.ARC.calculate(0, 0, 0, 5, DistanceUnit.METERS), 10d)
);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(new GeoDistanceSortBuilder(LOCATION_FIELD, q).sortMode(SortMode.MEDIAN).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d1", "d2");
@@ -251,8 +245,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
}
}
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(geoDistanceSortBuilder.sortMode(SortMode.MIN).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d1", "d2");
@@ -265,8 +258,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
closeTo(GeoDistance.ARC.calculate(4.5, 1, 2, 1, DistanceUnit.METERS), 1.e-1)
);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(geoDistanceSortBuilder.sortMode(SortMode.MAX).order(SortOrder.ASC))
.get();
assertOrderedSearchHits(searchResponse, "d1", "d2");
@@ -297,50 +289,41 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
GeoDistanceSortBuilder geoDistanceSortBuilder = new GeoDistanceSortBuilder(LOCATION_FIELD, hashPoint);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(geoDistanceSortBuilder.sortMode(SortMode.MIN).order(SortOrder.ASC))
.get();
checkCorrectSortOrderForGeoSort(searchResponse);
geoDistanceSortBuilder = new GeoDistanceSortBuilder(LOCATION_FIELD, new GeoPoint(2, 2));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(geoDistanceSortBuilder.sortMode(SortMode.MIN).order(SortOrder.ASC))
.get();
checkCorrectSortOrderForGeoSort(searchResponse);
geoDistanceSortBuilder = new GeoDistanceSortBuilder(LOCATION_FIELD, 2, 2);
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addSort(geoDistanceSortBuilder.sortMode(SortMode.MIN).order(SortOrder.ASC))
.get();
checkCorrectSortOrderForGeoSort(searchResponse);
- searchResponse = client().prepareSearch()
- .setSource(new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0)))
+ searchResponse = prepareSearch().setSource(new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0)))
.get();
checkCorrectSortOrderForGeoSort(searchResponse);
- searchResponse = client().prepareSearch()
- .setSource(new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, "s037ms06g7h0")))
+ searchResponse = prepareSearch().setSource(
+ new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, "s037ms06g7h0"))
+ ).get();
+ checkCorrectSortOrderForGeoSort(searchResponse);
+
+ searchResponse = prepareSearch().setSource(new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0)))
.get();
checkCorrectSortOrderForGeoSort(searchResponse);
- searchResponse = client().prepareSearch()
- .setSource(new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0)))
- .get();
- checkCorrectSortOrderForGeoSort(searchResponse);
-
- searchResponse = client().prepareSearch()
- .setSource(
- new SearchSourceBuilder().sort(
- SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0).validation(GeoValidationMethod.COERCE)
- )
- )
- .get();
+ searchResponse = prepareSearch().setSource(
+ new SearchSourceBuilder().sort(SortBuilders.geoDistanceSort(LOCATION_FIELD, 2.0, 2.0).validation(GeoValidationMethod.COERCE))
+ ).get();
checkCorrectSortOrderForGeoSort(searchResponse);
}
@@ -369,24 +352,21 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
);
assertSortValues(
- client().prepareSearch("test1", "test2")
- .addSort(fieldSort("str_field").order(SortOrder.ASC).unmappedType("keyword"))
+ prepareSearch("test1", "test2").addSort(fieldSort("str_field").order(SortOrder.ASC).unmappedType("keyword"))
.addSort(fieldSort("str_field2").order(SortOrder.DESC).unmappedType("keyword")),
new Object[] { "bcd", null },
new Object[] { null, null }
);
assertSortValues(
- client().prepareSearch("test1", "test2")
- .addSort(fieldSort("long_field").order(SortOrder.ASC).unmappedType("long"))
+ prepareSearch("test1", "test2").addSort(fieldSort("long_field").order(SortOrder.ASC).unmappedType("long"))
.addSort(fieldSort("long_field2").order(SortOrder.DESC).unmappedType("long")),
new Object[] { 3L, Long.MIN_VALUE },
new Object[] { Long.MAX_VALUE, Long.MIN_VALUE }
);
assertSortValues(
- client().prepareSearch("test1", "test2")
- .addSort(fieldSort("double_field").order(SortOrder.ASC).unmappedType("double"))
+ prepareSearch("test1", "test2").addSort(fieldSort("double_field").order(SortOrder.ASC).unmappedType("double"))
.addSort(fieldSort("double_field2").order(SortOrder.DESC).unmappedType("double")),
new Object[] { 0.65, Double.NEGATIVE_INFINITY },
new Object[] { Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY }
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java
index d5654c845822..0e430c9618bc 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java
@@ -181,8 +181,7 @@ public class SimpleSortIT extends ESIntegTestCase {
Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['str_value'].value", Collections.emptyMap());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(size)
.addSort(new ScriptSortBuilder(script, ScriptSortType.STRING))
.get();
@@ -198,7 +197,7 @@ public class SimpleSortIT extends ESIntegTestCase {
}
size = 1 + random.nextInt(10);
- searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).setSize(size).addSort("str_value", SortOrder.DESC).get();
assertHitCount(searchResponse, 10);
assertThat(searchResponse.getHits().getHits().length, equalTo(size));
@@ -261,8 +260,7 @@ public class SimpleSortIT extends ESIntegTestCase {
indicesAdmin().prepareRefresh("test").get();
// test the long values
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("min", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "get min long", Collections.emptyMap()))
.addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long"))
.setSize(10)
@@ -277,8 +275,7 @@ public class SimpleSortIT extends ESIntegTestCase {
}
// test the double values
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("min", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "get min double", Collections.emptyMap()))
.addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long"))
.setSize(10)
@@ -293,8 +290,7 @@ public class SimpleSortIT extends ESIntegTestCase {
}
// test the string values
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("min", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "get min string", Collections.emptyMap()))
.addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long"))
.setSize(10)
@@ -309,8 +305,7 @@ public class SimpleSortIT extends ESIntegTestCase {
}
// test the geopoint values
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("min", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "get min geopoint lon", Collections.emptyMap()))
.addSort(SortBuilders.fieldSort("ord").order(SortOrder.ASC).unmappedType("long"))
.setSize(10)
@@ -355,8 +350,7 @@ public class SimpleSortIT extends ESIntegTestCase {
Script scripField = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['id'].value", Collections.emptyMap());
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("id", scripField)
.addSort("svalue", SortOrder.ASC)
.get();
@@ -368,8 +362,7 @@ public class SimpleSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(1).field("id").getValue(), equalTo("3"));
assertThat(searchResponse.getHits().getAt(2).field("id").getValue(), equalTo("2"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ searchResponse = prepareSearch().setQuery(matchAllQuery())
.addScriptField("id", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['id'][0]", Collections.emptyMap()))
.addSort("svalue", SortOrder.ASC)
.get();
@@ -381,11 +374,7 @@ public class SimpleSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(1).field("id").getValue(), equalTo("3"));
assertThat(searchResponse.getHits().getAt(2).field("id").getValue(), equalTo("2"));
- searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
- .addScriptField("id", scripField)
- .addSort("svalue", SortOrder.DESC)
- .get();
+ searchResponse = prepareSearch().setQuery(matchAllQuery()).addScriptField("id", scripField).addSort("svalue", SortOrder.DESC).get();
if (searchResponse.getFailedShards() > 0) {
logger.warn("Failed shards:");
@@ -401,8 +390,7 @@ public class SimpleSortIT extends ESIntegTestCase {
assertThat(searchResponse.getHits().getAt(2).field("id").getValue(), equalTo("2"));
// a query with docs just with null values
- searchResponse = client().prepareSearch()
- .setQuery(termQuery("id", "2"))
+ searchResponse = prepareSearch().setQuery(termQuery("id", "2"))
.addScriptField("id", scripField)
.addSort("svalue", SortOrder.DESC)
.get();
@@ -443,8 +431,6 @@ public class SimpleSortIT extends ESIntegTestCase {
refresh();
Script sortScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "\u0027\u0027", Collections.emptyMap());
- assertNoFailures(
- client().prepareSearch().setQuery(matchAllQuery()).addSort(scriptSort(sortScript, ScriptSortType.STRING)).setSize(10)
- );
+ assertNoFailures(prepareSearch().setQuery(matchAllQuery()).addSort(scriptSort(sortScript, ScriptSortType.STRING)).setSize(10));
}
}
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java
index 1e9b4fdbd7cd..32f5e14b944a 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java
@@ -73,8 +73,7 @@ public class FieldUsageStatsIT extends ESIntegTestCase {
assertFalse(stats.hasField("field2"));
assertFalse(stats.hasField("date_field"));
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DEFAULT)
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.DEFAULT)
.setQuery(QueryBuilders.termQuery("field", "value"))
.addAggregation(AggregationBuilders.terms("agg1").field("field.keyword"))
.addAggregation(AggregationBuilders.filter("agg2", QueryBuilders.spanTermQuery("field2", "value2")))
@@ -114,8 +113,7 @@ public class FieldUsageStatsIT extends ESIntegTestCase {
assertEquals(Set.of(UsageContext.DOC_VALUES), stats.get("field.keyword").keySet());
assertEquals(1L * numShards, stats.get("field.keyword").getDocValues());
- client().prepareSearch()
- .setSearchType(SearchType.DEFAULT)
+ prepareSearch().setSearchType(SearchType.DEFAULT)
.setQuery(QueryBuilders.termQuery("field", "value"))
.addAggregation(AggregationBuilders.terms("agg1").field("field.keyword"))
.setSize(0)
@@ -144,8 +142,7 @@ public class FieldUsageStatsIT extends ESIntegTestCase {
.getTotal()
.getQueryCount()
);
- client().prepareSearch()
- .setSearchType(SearchType.DEFAULT)
+ prepareSearch().setSearchType(SearchType.DEFAULT)
.setPreFilterShardSize(1)
.setQuery(QueryBuilders.rangeQuery("date_field").from("2016/01/01"))
.setSize(100)
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
index 28e3cc3cf1b8..07e8c516eda4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java
@@ -188,8 +188,7 @@ public class SearchStatsIT extends ESIntegTestCase {
assertThat(indicesStats.getTotal().getSearch().getOpenContexts(), equalTo(0L));
int size = scaledRandomIntBetween(1, docs);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setSize(size)
.setScroll(TimeValue.timeValueMinutes(2))
.get();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java
index df3442b1cc58..95eb0f055b83 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java
@@ -245,7 +245,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
}
refresh();
- SearchResponse search = client().prepareSearch().setQuery(matchQuery("text", "spellchecker")).get();
+ SearchResponse search = prepareSearch().setQuery(matchQuery("text", "spellchecker")).get();
assertThat("didn't ask for suggestions but got some", search.getSuggest(), nullValue());
TermSuggestionBuilder termSuggestion = termSuggestion("text").suggestMode(SuggestMode.ALWAYS) // Always, otherwise the results can
@@ -308,12 +308,12 @@ public class SuggestSearchIT extends ESIntegTestCase {
candidateGenerator("name").prefixLength(0).minWordLength(0).suggestMode("always").maxEdits(2)
).gramSize(3);
{
- SearchRequestBuilder searchBuilder = client().prepareSearch().setSize(0);
+ SearchRequestBuilder searchBuilder = prepareSearch().setSize(0);
searchBuilder.suggest(new SuggestBuilder().setGlobalText("tetsting sugestion").addSuggestion("did_you_mean", phraseSuggestion));
assertRequestBuilderThrows(searchBuilder, SearchPhaseExecutionException.class);
}
{
- SearchRequestBuilder searchBuilder = client().prepareSearch().setSize(0);
+ SearchRequestBuilder searchBuilder = prepareSearch().setSize(0);
searchBuilder.suggest(new SuggestBuilder().setGlobalText("tetsting sugestion").addSuggestion("did_you_mean", phraseSuggestion));
assertRequestBuilderThrows(searchBuilder, SearchPhaseExecutionException.class);
}
@@ -329,7 +329,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
indexDoc("test", "4", "text", "abcc");
refresh();
- SearchResponse search = client().prepareSearch().setQuery(matchQuery("text", "spellcecker")).get();
+ SearchResponse search = prepareSearch().setQuery(matchQuery("text", "spellcecker")).get();
assertThat("didn't ask for suggestions but got some", search.getSuggest(), nullValue());
TermSuggestionBuilder termSuggest = termSuggestion("text").suggestMode(SuggestMode.ALWAYS) // Always, otherwise the results can vary
@@ -828,8 +828,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
refresh();
// When searching on a shard with a non existing mapping, we should fail
- SearchRequestBuilder request = client().prepareSearch()
- .setSize(0)
+ SearchRequestBuilder request = prepareSearch().setSize(0)
.suggest(
new SuggestBuilder().setGlobalText("tetsting sugestion")
.addSuggestion("did_you_mean", phraseSuggestion("fielddoesnotexist").maxErrors(5.0f))
@@ -837,8 +836,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
assertRequestBuilderThrows(request, SearchPhaseExecutionException.class);
// When searching on a shard which does not hold yet any document of an existing type, we should not fail
- SearchResponse searchResponse = client().prepareSearch()
- .setSize(0)
+ SearchResponse searchResponse = prepareSearch().setSize(0)
.suggest(
new SuggestBuilder().setGlobalText("tetsting sugestion")
.addSuggestion("did_you_mean", phraseSuggestion("name").maxErrors(5.0f))
@@ -878,8 +876,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
ensureGreen();
// test phrase suggestion on completely empty index
- SearchResponse searchResponse = client().prepareSearch()
- .setSize(0)
+ SearchResponse searchResponse = prepareSearch().setSize(0)
.suggest(
new SuggestBuilder().setGlobalText("tetsting sugestion")
.addSuggestion("did_you_mean", phraseSuggestion("name").maxErrors(5.0f))
@@ -897,8 +894,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
refresh();
// test phrase suggestion but nothing matches
- searchResponse = client().prepareSearch()
- .setSize(0)
+ searchResponse = prepareSearch().setSize(0)
.suggest(
new SuggestBuilder().setGlobalText("tetsting sugestion")
.addSuggestion("did_you_mean", phraseSuggestion("name").maxErrors(5.0f))
@@ -914,8 +910,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
indexDoc("test", "1", "name", "Just testing the suggestions api");
refresh();
- searchResponse = client().prepareSearch()
- .setSize(0)
+ searchResponse = prepareSearch().setSize(0)
.suggest(
new SuggestBuilder().setGlobalText("tetsting sugestion")
.addSuggestion("did_you_mean", phraseSuggestion("name").maxErrors(5.0f))
@@ -1416,7 +1411,7 @@ public class SuggestSearchIT extends ESIntegTestCase {
}
protected Suggest searchSuggest(String suggestText, int expectShardsFailed, Map> suggestions) {
- SearchRequestBuilder builder = client().prepareSearch().setSize(0);
+ SearchRequestBuilder builder = prepareSearch().setSize(0);
SuggestBuilder suggestBuilder = new SuggestBuilder();
if (suggestText != null) {
suggestBuilder.setGlobalText(suggestText);
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java
index c43f13be7d10..5c1f925bddc4 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java
@@ -55,17 +55,11 @@ public class SimilarityIT extends ESIntegTestCase {
.execute()
.actionGet();
- SearchResponse bm25SearchResponse = client().prepareSearch()
- .setQuery(matchQuery("field1", "quick brown fox"))
- .execute()
- .actionGet();
+ SearchResponse bm25SearchResponse = prepareSearch().setQuery(matchQuery("field1", "quick brown fox")).execute().actionGet();
assertThat(bm25SearchResponse.getHits().getTotalHits().value, equalTo(1L));
float bm25Score = bm25SearchResponse.getHits().getHits()[0].getScore();
- SearchResponse booleanSearchResponse = client().prepareSearch()
- .setQuery(matchQuery("field2", "quick brown fox"))
- .execute()
- .actionGet();
+ SearchResponse booleanSearchResponse = prepareSearch().setQuery(matchQuery("field2", "quick brown fox")).execute().actionGet();
assertThat(booleanSearchResponse.getHits().getTotalHits().value, equalTo(1L));
float defaultScore = booleanSearchResponse.getHits().getHits()[0].getScore();
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java
index c6fbdc909e2e..5a1c09098f21 100644
--- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java
+++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java
@@ -327,13 +327,13 @@ public class SimpleVersioningIT extends ESIntegTestCase {
// search with versioning
for (int i = 0; i < 10; i++) {
// TODO: ADD SEQ NO!
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).setVersion(true).execute().actionGet();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).setVersion(true).execute().actionGet();
assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(2L));
}
// search without versioning
for (int i = 0; i < 10; i++) {
- SearchResponse searchResponse = client().prepareSearch().setQuery(matchAllQuery()).execute().actionGet();
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()).execute().actionGet();
assertThat(searchResponse.getHits().getAt(0).getVersion(), equalTo(Versions.NOT_FOUND));
}
@@ -396,8 +396,7 @@ public class SimpleVersioningIT extends ESIntegTestCase {
client().admin().indices().prepareRefresh().execute().actionGet();
for (int i = 0; i < 10; i++) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery())
.setVersion(true)
.seqNoAndPrimaryTerm(true)
.execute()
diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/CentroidAggregationTestBase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/CentroidAggregationTestBase.java
index 45ec7c00bd44..9fbf63a4e089 100644
--- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/CentroidAggregationTestBase.java
+++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/CentroidAggregationTestBase.java
@@ -60,9 +60,9 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase {
}
public void testPartiallyUnmapped() {
- SearchResponse response = client().prepareSearch(IDX_NAME, UNMAPPED_IDX_NAME)
- .addAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME))
- .get();
+ SearchResponse response = prepareSearch(IDX_NAME, UNMAPPED_IDX_NAME).addAggregation(
+ centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)
+ ).get();
assertNoFailures(response);
CentroidAggregation geoCentroid = response.getAggregations().get(aggName());
diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/SpatialBoundsAggregationTestBase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/SpatialBoundsAggregationTestBase.java
index f63401d34b62..d507e83ffe00 100644
--- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/SpatialBoundsAggregationTestBase.java
+++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/SpatialBoundsAggregationTestBase.java
@@ -127,8 +127,7 @@ public abstract class SpatialBoundsAggregationTestBase e
}
public void testPartiallyUnmapped() throws Exception {
- SearchResponse response = client().prepareSearch(IDX_NAME, UNMAPPED_IDX_NAME)
- .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME))
+ SearchResponse response = prepareSearch(IDX_NAME, UNMAPPED_IDX_NAME).addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME))
.get();
assertNoFailures(response);
diff --git a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
index 6aa245d429e5..8574fcbb0595 100644
--- a/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java
@@ -303,8 +303,7 @@ public abstract class BaseShapeIntegTestCase client().prepareSearch()
- .setIndices("idx", "idx2")
- .setQuery(QueryBuilders.matchAllQuery())
- .addSort("ul_field", SortOrder.ASC)
- .get()
+ () -> prepareSearch().setIndices("idx", "idx2").setQuery(QueryBuilders.matchAllQuery()).addSort("ul_field", SortOrder.ASC).get()
);
assertEquals(
exception.getCause().getMessage(),
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobStorageDeletionTaskIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobStorageDeletionTaskIT.java
index c1a74444d19c..aa8b29228b79 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobStorageDeletionTaskIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobStorageDeletionTaskIT.java
@@ -203,8 +203,7 @@ public class JobStorageDeletionTaskIT extends BaseMlIntegTestCase {
// Make sure all results referencing the dedicated job are gone
assertThat(
- client().prepareSearch()
- .setIndices(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*")
+ prepareSearch().setIndices(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*")
.setIndicesOptions(IndicesOptions.lenientExpandOpenHidden())
.setTrackTotalHits(true)
.setSize(0)
diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
index 777d56331488..685592afef16 100644
--- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
+++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlDistributedFailureIT.java
@@ -751,8 +751,7 @@ public class MlDistributedFailureIT extends BaseMlIntegTestCase {
// so when restarting job on another node the data counts
// are what we expect them to be:
private static DataCounts getDataCountsFromIndex(String jobId) {
- SearchResponse searchResponse = client().prepareSearch()
- .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN)
+ SearchResponse searchResponse = prepareSearch().setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN)
.setQuery(QueryBuilders.idsQuery().addIds(DataCounts.documentId(jobId)))
.get();
if (searchResponse.getHits().getTotalHits().value != 1) {
diff --git a/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java b/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java
index 571f75a3ca64..9012946abc68 100644
--- a/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java
+++ b/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java
@@ -113,8 +113,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
private void assertPinnedPromotions(PinnedQueryBuilder pqb, LinkedHashSet pins, int iter, int numRelevantDocs) {
int from = randomIntBetween(0, numRelevantDocs);
int size = randomIntBetween(10, 100);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(pqb)
+ SearchResponse searchResponse = prepareSearch().setQuery(pqb)
.setTrackTotalHits(true)
.setSize(size)
.setFrom(from)
@@ -194,11 +193,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
}
private void assertExhaustiveScoring(PinnedQueryBuilder pqb) {
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(pqb)
- .setTrackTotalHits(true)
- .setSearchType(DFS_QUERY_THEN_FETCH)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(pqb).setTrackTotalHits(true).setSearchType(DFS_QUERY_THEN_FETCH).get();
long numHits = searchResponse.getHits().getTotalHits().value;
assertThat(numHits, equalTo(2L));
@@ -232,11 +227,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
}
private void assertExplain(PinnedQueryBuilder pqb) {
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
- .setQuery(pqb)
- .setExplain(true)
- .get();
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setQuery(pqb).setExplain(true).get();
assertHitCount(searchResponse, 3);
assertFirstHit(searchResponse, hasId("2"));
assertSecondHit(searchResponse, hasId("1"));
@@ -280,8 +271,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
HighlightBuilder testHighlighter = new HighlightBuilder();
testHighlighter.field("field1");
- SearchResponse searchResponse = client().prepareSearch()
- .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
+ SearchResponse searchResponse = prepareSearch().setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.setQuery(pqb)
.highlighter(testHighlighter)
.setExplain(true)
@@ -340,11 +330,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
new Item("test1", "b")
);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(pqb)
- .setTrackTotalHits(true)
- .setSearchType(DFS_QUERY_THEN_FETCH)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(pqb).setTrackTotalHits(true).setSearchType(DFS_QUERY_THEN_FETCH).get();
assertHitCount(searchResponse, 4);
assertFirstHit(searchResponse, both(hasIndex("test2")).and(hasId("a")));
@@ -384,11 +370,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
new Item("test", "a")
);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(pqb)
- .setTrackTotalHits(true)
- .setSearchType(DFS_QUERY_THEN_FETCH)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(pqb).setTrackTotalHits(true).setSearchType(DFS_QUERY_THEN_FETCH).get();
assertHitCount(searchResponse, 3);
assertFirstHit(searchResponse, both(hasIndex("test")).and(hasId("b")));
@@ -446,11 +428,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase {
new Item("test-alias", "a")
);
- SearchResponse searchResponse = client().prepareSearch()
- .setQuery(pqb)
- .setTrackTotalHits(true)
- .setSearchType(DFS_QUERY_THEN_FETCH)
- .get();
+ SearchResponse searchResponse = prepareSearch().setQuery(pqb).setTrackTotalHits(true).setSearchType(DFS_QUERY_THEN_FETCH).get();
assertHitCount(searchResponse, 4);
assertFirstHit(searchResponse, both(hasIndex("test1")).and(hasId("b")));
diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java
index 0fda9e4e66f3..39e476107a0d 100644
--- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java
+++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java
@@ -144,8 +144,7 @@ public class RetrySearchIntegTests extends BaseSearchableSnapshotsIntegTestCase
).keepAlive(TimeValue.timeValueMinutes(2));
final String pitId = client().execute(OpenPointInTimeAction.INSTANCE, openRequest).actionGet().getPointInTimeId();
try {
- SearchResponse resp = client().prepareSearch()
- .setIndices(indexName)
+ SearchResponse resp = prepareSearch().setIndices(indexName)
.setPreference(null)
.setPointInTime(new PointInTimeBuilder(pitId))
.get();
@@ -158,8 +157,7 @@ public class RetrySearchIntegTests extends BaseSearchableSnapshotsIntegTestCase
internalCluster().restartNode(allocatedNode);
}
ensureGreen(indexName);
- resp = client().prepareSearch()
- .setIndices(indexName)
+ resp = prepareSearch().setIndices(indexName)
.setQuery(new RangeQueryBuilder("created_date").gte("2011-01-01").lte("2011-12-12"))
.setSearchType(SearchType.QUERY_THEN_FETCH)
.setPreference(null)
diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SecurityScrollTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SecurityScrollTests.java
index 6a439dd5c856..57137075c594 100644
--- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SecurityScrollTests.java
+++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/SecurityScrollTests.java
@@ -77,8 +77,7 @@ public class SecurityScrollTests extends SecurityIntegTestCase {
docs[i] = client().prepareIndex("idx").setSource("field", "value");
}
indexRandom(true, docs);
- SearchResponse response = client().prepareSearch()
- .setQuery(matchAllQuery())
+ SearchResponse response = prepareSearch().setQuery(matchAllQuery())
.setScroll(TimeValue.timeValueSeconds(5L))
.setSize(randomIntBetween(1, 10))
.get();
diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java
index 31158b2371e5..a0204b38cd0c 100644
--- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java
+++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java
@@ -150,8 +150,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase {
refresh();
BytesReference source = BytesReference.bytes(jsonBuilder().startObject().field("field1", "POINT(4.51 52.20)").endObject());
- SearchResponse response = client().prepareSearch()
- .setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
+ SearchResponse response = prepareSearch().setQuery(new PercolateQueryBuilder("query", source, XContentType.JSON))
.addSort("id", SortOrder.ASC)
.get();
assertHitCount(response, 3);