diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/AdjacencyMatrixIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/AdjacencyMatrixIT.java index 2f3b87d73a22..3ff0dc99bdc7 100644 --- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/AdjacencyMatrixIT.java +++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/AdjacencyMatrixIT.java @@ -98,9 +98,9 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { } public void testSimple() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2")))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2"))) + ).get(); assertNoFailures(response); @@ -130,9 +130,9 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { } public void testCustomSeparator() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(adjacencyMatrix("tags", "\t", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2")))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + adjacencyMatrix("tags", "\t", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2"))) + ).get(); assertNoFailures(response); @@ -153,9 +153,9 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { // https://github.com/elastic/elasticsearch/issues/8438 public void testEmptyFilterDeclarations() throws Exception { QueryBuilder emptyFilter = new BoolQueryBuilder(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation(adjacencyMatrix("tags", newMap("all", emptyFilter).add("tag1", termQuery("tag", "tag1")))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + adjacencyMatrix("tags", newMap("all", emptyFilter).add("tag1", termQuery("tag", "tag1"))) + ).get(); assertNoFailures(response); @@ -173,12 +173,10 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { BoolQueryBuilder boolQ = new BoolQueryBuilder(); boolQ.must(termQuery("tag", "tag1")); boolQ.must(termQuery("tag", "tag2")); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2")).add("both", boolQ)) - .subAggregation(avg("avg_value").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2")).add("both", boolQ)) + .subAggregation(avg("avg_value").field("value")) + ).get(); assertNoFailures(response); @@ -291,7 +289,7 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { } try { - client().prepareSearch("idx").addAggregation(adjacencyMatrix("tags", "\t", filtersMap)).get(); + prepareSearch("idx").addAggregation(adjacencyMatrix("tags", "\t", filtersMap)).get(); fail("SearchPhaseExecutionException should have been thrown"); } catch (SearchPhaseExecutionException ex) { assertThat(ex.getCause().getMessage(), containsString("Number of filters is too large")); @@ -303,11 +301,9 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { } public void testAsSubAggregation() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field("value").interval(2L).subAggregation(adjacencyMatrix("matrix", newMap("all", matchAllQuery()))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field("value").interval(2L).subAggregation(adjacencyMatrix("matrix", newMap("all", matchAllQuery()))) + ).get(); assertNoFailures(response); @@ -327,13 +323,11 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { public void testWithContextBasedSubAggregation() throws Exception { try { - client().prepareSearch("idx") - .addAggregation( - adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2"))).subAggregation( - avg("avg_value") - ) + prepareSearch("idx").addAggregation( + adjacencyMatrix("tags", newMap("tag1", termQuery("tag", "tag1")).add("tag2", termQuery("tag", "tag2"))).subAggregation( + avg("avg_value") ) - .get(); + ).get(); fail( "expected execution to fail - an attempt to have a context based numeric sub-aggregation, but there is not value source" @@ -346,8 +340,7 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/SearchCancellationIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/SearchCancellationIT.java index 8363aa310a45..4d64ad103013 100644 --- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/SearchCancellationIT.java +++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/SearchCancellationIT.java @@ -97,8 +97,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { logger.info("Executing search"); TimeSeriesAggregationBuilder timeSeriesAggregationBuilder = new TimeSeriesAggregationBuilder("test_agg"); - ActionFuture searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + ActionFuture searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addAggregation( timeSeriesAggregationBuilder.subAggregation( new ScriptedMetricAggregationBuilder("sub_agg").initScript( diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java index 381c8d23a176..78479a9f1d81 100644 --- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java +++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java @@ -176,7 +176,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { } public void testStandAloneTimeSeriesAgg() { - SearchResponse response = client().prepareSearch("index").setSize(0).addAggregation(timeSeries("by_ts")).get(); + SearchResponse response = prepareSearch("index").setSize(0).addAggregation(timeSeries("by_ts")).get(); assertNoFailures(response); Aggregations aggregations = response.getAggregations(); assertNotNull(aggregations); @@ -194,8 +194,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { public void testTimeSeriesGroupedByADimension() { String groupBy = "dim_" + randomIntBetween(0, numberOfDimensions - 1); - SearchResponse response = client().prepareSearch("index") - .setSize(0) + SearchResponse response = prepareSearch("index").setSize(0) .addAggregation( terms("by_dim").field(groupBy) .size(data.size()) @@ -223,8 +222,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { public void testTimeSeriesGroupedByDateHistogram() { DateHistogramInterval fixedInterval = DateHistogramInterval.days(randomIntBetween(10, 100)); - SearchResponse response = client().prepareSearch("index") - .setSize(0) + SearchResponse response = prepareSearch("index").setSize(0) .addAggregation( dateHistogram("by_time").field("@timestamp") .fixedInterval(fixedInterval) @@ -266,11 +264,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { if (include == false) { queryBuilder = QueryBuilders.boolQuery().mustNot(queryBuilder); } - SearchResponse response = client().prepareSearch("index") - .setQuery(queryBuilder) - .setSize(0) - .addAggregation(timeSeries("by_ts")) - .get(); + SearchResponse response = prepareSearch("index").setQuery(queryBuilder).setSize(0).addAggregation(timeSeries("by_ts")).get(); assertNoFailures(response); Aggregations aggregations = response.getAggregations(); assertNotNull(aggregations); @@ -296,8 +290,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { if (include == false) { queryBuilder = QueryBuilders.boolQuery().mustNot(queryBuilder); } - SearchResponse response = client().prepareSearch("index") - .setQuery(queryBuilder) + SearchResponse response = prepareSearch("index").setQuery(queryBuilder) .setSize(0) .addAggregation(timeSeries("by_ts").subAggregation(sum("filter_sum").field("metric_" + metric))) .addAggregation(global("everything").subAggregation(sum("all_sum").field("metric_" + metric))) @@ -326,8 +319,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { ElasticsearchException e = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch("index") - .setQuery(QueryBuilders.termQuery("dim_" + dim, val)) + () -> prepareSearch("index").setQuery(QueryBuilders.termQuery("dim_" + dim, val)) .setSize(0) .addAggregation(global("everything").subAggregation(timeSeries("by_ts"))) .get() @@ -345,11 +337,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { } else { queryBuilder.lte(val); } - SearchResponse response = client().prepareSearch("index") - .setQuery(queryBuilder) - .setSize(0) - .addAggregation(timeSeries("by_ts")) - .get(); + SearchResponse response = prepareSearch("index").setQuery(queryBuilder).setSize(0).addAggregation(timeSeries("by_ts")).get(); assertNoFailures(response); Aggregations aggregations = response.getAggregations(); assertNotNull(aggregations); @@ -380,8 +368,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { int expectedSize = count(filteredData); ElasticsearchException e = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch("index") - .setQuery(queryBuilder) + () -> prepareSearch("index").setQuery(queryBuilder) .setSize(expectedSize * 2) .addAggregation(timeSeries("by_ts").subAggregation(topHits("hits").size(100))) .addAggregation(topHits("top_hits").size(100)) // top level top hits @@ -515,13 +502,9 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { QueryBuilder queryBuilder = QueryBuilders.rangeQuery("@timestamp").lte("2021-01-01T00:10:00Z"); assertNoFailures( - client().prepareSearch("test") - .setQuery(queryBuilder) - .setSize(10) - .addSort("key", SortOrder.ASC) - .addSort("@timestamp", SortOrder.ASC) + prepareSearch("test").setQuery(queryBuilder).setSize(10).addSort("key", SortOrder.ASC).addSort("@timestamp", SortOrder.ASC) ); - assertNoFailures(client().prepareSearch("test").setQuery(queryBuilder).setSize(10).addAggregation(timeSeries("by_ts"))); + assertNoFailures(prepareSearch("test").setQuery(queryBuilder).setSize(10).addAggregation(timeSeries("by_ts"))); assertAcked(indicesAdmin().delete(new DeleteIndexRequest("test")).actionGet()); } diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesNestedAggregationsIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesNestedAggregationsIT.java index 0eba8cd5ace1..b282b5408812 100644 --- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesNestedAggregationsIT.java +++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesNestedAggregationsIT.java @@ -155,7 +155,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { public void testTimeSeriesAggregation() { final TimeSeriesAggregationBuilder timeSeries = new TimeSeriesAggregationBuilder("ts"); - final SearchResponse aggregationResponse = client().prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); + final SearchResponse aggregationResponse = prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); final InternalTimeSeries ts = (InternalTimeSeries) aggregationResponse.getAggregations().asList().get(0); assertTimeSeriesAggregation(ts); } @@ -164,9 +164,9 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { final TimeSeriesAggregationBuilder timeSeries = new TimeSeriesAggregationBuilder("ts").subAggregation( new SumAggregationBuilder("sum").field("gauge_metric") ); - final SearchResponse searchResponse = client().prepareSearch("index").setQuery(new MatchAllQueryBuilder()).get(); + final SearchResponse searchResponse = prepareSearch("index").setQuery(new MatchAllQueryBuilder()).get(); assertNotEquals(numberOfDocuments, searchResponse.getHits().getHits().length); - final SearchResponse aggregationResponse = client().prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); + final SearchResponse aggregationResponse = prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); final InternalTimeSeries ts = (InternalTimeSeries) aggregationResponse.getAggregations().asList().get(0); assertTimeSeriesAggregation(ts); } @@ -175,7 +175,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { final TimeSeriesAggregationBuilder timeSeries = new TimeSeriesAggregationBuilder("ts").subAggregation( new TermsAggregationBuilder("terms").field("dim_0") ); - final SearchResponse aggregationResponse = client().prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); + final SearchResponse aggregationResponse = prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); final InternalTimeSeries ts = (InternalTimeSeries) aggregationResponse.getAggregations().asList().get(0); assertTimeSeriesAggregation(ts); } @@ -184,7 +184,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { final TimeSeriesAggregationBuilder timeSeries = new TimeSeriesAggregationBuilder("ts").subAggregation( new DateHistogramAggregationBuilder("date_histogram").field("@timestamp").calendarInterval(DateHistogramInterval.HOUR) ); - final SearchResponse aggregationResponse = client().prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); + final SearchResponse aggregationResponse = prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); final InternalTimeSeries ts = (InternalTimeSeries) aggregationResponse.getAggregations().asList().get(0); assertTimeSeriesAggregation(ts); } @@ -193,7 +193,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { final TimeSeriesAggregationBuilder timeSeries = new TimeSeriesAggregationBuilder("ts").subAggregation( new CardinalityAggregationBuilder("dim_n_cardinality").field(formatDim(numberOfDimensions - 1)) ); - final SearchResponse aggregationResponse = client().prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); + final SearchResponse aggregationResponse = prepareSearch("index").addAggregation(timeSeries).setSize(0).get(); final InternalTimeSeries ts = (InternalTimeSeries) aggregationResponse.getAggregations().asList().get(0); assertTimeSeriesAggregation(ts); ts.getBuckets().forEach(bucket -> { assertCardinality(bucket.getAggregations().get("dim_n_cardinality"), 1); }); 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 40bde4b2fea2..5c4a7d5ef587 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 @@ -116,14 +116,12 @@ public class DateDerivativeIT extends ESIntegTestCase { } public void testSingleValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) + ).get(); assertNoFailures(response); @@ -161,14 +159,12 @@ public class DateDerivativeIT extends ESIntegTestCase { } public void testSingleValuedFieldNormalised() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.DAY)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.DAY)) + ).get(); assertNoFailures(response); @@ -225,15 +221,13 @@ public class DateDerivativeIT extends ESIntegTestCase { indexRandom(true, builders); ensureSearchable(); - SearchResponse response = client().prepareSearch(IDX_DST_START) - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.DAY) - .timeZone(timezone) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.HOUR)) - ) - .get(); + SearchResponse response = prepareSearch(IDX_DST_START).addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.DAY) + .timeZone(timezone) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.HOUR)) + ).get(); assertNoFailures(response); @@ -283,15 +277,13 @@ public class DateDerivativeIT extends ESIntegTestCase { indexRandom(true, builders); ensureSearchable(); - SearchResponse response = client().prepareSearch(IDX_DST_END) - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.DAY) - .timeZone(timezone) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.HOUR)) - ) - .get(); + SearchResponse response = prepareSearch(IDX_DST_END).addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.DAY) + .timeZone(timezone) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.HOUR)) + ).get(); assertNoFailures(response); @@ -343,15 +335,13 @@ public class DateDerivativeIT extends ESIntegTestCase { indexRandom(true, builders); ensureSearchable(); - SearchResponse response = client().prepareSearch(IDX_DST_KATHMANDU) - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.HOUR) - .timeZone(timezone) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.MINUTE)) - ) - .get(); + SearchResponse response = prepareSearch(IDX_DST_KATHMANDU).addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.HOUR) + .timeZone(timezone) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count").unit(DateHistogramInterval.MINUTE)) + ).get(); assertNoFailures(response); @@ -411,15 +401,13 @@ public class DateDerivativeIT extends ESIntegTestCase { } public void testSingleValuedFieldWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - .subAggregation(sum("sum").field("value")) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "sum")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .minDocCount(0) + .subAggregation(sum("sum").field("value")) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "sum")) + ).get(); assertNoFailures(response); @@ -495,14 +483,12 @@ public class DateDerivativeIT extends ESIntegTestCase { } public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("dates") - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("dates") + .calendarInterval(DateHistogramInterval.MONTH) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) + ).get(); assertNoFailures(response); @@ -553,14 +539,12 @@ public class DateDerivativeIT extends ESIntegTestCase { } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) - ) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .minDocCount(0) + .subAggregation(new DerivativePipelineAggregationBuilder("deriv", "_count")) + ).get(); assertNoFailures(response); diff --git a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/SerialDiffIT.java b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/SerialDiffIT.java index b7b93ed5b681..c918220d19e5 100644 --- a/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/SerialDiffIT.java +++ b/modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/SerialDiffIT.java @@ -220,16 +220,14 @@ public class SerialDiffIT extends AggregationIntegTestCase { } public void testBasicDiff() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(INTERVAL_FIELD) - .interval(interval) - .extendedBounds(0L, (long) (interval * (numBuckets - 1))) - .subAggregation(metric) - .subAggregation(diff("diff_counts", "_count").lag(lag).gapPolicy(gapPolicy)) - .subAggregation(diff("diff_values", "the_metric").lag(lag).gapPolicy(gapPolicy)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(INTERVAL_FIELD) + .interval(interval) + .extendedBounds(0L, (long) (interval * (numBuckets - 1))) + .subAggregation(metric) + .subAggregation(diff("diff_counts", "_count").lag(lag).gapPolicy(gapPolicy)) + .subAggregation(diff("diff_values", "the_metric").lag(lag).gapPolicy(gapPolicy)) + ).get(); assertNoFailures(response); @@ -264,15 +262,13 @@ public class SerialDiffIT extends AggregationIntegTestCase { public void testInvalidLagSize() { try { - client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(INTERVAL_FIELD) - .interval(interval) - .extendedBounds(0L, (long) (interval * (numBuckets - 1))) - .subAggregation(metric) - .subAggregation(diff("diff_counts", "_count").lag(-1).gapPolicy(gapPolicy)) - ) - .get(); + prepareSearch("idx").addAggregation( + histogram("histo").field(INTERVAL_FIELD) + .interval(interval) + .extendedBounds(0L, (long) (interval * (numBuckets - 1))) + .subAggregation(metric) + .subAggregation(diff("diff_counts", "_count").lag(-1).gapPolicy(gapPolicy)) + ).get(); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), is("[lag] must be a positive integer: [diff_counts]")); } diff --git a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java index fa6f08337233..32e20aea3c2e 100644 --- a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java +++ b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java @@ -53,8 +53,7 @@ public class QueryStringWithAnalyzersIT extends ESIntegTestCase { refresh(); assertHitCount( - client().prepareSearch("test") - .setQuery(queryStringQuery("foo.baz").defaultOperator(Operator.AND).field("field1").field("field2")), + prepareSearch("test").setQuery(queryStringQuery("foo.baz").defaultOperator(Operator.AND).field("field1").field("field2")), 1L ); } diff --git a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadSynonymAnalyzerIT.java b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadSynonymAnalyzerIT.java index 857d16b8cdc8..a9ffdb60419f 100644 --- a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadSynonymAnalyzerIT.java +++ b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadSynonymAnalyzerIT.java @@ -83,8 +83,8 @@ public class ReloadSynonymAnalyzerIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field", "foo").get(); assertNoFailures(indicesAdmin().prepareRefresh("test").execute().actionGet()); - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "buzz")), 0L); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "buzz")), 0L); Response analyzeResponse = indicesAdmin().prepareAnalyze("test", "foo").setAnalyzer("my_synonym_analyzer").get(); assertEquals(2, analyzeResponse.getTokens().size()); assertEquals("foo", analyzeResponse.getTokens().get(0).getTerm()); @@ -124,9 +124,9 @@ public class ReloadSynonymAnalyzerIT extends ESIntegTestCase { assertTrue(tokens.contains(testTerm)); } - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); long expectedHitCount = preview ? 0L : 1L; - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", testTerm)), expectedHitCount); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", testTerm)), expectedHitCount); } } } 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 d7e4dbf4c0c0..6798aba477f9 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 @@ -114,8 +114,7 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { ); client().prepareIndex("test").setId("1").setSource("name", "ARCOTEL Hotels Deutschland").get(); refresh(); - SearchResponse search = client().prepareSearch("test") - .setQuery(matchQuery("name.autocomplete", "deut tel").operator(Operator.OR)) + SearchResponse search = prepareSearch("test").setQuery(matchQuery("name.autocomplete", "deut tel").operator(Operator.OR)) .highlighter(new HighlightBuilder().field("name.autocomplete")) .get(); assertHighlight(search, 0, "name.autocomplete", 0, equalTo("ARCOTEL Hotels Deutschland")); diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java index 6cef9280707b..896be7b172d6 100644 --- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java +++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java @@ -560,10 +560,10 @@ public class DataStreamIT extends ESIntegTestCase { false ); verifyResolvability(dataStreamName, indicesAdmin().prepareRefresh(dataStreamName), false); - verifyResolvability(dataStreamName, client().prepareSearch(dataStreamName), false, 1); + verifyResolvability(dataStreamName, prepareSearch(dataStreamName), false, 1); verifyResolvability( dataStreamName, - client().prepareMultiSearch().add(client().prepareSearch(dataStreamName).setQuery(matchAllQuery())), + client().prepareMultiSearch().add(prepareSearch(dataStreamName).setQuery(matchAllQuery())), false ); verifyResolvability(dataStreamName, indicesAdmin().prepareClearCache(dataStreamName), false); @@ -606,10 +606,10 @@ public class DataStreamIT extends ESIntegTestCase { String wildcardExpression = "logs*"; verifyResolvability(wildcardExpression, indicesAdmin().prepareRefresh(wildcardExpression), false); - verifyResolvability(wildcardExpression, client().prepareSearch(wildcardExpression), false, 2); + verifyResolvability(wildcardExpression, prepareSearch(wildcardExpression), false, 2); verifyResolvability( wildcardExpression, - client().prepareMultiSearch().add(client().prepareSearch(wildcardExpression).setQuery(matchAllQuery())), + client().prepareMultiSearch().add(prepareSearch(wildcardExpression).setQuery(matchAllQuery())), false ); verifyResolvability(wildcardExpression, indicesAdmin().prepareClearCache(wildcardExpression), false); @@ -754,9 +754,9 @@ public class DataStreamIT extends ESIntegTestCase { ); // Searching the data stream directly should return all hits: - assertSearchHits(client().prepareSearch("logs-foobar"), "1", "2"); + assertSearchHits(prepareSearch("logs-foobar"), "1", "2"); // Search the alias should only return document 2, because it matches with the defined filter in the alias: - assertSearchHits(client().prepareSearch("foo"), "2"); + assertSearchHits(prepareSearch("foo"), "2"); // Update alias: addAction = new AliasActions(AliasActions.Type.ADD).index(dataStreamName) @@ -784,9 +784,9 @@ public class DataStreamIT extends ESIntegTestCase { ); // Searching the data stream directly should return all hits: - assertSearchHits(client().prepareSearch("logs-foobar"), "1", "2"); + assertSearchHits(prepareSearch("logs-foobar"), "1", "2"); // Search the alias should only return document 1, because it matches with the defined filter in the alias: - assertSearchHits(client().prepareSearch("foo"), "1"); + assertSearchHits(prepareSearch("foo"), "1"); } public void testSearchFilteredAndUnfilteredAlias() throws Exception { diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java index 12b5d4630373..6d360cda59b0 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderIT.java @@ -251,8 +251,7 @@ public class GeoIpDownloaderIT extends AbstractGeoIpIT { BoolQueryBuilder queryBuilder = new BoolQueryBuilder().filter(new MatchQueryBuilder("name", id)) .filter(new RangeQueryBuilder("chunk").from(metadata.firstChunk()).to(metadata.lastChunk(), true)); int size = metadata.lastChunk() - metadata.firstChunk() + 1; - SearchResponse res = client().prepareSearch(GeoIpDownloader.DATABASES_INDEX) - .setSize(size) + SearchResponse res = prepareSearch(GeoIpDownloader.DATABASES_INDEX).setSize(size) .setQuery(queryBuilder) .addSort("chunk", SortOrder.ASC) .get(); 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 218b0c7c5157..6c428556c734 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 @@ -565,30 +565,22 @@ public class MoreExpressionIT extends ESIntegTestCase { client().prepareIndex("agg_index").setId("4").setSource("one", 4.0, "two", 2.0, "three", 3.0, "four", 4.0), client().prepareIndex("agg_index").setId("5").setSource("one", 5.0, "two", 2.0, "three", 3.0, "four", 4.0) ); - SearchResponse response = client().prepareSearch("agg_index") - .addAggregation( - histogram("histogram").field("one") - .interval(2) - .subAggregation(sum("twoSum").field("two")) - .subAggregation(sum("threeSum").field("three")) - .subAggregation(sum("fourSum").field("four")) - .subAggregation( - bucketScript( - "totalSum", - new Script( - ScriptType.INLINE, - ExpressionScriptEngine.NAME, - "_value0 + _value1 + _value2", - Collections.emptyMap() - ), - "twoSum", - "threeSum", - "fourSum" - ) + SearchResponse response = prepareSearch("agg_index").addAggregation( + histogram("histogram").field("one") + .interval(2) + .subAggregation(sum("twoSum").field("two")) + .subAggregation(sum("threeSum").field("three")) + .subAggregation(sum("fourSum").field("four")) + .subAggregation( + bucketScript( + "totalSum", + new Script(ScriptType.INLINE, ExpressionScriptEngine.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), + "twoSum", + "threeSum", + "fourSum" ) - ) - .execute() - .actionGet(); + ) + ).execute().actionGet(); Histogram histogram = response.getAggregations().get("histogram"); assertThat(histogram, notNullValue()); 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 6fde54668cf5..77e90d42ad94 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 @@ -61,13 +61,11 @@ public class StoredExpressionIT extends ESIntegTestCase { assertThat(e.toString(), containsString("cannot execute scripts using [field] context")); } try { - client().prepareSearch("test") - .setSource( - new SearchSourceBuilder().aggregation( - AggregationBuilders.terms("test").script(new Script(ScriptType.STORED, null, "script1", Collections.emptyMap())) - ) + prepareSearch("test").setSource( + new SearchSourceBuilder().aggregation( + AggregationBuilders.terms("test").script(new Script(ScriptType.STORED, null, "script1", Collections.emptyMap())) ) - .get(); + ).get(); } catch (Exception e) { assertThat(e.toString(), containsString("cannot execute scripts using [aggs] context")); } diff --git a/modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java b/modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java index ba441bad0815..14a7c873ec6e 100644 --- a/modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java +++ b/modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java @@ -74,7 +74,7 @@ public class LegacyGeoShapeIT extends GeoShapeIntegTestCase { })); // test self crossing of circles - SearchResponse searchResponse = client().prepareSearch("test").setQuery(geoShapeQuery("shape", new Circle(30, 50, 77000))).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(geoShapeQuery("shape", new Circle(30, 50, 77000))).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); } } diff --git a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/MatchOnlyTextMapperIT.java b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/MatchOnlyTextMapperIT.java index 3a6d7f5a52e8..9e5ca7a3cdc0 100644 --- a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/MatchOnlyTextMapperIT.java +++ b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/MatchOnlyTextMapperIT.java @@ -66,11 +66,9 @@ public class MatchOnlyTextMapperIT extends ESIntegTestCase { BulkResponse bulkItemResponses = bulk.get(); assertNoFailures(bulkItemResponses); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchPhraseQuery("message", "marking and sending shard")) - .setSize(500) - .highlighter(new HighlightBuilder().field("message")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + QueryBuilders.matchPhraseQuery("message", "marking and sending shard") + ).setSize(500).highlighter(new HighlightBuilder().field("message")).get(); assertNoFailures(searchResponse); for (SearchHit searchHit : searchResponse.getHits()) { assertThat( @@ -114,11 +112,9 @@ public class MatchOnlyTextMapperIT extends ESIntegTestCase { BulkResponse bulkItemResponses = bulk.get(); assertNoFailures(bulkItemResponses); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchPhraseQuery("message", "marking and sending shard")) - .setSize(500) - .highlighter(new HighlightBuilder().field("message")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + QueryBuilders.matchPhraseQuery("message", "marking and sending shard") + ).setSize(500).highlighter(new HighlightBuilder().field("message")).get(); assertNoFailures(searchResponse); for (SearchHit searchHit : searchResponse.getHits()) { assertThat( diff --git a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/RankFeaturesMapperIntegrationIT.java b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/RankFeaturesMapperIntegrationIT.java index badc2dd568f5..87699f285063 100644 --- a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/RankFeaturesMapperIntegrationIT.java +++ b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/RankFeaturesMapperIntegrationIT.java @@ -39,30 +39,24 @@ public class RankFeaturesMapperIntegrationIT extends ESIntegTestCase { public void testRankFeaturesTermQuery() throws IOException { init(); - SearchResponse response = client().prepareSearch(INDEX_NAME) - .setQuery(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE)) - .get(); + SearchResponse response = prepareSearch(INDEX_NAME).setQuery(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE)).get(); assertThat(response.getHits().getTotalHits().value, equalTo(2L)); for (SearchHit hit : response.getHits().getHits()) { assertThat(hit.getScore(), equalTo(20f)); } - response = client().prepareSearch(INDEX_NAME) - .setQuery(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE).boost(100f)) - .get(); + response = prepareSearch(INDEX_NAME).setQuery(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE).boost(100f)).get(); assertThat(response.getHits().getTotalHits().value, equalTo(2L)); for (SearchHit hit : response.getHits().getHits()) { assertThat(hit.getScore(), equalTo(2000f)); } - response = client().prepareSearch(INDEX_NAME) - .setQuery( - QueryBuilders.boolQuery() - .should(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE)) - .should(QueryBuilders.termQuery(FIELD_NAME, LOWER_RANKED_FEATURE).boost(3f)) - .minimumShouldMatch(1) - ) - .get(); + response = prepareSearch(INDEX_NAME).setQuery( + QueryBuilders.boolQuery() + .should(QueryBuilders.termQuery(FIELD_NAME, HIGHER_RANKED_FEATURE)) + .should(QueryBuilders.termQuery(FIELD_NAME, LOWER_RANKED_FEATURE).boost(3f)) + .minimumShouldMatch(1) + ).get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); for (SearchHit hit : response.getHits().getHits()) { if (hit.getId().equals("all")) { @@ -76,7 +70,7 @@ public class RankFeaturesMapperIntegrationIT extends ESIntegTestCase { } } - response = client().prepareSearch(INDEX_NAME).setQuery(QueryBuilders.termQuery(FIELD_NAME, "missing_feature")).get(); + response = prepareSearch(INDEX_NAME).setQuery(QueryBuilders.termQuery(FIELD_NAME, "missing_feature")).get(); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); } diff --git a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java index b2a756098516..ed5d89ad1df8 100644 --- a/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java +++ b/modules/mapper-extras/src/internalClusterTest/java/org/elasticsearch/index/mapper/TokenCountFieldMapperIntegrationIT.java @@ -175,19 +175,19 @@ public class TokenCountFieldMapperIntegrationIT extends ESIntegTestCase { } private SearchResponse searchById(String id) { - return prepareSearch().setQuery(QueryBuilders.termQuery("_id", id)).get(); + return prepareTokenCountFieldMapperSearch().setQuery(QueryBuilders.termQuery("_id", id)).get(); } private SearchRequestBuilder searchByNumericRange(int low, int high) { - return prepareSearch().setQuery( + return prepareTokenCountFieldMapperSearch().setQuery( QueryBuilders.rangeQuery( randomFrom(Arrays.asList("foo.token_count", "foo.token_count_unstored", "foo.token_count_with_doc_values")) ).gte(low).lte(high) ); } - private SearchRequestBuilder prepareSearch() { - SearchRequestBuilder request = client().prepareSearch("test"); + private SearchRequestBuilder prepareTokenCountFieldMapperSearch() { + SearchRequestBuilder request = prepareSearch("test"); request.addStoredField("foo.token_count"); request.addStoredField("foo.token_count_without_position_increments"); if (loadCountedFields) { diff --git a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ChildrenIT.java index 521a2d31b415..cafcf11a1438 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ChildrenIT.java @@ -44,8 +44,7 @@ import static org.hamcrest.Matchers.sameInstance; public class ChildrenIT extends AbstractParentChildTestCase { public void testSimpleChildrenAgg() { - final SearchRequestBuilder searchRequest = client().prepareSearch("test") - .setQuery(matchQuery("randomized", true)) + final SearchRequestBuilder searchRequest = prepareSearch("test").setQuery(matchQuery("randomized", true)) .addAggregation(children("to_comment", "comment")); final SearchResponse searchResponse = searchRequest.get(); long count = categoryToControl.values().stream().mapToLong(control -> control.commentIds.size()).sum(); @@ -55,8 +54,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { } public void testChildrenAggs() { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchQuery("randomized", true)) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchQuery("randomized", true)) .addAggregation( terms("category").field("category") .size(10000) @@ -98,8 +96,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { } public void testParentWithMultipleBuckets() { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchQuery("randomized", false)) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchQuery("randomized", false)) .addAggregation( terms("category").field("category") .size(10000) @@ -173,9 +170,9 @@ public class ChildrenIT extends AbstractParentChildTestCase { indexRandom(true, requests); for (int i = 0; i < 10; i++) { - SearchResponse searchResponse = client().prepareSearch(indexName) - .addAggregation(children("children", "child").subAggregation(sum("counts").field("count"))) - .get(); + SearchResponse searchResponse = prepareSearch(indexName).addAggregation( + children("children", "child").subAggregation(sum("counts").field("count")) + ).get(); assertNoFailures(searchResponse); Children children = searchResponse.getAggregations().get("children"); @@ -202,7 +199,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { } public void testNonExistingChildType() throws Exception { - SearchResponse searchResponse = client().prepareSearch("test").addAggregation(children("non-existing", "xyz")).get(); + SearchResponse searchResponse = prepareSearch("test").addAggregation(children("non-existing", "xyz")).get(); assertNoFailures(searchResponse); Children children = searchResponse.getAggregations().get("non-existing"); @@ -254,8 +251,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { requests.add(createIndexRequest(indexName, childType, "16", "2", "color", "green", "size", "44")); indexRandom(true, requests); - SearchResponse response = client().prepareSearch(indexName) - .setQuery(hasChildQuery(childType, termQuery("color", "orange"), ScoreMode.None)) + SearchResponse response = prepareSearch(indexName).setQuery(hasChildQuery(childType, termQuery("color", "orange"), ScoreMode.None)) .addAggregation( children("my-refinements", childType).subAggregation(terms("my-colors").field("color")) .subAggregation(terms("my-sizes").field("size")) @@ -304,8 +300,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { createIndexRequest(indexName, childType, "3", "2", "name", "brussels").setRouting("1").get(); refresh(); - SearchResponse response = client().prepareSearch(indexName) - .setQuery(matchQuery("name", "europe")) + SearchResponse response = prepareSearch(indexName).setQuery(matchQuery("name", "europe")) .addAggregation( children(parentType, parentType).subAggregation(children(childType, childType).subAggregation(terms("name").field("name"))) ) @@ -355,8 +350,7 @@ public class ChildrenIT extends AbstractParentChildTestCase { requests.add(createIndexRequest("index", "childType", "8", "3", "name", "Dan", "age", 1)); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("index") - .setSize(0) + SearchResponse response = prepareSearch("index").setSize(0) .addAggregation( AggregationBuilders.terms("towns") .field("town") diff --git a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ParentIT.java b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ParentIT.java index 7f780090cbd3..23043650d589 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ParentIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/aggregations/ParentIT.java @@ -33,8 +33,7 @@ import static org.hamcrest.Matchers.equalTo; public class ParentIT extends AbstractParentChildTestCase { public void testSimpleParentAgg() { - final SearchRequestBuilder searchRequest = client().prepareSearch("test") - .setSize(0) + final SearchRequestBuilder searchRequest = prepareSearch("test").setSize(0) .setQuery(matchQuery("randomized", true)) .addAggregation(parent("to_article", "comment")); SearchResponse searchResponse = searchRequest.get(); @@ -53,8 +52,7 @@ public class ParentIT extends AbstractParentChildTestCase { } public void testSimpleParentAggWithSubAgg() { - final SearchRequestBuilder searchRequest = client().prepareSearch("test") - .setSize(10000) + final SearchRequestBuilder searchRequest = prepareSearch("test").setSize(10000) .setQuery(matchQuery("randomized", true)) .addAggregation(parent("to_article", "comment").subAggregation(terms("category").field("category").size(10000))); SearchResponse searchResponse = searchRequest.get(); @@ -108,8 +106,7 @@ public class ParentIT extends AbstractParentChildTestCase { } public void testParentAggs() throws Exception { - final SearchRequestBuilder searchRequest = client().prepareSearch("test") - .setSize(10000) + final SearchRequestBuilder searchRequest = prepareSearch("test").setSize(10000) .setQuery(matchQuery("randomized", true)) .addAggregation( terms("to_commenter").field("commenter") @@ -200,7 +197,7 @@ public class ParentIT extends AbstractParentChildTestCase { } public void testNonExistingParentType() throws Exception { - SearchResponse searchResponse = client().prepareSearch("test").addAggregation(parent("non-existing", "xyz")).get(); + SearchResponse searchResponse = prepareSearch("test").addAggregation(parent("non-existing", "xyz")).get(); assertNoFailures(searchResponse); Parent parent = searchResponse.getAggregations().get("non-existing"); @@ -209,8 +206,7 @@ public class ParentIT extends AbstractParentChildTestCase { } public void testTermsParentAggTerms() throws Exception { - final SearchRequestBuilder searchRequest = client().prepareSearch("test") - .setSize(10000) + final SearchRequestBuilder searchRequest = prepareSearch("test").setSize(10000) .setQuery(matchQuery("randomized", true)) .addAggregation( terms("to_commenter").field("commenter") 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 baa4a4459f40..a5b9e5532a96 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 @@ -89,49 +89,43 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "grandchild", "gc1", "c1", "gc_field", "gc_value1").setRouting("p1").get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(matchAllQuery()) - .filter( - hasChildQuery( - "child", - boolQuery().must(termQuery("c_field", "c_value1")) - .filter(hasChildQuery("grandchild", termQuery("gc_field", "gc_value1"), ScoreMode.None)), - ScoreMode.None - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()) + .filter( + hasChildQuery( + "child", + boolQuery().must(termQuery("c_field", "c_value1")) + .filter(hasChildQuery("grandchild", termQuery("gc_field", "gc_value1"), ScoreMode.None)), + ScoreMode.None ) - ) - .get(); + ) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", termQuery("p_field", "p_value1"), false))) - .execute() - .actionGet(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", termQuery("p_field", "p_value1"), false)) + ).execute().actionGet(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c1")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasParentQuery("child", termQuery("c_field", "c_value1"), false))) - .execute() - .actionGet(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasParentQuery("child", termQuery("c_field", "c_value1"), false)) + ).execute().actionGet(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("gc1")); - searchResponse = client().prepareSearch("test") - .setQuery(hasParentQuery("parent", termQuery("p_field", "p_value1"), false)) + searchResponse = prepareSearch("test").setQuery(hasParentQuery("parent", termQuery("p_field", "p_value1"), false)) .execute() .actionGet(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c1")); - searchResponse = client().prepareSearch("test") - .setQuery(hasParentQuery("child", termQuery("c_field", "c_value1"), false)) + searchResponse = prepareSearch("test").setQuery(hasParentQuery("child", termQuery("c_field", "c_value1"), false)) .execute() .actionGet(); assertNoFailures(searchResponse); @@ -148,9 +142,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "foo", "1", null, "foo", 1).get(); createIndexRequest("test", "test", "2", "1", "foo", 1).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("test", matchQuery("foo", 1), ScoreMode.None)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(hasChildQuery("test", matchQuery("foo", 1), ScoreMode.None)).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); @@ -172,7 +164,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { // TEST FETCHING _parent from child SearchResponse searchResponse; - searchResponse = client().prepareSearch("test").setQuery(idsQuery().addIds("c1")).get(); + searchResponse = prepareSearch("test").setQuery(idsQuery().addIds("c1")).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c1")); @@ -180,9 +172,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(extractValue("join_field.parent", searchResponse.getHits().getAt(0).getSourceAsMap()), equalTo("p1")); // TEST matching on parent - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child"))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child")) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(searchResponse.getHits().getAt(0).getId(), anyOf(equalTo("c1"), equalTo("c2"))); @@ -193,28 +185,28 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(extractValue("join_field.parent", searchResponse.getHits().getAt(1).getSourceAsMap()), equalTo("p1")); // HAS CHILD - searchResponse = client().prepareSearch("test").setQuery(randomHasChild("child", "c_field", "yellow")).get(); + searchResponse = prepareSearch("test").setQuery(randomHasChild("child", "c_field", "yellow")).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); - searchResponse = client().prepareSearch("test").setQuery(randomHasChild("child", "c_field", "blue")).execute().actionGet(); + searchResponse = prepareSearch("test").setQuery(randomHasChild("child", "c_field", "blue")).execute().actionGet(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p2")); - searchResponse = client().prepareSearch("test").setQuery(randomHasChild("child", "c_field", "red")).get(); + searchResponse = prepareSearch("test").setQuery(randomHasChild("child", "c_field", "red")).get(); assertHitCount(searchResponse, 2L); assertThat(searchResponse.getHits().getAt(0).getId(), anyOf(equalTo("p2"), equalTo("p1"))); assertThat(searchResponse.getHits().getAt(1).getId(), anyOf(equalTo("p2"), equalTo("p1"))); // HAS PARENT - searchResponse = client().prepareSearch("test").setQuery(randomHasParent("parent", "p_field", "p_value2")).get(); + searchResponse = prepareSearch("test").setQuery(randomHasParent("parent", "p_field", "p_value2")).get(); assertNoFailures(searchResponse); assertHitCount(searchResponse, 2L); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c3")); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("c4")); - searchResponse = client().prepareSearch("test").setQuery(randomHasParent("parent", "p_field", "p_value1")).get(); + searchResponse = prepareSearch("test").setQuery(randomHasParent("parent", "p_field", "p_value1")).get(); assertHitCount(searchResponse, 2L); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c1")); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("c2")); @@ -247,10 +239,8 @@ public class ChildQuerySearchIT extends ParentChildTestCase { for (int i = 1; i <= 10; i++) { logger.info("Round {}", i); - assertNoFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.Max))) - ); - assertNoFailures(client().prepareSearch("test").setQuery(constantScoreQuery(hasParentQuery("parent", matchAllQuery(), true)))); + assertNoFailures(prepareSearch("test").setQuery(constantScoreQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.Max)))); + assertNoFailures(prepareSearch("test").setQuery(constantScoreQuery(hasParentQuery("parent", matchAllQuery(), true)))); } } @@ -286,10 +276,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(parentToChildren.isEmpty(), equalTo(false)); for (Map.Entry> parentToChildrenEntry : parentToChildren.entrySet()) { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasParentQuery("parent", termQuery("p_field", parentToChildrenEntry.getKey()), false))) - .setSize(numChildDocsPerParent) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasParentQuery("parent", termQuery("p_field", parentToChildrenEntry.getKey()), false)) + ).setSize(numChildDocsPerParent).get(); assertNoFailures(searchResponse); Set childIds = parentToChildrenEntry.getValue(); @@ -323,44 +312,42 @@ public class ChildQuerySearchIT extends ParentChildTestCase { // HAS CHILD QUERY - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); - searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None)) - .get(); + searchResponse = prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None)).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p2")); - searchResponse = client().prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "red"), ScoreMode.None)).get(); + searchResponse = prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "red"), ScoreMode.None)).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(searchResponse.getHits().getAt(0).getId(), anyOf(equalTo("p2"), equalTo("p1"))); assertThat(searchResponse.getHits().getAt(1).getId(), anyOf(equalTo("p2"), equalTo("p1"))); // HAS CHILD FILTER - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p2")); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "red"), ScoreMode.None))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "red"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(searchResponse.getHits().getAt(0).getId(), anyOf(equalTo("p2"), equalTo("p1"))); @@ -385,14 +372,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - hasChildQuery( - "child", - boolQuery().should(termQuery("c_field", "red")).should(termQuery("c_field", "yellow")), - ScoreMode.None - ) - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + hasChildQuery("child", boolQuery().should(termQuery("c_field", "red")).should(termQuery("c_field", "yellow")), ScoreMode.None) + ) .addAggregation( AggregationBuilders.global("global") .subAggregation( @@ -431,9 +413,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); @@ -444,9 +426,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "parent", "p1", null, "p_field", "p_value1_updated").get(); indicesAdmin().prepareRefresh().get(); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); @@ -468,14 +450,12 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); assertNoFailures( - client().prepareSearch("test") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(boolQuery().mustNot(hasChildQuery("child", boolQuery().should(queryStringQuery("c_field:*")), ScoreMode.None))) ); assertNoFailures( - client().prepareSearch("test") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(boolQuery().mustNot(hasParentQuery("parent", boolQuery().should(queryStringQuery("p_field:*")), false))) ); } @@ -490,15 +470,15 @@ public class ChildQuerySearchIT extends ParentChildTestCase { client().prepareIndex("test").setId("3").setSource("p_field", 1).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", matchAllQuery(), ScoreMode.None))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", matchAllQuery(), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", matchAllQuery(), false))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", matchAllQuery(), false)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); } @@ -512,24 +492,18 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "c1", parentId, "c_field", "1").get(); refresh(); - assertHitCount( - client().prepareSearch("test").setSize(0).setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max)), - 1L - ); + assertHitCount(prepareSearch("test").setSize(0).setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max)), 1L); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)), 1L); + assertHitCount(prepareSearch("test").setSize(0).setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)), 1L); assertHitCount( - client().prepareSearch("test") - .setSize(0) + prepareSearch("test").setSize(0) .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None))), 1L ); assertHitCount( - client().prepareSearch("test") - .setSize(0) - .setQuery(constantScoreQuery(hasParentQuery("parent", termQuery("p_field", "1"), false))), + prepareSearch("test").setSize(0).setQuery(constantScoreQuery(hasParentQuery("parent", termQuery("p_field", "1"), false))), 1L ); } @@ -543,17 +517,13 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "c1", parentId, "c_field", "1").get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setExplain(true) + SearchResponse searchResponse = prepareSearch("test").setExplain(true) .setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max)) .get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getExplanation().getDescription(), containsString("join value p1")); - searchResponse = client().prepareSearch("test") - .setExplain(true) - .setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)) - .get(); + searchResponse = prepareSearch("test").setExplain(true).setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getExplanation().getDescription(), containsString("join value p1")); @@ -617,16 +587,14 @@ public class ChildQuerySearchIT extends ParentChildTestCase { ensureGreen(); indexRandom(true, createDocBuilders().toArray(new IndexRequestBuilder[0])); - SearchResponse response = client().prepareSearch("test") - .setQuery( - hasChildQuery( - "child", - QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) - .boostMode(CombineFunction.REPLACE), - ScoreMode.Total - ) + SearchResponse response = prepareSearch("test").setQuery( + hasChildQuery( + "child", + QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) + .boostMode(CombineFunction.REPLACE), + ScoreMode.Total ) - .get(); + ).get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); assertThat(response.getHits().getHits()[0].getId(), equalTo("1")); @@ -636,16 +604,14 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(response.getHits().getHits()[2].getId(), equalTo("2")); assertThat(response.getHits().getHits()[2].getScore(), equalTo(3f)); - response = client().prepareSearch("test") - .setQuery( - hasChildQuery( - "child", - QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) - .boostMode(CombineFunction.REPLACE), - ScoreMode.Max - ) + response = prepareSearch("test").setQuery( + hasChildQuery( + "child", + QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) + .boostMode(CombineFunction.REPLACE), + ScoreMode.Max ) - .get(); + ).get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); assertThat(response.getHits().getHits()[0].getId(), equalTo("3")); @@ -655,16 +621,14 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(response.getHits().getHits()[2].getId(), equalTo("1")); assertThat(response.getHits().getHits()[2].getScore(), equalTo(2f)); - response = client().prepareSearch("test") - .setQuery( - hasChildQuery( - "child", - QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) - .boostMode(CombineFunction.REPLACE), - ScoreMode.Avg - ) + response = prepareSearch("test").setQuery( + hasChildQuery( + "child", + QueryBuilders.functionScoreQuery(matchQuery("c_field2", 0), fieldValueFactorFunction("c_field1")) + .boostMode(CombineFunction.REPLACE), + ScoreMode.Avg ) - .get(); + ).get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); assertThat(response.getHits().getHits()[0].getId(), equalTo("3")); @@ -674,18 +638,14 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(response.getHits().getHits()[2].getId(), equalTo("1")); assertThat(response.getHits().getHits()[2].getScore(), equalTo(1.5f)); - response = client().prepareSearch("test") - .setQuery( - hasParentQuery( - "parent", - QueryBuilders.functionScoreQuery(matchQuery("p_field1", "p_value3"), fieldValueFactorFunction("p_field2")) - .boostMode(CombineFunction.REPLACE), - true - ) + response = prepareSearch("test").setQuery( + hasParentQuery( + "parent", + QueryBuilders.functionScoreQuery(matchQuery("p_field1", "p_value3"), fieldValueFactorFunction("p_field2")) + .boostMode(CombineFunction.REPLACE), + true ) - .addSort(SortBuilders.fieldSort("c_field3")) - .addSort(SortBuilders.scoreSort()) - .get(); + ).addSort(SortBuilders.fieldSort("c_field3")).addSort(SortBuilders.scoreSort()).get(); assertThat(response.getHits().getTotalHits().value, equalTo(7L)); assertThat(response.getHits().getHits()[0].getId(), equalTo("16")); @@ -709,9 +669,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertAcked(prepareCreate("test").setMapping(buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, "parent", "child"))); ensureGreen(); - SearchResponse response = client().prepareSearch("test") - .setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.None)) - .get(); + SearchResponse response = prepareSearch("test").setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.None)).get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); @@ -720,19 +678,19 @@ public class ChildQuerySearchIT extends ParentChildTestCase { .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .get(); - response = client().prepareSearch("test").setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.None)).get(); + response = prepareSearch("test").setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.None)).get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); - response = client().prepareSearch("test").setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.Max)).get(); + response = prepareSearch("test").setQuery(hasChildQuery("child", matchQuery("text", "value"), ScoreMode.Max)).get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); - response = client().prepareSearch("test").setQuery(hasParentQuery("parent", matchQuery("text", "value"), false)).get(); + response = prepareSearch("test").setQuery(hasParentQuery("parent", matchQuery("text", "value"), false)).get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); - response = client().prepareSearch("test").setQuery(hasParentQuery("parent", matchQuery("text", "value"), true)).get(); + response = prepareSearch("test").setQuery(hasParentQuery("parent", matchQuery("text", "value"), true)).get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, equalTo(0L)); } @@ -748,16 +706,16 @@ public class ChildQuerySearchIT extends ParentChildTestCase { client().prepareIndex("test").setId("3").setSource("p_field", 2).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", termQuery("c_field", 1), ScoreMode.None))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", termQuery("c_field", 1), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("1")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", termQuery("p_field", 1), false))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", termQuery("p_field", 1), false)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("2")); @@ -771,15 +729,13 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "2", "1", "c_field", "foo bar").get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - hasChildQuery("child", matchQuery("c_field", "foo"), ScoreMode.None).innerHit( - new InnerHitBuilder().setHighlightBuilder( - new HighlightBuilder().field(new Field("c_field").highlightQuery(QueryBuilders.matchQuery("c_field", "bar"))) - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + hasChildQuery("child", matchQuery("c_field", "foo"), ScoreMode.None).innerHit( + new InnerHitBuilder().setHighlightBuilder( + new HighlightBuilder().field(new Field("c_field").highlightQuery(QueryBuilders.matchQuery("c_field", "bar"))) ) ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("1")); @@ -799,26 +755,24 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "2", "1", "c_field", 1).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", matchQuery("c_field", 1), ScoreMode.None))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasChildQuery("child", matchQuery("c_field", 1), ScoreMode.None)) + ).get(); assertSearchHit(searchResponse, 1, hasId("1")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", matchQuery("p_field", 1), false))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", matchQuery("p_field", 1), false)) + ).get(); assertSearchHit(searchResponse, 1, hasId("2")); - searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(matchAllQuery()).filter(boolQuery().must(hasChildQuery("child", matchQuery("c_field", 1), ScoreMode.None))) - ) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(boolQuery().must(hasChildQuery("child", matchQuery("c_field", 1), ScoreMode.None))) + ).get(); assertSearchHit(searchResponse, 1, hasId("1")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).filter(boolQuery().must(hasParentQuery("parent", matchQuery("p_field", 1), false)))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).filter(boolQuery().must(hasParentQuery("parent", matchQuery("p_field", 1), false))) + ).get(); assertSearchHit(searchResponse, 1, hasId("2")); } @@ -852,8 +806,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { SearchType[] searchTypes = new SearchType[] { SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_THEN_FETCH }; for (SearchType searchType : searchTypes) { - SearchResponse searchResponse = client().prepareSearch("test") - .setSearchType(searchType) + SearchResponse searchResponse = prepareSearch("test").setSearchType(searchType) .setQuery(hasChildQuery("child", prefixQuery("c_field", "c"), ScoreMode.Max)) .addSort("p_field", SortOrder.ASC) .setSize(5) @@ -866,8 +819,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { assertThat(searchResponse.getHits().getHits()[3].getId(), equalTo("p003")); assertThat(searchResponse.getHits().getHits()[4].getId(), equalTo("p004")); - searchResponse = client().prepareSearch("test") - .setSearchType(searchType) + searchResponse = prepareSearch("test").setSearchType(searchType) .setQuery(hasParentQuery("parent", prefixQuery("p_field", "p"), true)) .addSort("c_field", SortOrder.ASC) .setSize(5) @@ -897,17 +849,17 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.Total)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.Total) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); assertThat(searchResponse.getHits().getAt(0).getSourceAsString(), containsString("\"p_value1\"")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchQuery("c_field", "x")).must(hasParentQuery("parent", termQuery("p_field", "p_value2"), true))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchQuery("c_field", "x")).must(hasParentQuery("parent", termQuery("p_field", "p_value2"), true)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("c3")); @@ -922,17 +874,15 @@ public class ChildQuerySearchIT extends ParentChildTestCase { indicesAdmin().prepareRefresh("test").get(); } - searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.Total)) - .get(); + searchResponse = prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "yellow"), ScoreMode.Total)).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); assertThat(searchResponse.getHits().getAt(0).getSourceAsString(), containsString("\"p_value1\"")); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchQuery("c_field", "x")).must(hasParentQuery("parent", termQuery("p_field", "p_value2"), true))) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchQuery("c_field", "x")).must(hasParentQuery("parent", termQuery("p_field", "p_value2"), true)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(searchResponse.getHits().getAt(0).getId(), Matchers.anyOf(equalTo("c3"), equalTo("c4"))); @@ -953,8 +903,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "c5", "p2", "c_field", "x").get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.Total)) + SearchResponse searchResponse = prepareSearch("test").setQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.Total)) .setMinScore(3) // Score needs to be 3 or above! .get(); assertNoFailures(searchResponse); @@ -971,8 +920,9 @@ public class ChildQuerySearchIT extends ParentChildTestCase { ensureGreen(); assertHitCount( - client().prepareSearch("test") - .setQuery(boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child"))), + prepareSearch("test").setQuery( + boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child")) + ), 0L ); @@ -980,19 +930,19 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); assertHitCount( - client().prepareSearch("test") - .setQuery(boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child"))), + prepareSearch("test").setQuery( + boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child")) + ), 1L ); createIndexRequest("test", "child", "c2", "p2").get(); refresh(); assertHitCount( - client().prepareSearch("test") - .setQuery( - boolQuery().should(boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child"))) - .should(boolQuery().filter(termQuery("join_field#parent", "p2")).filter(termQuery("join_field", "child"))) - ), + prepareSearch("test").setQuery( + boolQuery().should(boolQuery().filter(termQuery("join_field#parent", "p1")).filter(termQuery("join_field", "child"))) + .should(boolQuery().filter(termQuery("join_field#parent", "p2")).filter(termQuery("join_field", "child"))) + ), 2L ); } @@ -1007,15 +957,12 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "c1", "p1").get(); refresh(); - assertHitCount(client().prepareSearch("test").setQuery(parentId("child", "p1")), 1L); + assertHitCount(prepareSearch("test").setQuery(parentId("child", "p1")), 1L); createIndexRequest("test", "child", "c2", "p2").get(); refresh(); - assertHitCount( - client().prepareSearch("test").setQuery(boolQuery().should(parentId("child", "p1")).should(parentId("child", "p2"))), - 2L - ); + assertHitCount(prepareSearch("test").setQuery(boolQuery().should(parentId("child", "p1")).should(parentId("child", "p2"))), 2L); } public void testHasChildNotBeingCached() throws IOException { @@ -1037,18 +984,18 @@ public class ChildQuerySearchIT extends ParentChildTestCase { indicesAdmin().prepareFlush("test").get(); indicesAdmin().prepareRefresh("test").get(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); createIndexRequest("test", "child", "c2", "p2", "c_field", "blue").get(); indicesAdmin().prepareRefresh("test").get(); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "blue"), ScoreMode.None)) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); } @@ -1104,34 +1051,32 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); assertHitCount( - client().prepareSearch("grandissue") - .setQuery( - boolQuery().must( - hasChildQuery( - "parent", - boolQuery().must( - hasChildQuery("child_type_one", boolQuery().must(queryStringQuery("name:William*")), ScoreMode.None) - ), - ScoreMode.None - ) + prepareSearch("grandissue").setQuery( + boolQuery().must( + hasChildQuery( + "parent", + boolQuery().must( + hasChildQuery("child_type_one", boolQuery().must(queryStringQuery("name:William*")), ScoreMode.None) + ), + ScoreMode.None ) - ), + ) + ), 1L ); assertHitCount( - client().prepareSearch("grandissue") - .setQuery( - boolQuery().must( - hasChildQuery( - "parent", - boolQuery().must( - hasChildQuery("child_type_two", boolQuery().must(queryStringQuery("name:William*")), ScoreMode.None) - ), - ScoreMode.None - ) + prepareSearch("grandissue").setQuery( + boolQuery().must( + hasChildQuery( + "parent", + boolQuery().must( + hasChildQuery("child_type_two", boolQuery().must(queryStringQuery("name:William*")), ScoreMode.None) + ), + ScoreMode.None ) - ), + ) + ), 0L ); } @@ -1196,21 +1141,17 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); ScoreMode scoreMode = randomFrom(ScoreMode.values()); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(hasChildQuery("child", termQuery("c_field", "blue"), scoreMode)) - .filter(boolQuery().mustNot(termQuery("p_field", "3"))) - ) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(hasChildQuery("child", termQuery("c_field", "blue"), scoreMode)) + .filter(boolQuery().mustNot(termQuery("p_field", "3"))) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(hasChildQuery("child", termQuery("c_field", "red"), scoreMode)) - .filter(boolQuery().mustNot(termQuery("p_field", "3"))) - ) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(hasChildQuery("child", termQuery("c_field", "red"), scoreMode)) + .filter(boolQuery().mustNot(termQuery("p_field", "3"))) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(2L)); } @@ -1224,30 +1165,28 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "c1", parentId, "c_field", "1").get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max).queryName("test")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max).queryName("test") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries().length, equalTo(1)); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries()[0], equalTo("test")); - searchResponse = client().prepareSearch("test") - .setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true).queryName("test")) - .get(); + searchResponse = prepareSearch("test").setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true).queryName("test")).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries().length, equalTo(1)); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries()[0], equalTo("test")); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None).queryName("test"))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None).queryName("test")) + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries().length, equalTo(1)); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries()[0], equalTo("test")); - searchResponse = client().prepareSearch("test") - .setQuery(constantScoreQuery(hasParentQuery("parent", termQuery("p_field", "1"), false).queryName("test"))) - .get(); + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery(hasParentQuery("parent", termQuery("p_field", "1"), false).queryName("test")) + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries().length, equalTo(1)); assertThat(searchResponse.getHits().getAt(0).getMatchedQueries()[0], equalTo("test")); @@ -1262,35 +1201,35 @@ public class ChildQuerySearchIT extends ParentChildTestCase { refresh(); try { - client().prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None)).get(); + prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None)).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.status(), equalTo(RestStatus.BAD_REQUEST)); } try { - client().prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max)).get(); + prepareSearch("test").setQuery(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.Max)).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.status(), equalTo(RestStatus.BAD_REQUEST)); } try { - client().prepareSearch("test").setPostFilter(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None)).get(); + prepareSearch("test").setPostFilter(hasChildQuery("child", termQuery("c_field", "1"), ScoreMode.None)).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.status(), equalTo(RestStatus.BAD_REQUEST)); } try { - client().prepareSearch("test").setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)).get(); + prepareSearch("test").setQuery(hasParentQuery("parent", termQuery("p_field", "1"), true)).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.status(), equalTo(RestStatus.BAD_REQUEST)); } try { - client().prepareSearch("test").setPostFilter(hasParentQuery("parent", termQuery("p_field", "1"), false)).get(); + prepareSearch("test").setPostFilter(hasParentQuery("parent", termQuery("p_field", "1"), false)).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.status(), equalTo(RestStatus.BAD_REQUEST)); @@ -1361,8 +1300,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { boolQuery().must(matchAllQuery()).filter(hasParentQuery("parent", matchAllQuery(), false)) }; for (QueryBuilder query : queries) { - SearchResponse scrollResponse = client().prepareSearch("test") - .setScroll(TimeValue.timeValueSeconds(30)) + SearchResponse scrollResponse = prepareSearch("test").setScroll(TimeValue.timeValueSeconds(30)) .setSize(1) .addStoredField("_id") .setQuery(query) @@ -1422,7 +1360,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { scoreMode ).minMaxChildren(minChildren, maxChildren != null ? maxChildren : HasChildQueryBuilder.DEFAULT_MAX_CHILDREN); - return client().prepareSearch("test").setQuery(hasChildQuery).addSort("_score", SortOrder.DESC).addSort("id", SortOrder.ASC).get(); + return prepareSearch("test").setQuery(hasChildQuery).addSort("_score", SortOrder.DESC).addSort("id", SortOrder.ASC).get(); } public void testMinMaxChildren() throws Exception { @@ -1707,12 +1645,12 @@ public class ChildQuerySearchIT extends ParentChildTestCase { // make sure that when we explicitly set a type, the inner query is executed in the context of the child type instead assertSearchHits( - client().prepareSearch("test").setQuery(hasChildQuery("child-type", new IdsQueryBuilder().addIds("child-id"), ScoreMode.None)), + prepareSearch("test").setQuery(hasChildQuery("child-type", new IdsQueryBuilder().addIds("child-id"), ScoreMode.None)), "parent-id" ); // make sure that when we explicitly set a type, the inner query is executed in the context of the parent type instead assertSearchHits( - client().prepareSearch("test").setQuery(hasParentQuery("parent-type", new IdsQueryBuilder().addIds("parent-id"), false)), + prepareSearch("test").setQuery(hasParentQuery("parent-type", new IdsQueryBuilder().addIds("parent-id"), false)), "child-id" ); } @@ -1744,25 +1682,19 @@ public class ChildQuerySearchIT extends ParentChildTestCase { String[] highlightTypes = new String[] { "plain", "fvh", "unified" }; for (String highlightType : highlightTypes) { logger.info("Testing with highlight type [{}]", highlightType); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - new BoolQueryBuilder().must(new MatchQueryBuilder("searchText", "fox")) - .must(new HasChildQueryBuilder("child-type", new MatchAllQueryBuilder(), ScoreMode.None)) - ) - .highlighter(new HighlightBuilder().field(new HighlightBuilder.Field("searchText").highlighterType(highlightType))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + new BoolQueryBuilder().must(new MatchQueryBuilder("searchText", "fox")) + .must(new HasChildQueryBuilder("child-type", new MatchAllQueryBuilder(), ScoreMode.None)) + ).highlighter(new HighlightBuilder().field(new HighlightBuilder.Field("searchText").highlighterType(highlightType))).get(); assertHitCount(searchResponse, 1); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("parent-id")); HighlightField highlightField = searchResponse.getHits().getAt(0).getHighlightFields().get("searchText"); assertThat(highlightField.getFragments()[0].string(), equalTo("quick brown fox")); - searchResponse = client().prepareSearch("test") - .setQuery( - new BoolQueryBuilder().must(new MatchQueryBuilder("searchText", "fox")) - .must(new HasParentQueryBuilder("parent-type", new MatchAllQueryBuilder(), false)) - ) - .highlighter(new HighlightBuilder().field(new HighlightBuilder.Field("searchText").highlighterType(highlightType))) - .get(); + searchResponse = prepareSearch("test").setQuery( + new BoolQueryBuilder().must(new MatchQueryBuilder("searchText", "fox")) + .must(new HasParentQueryBuilder("parent-type", new MatchAllQueryBuilder(), false)) + ).highlighter(new HighlightBuilder().field(new HighlightBuilder.Field("searchText").highlighterType(highlightType))).get(); assertHitCount(searchResponse, 1); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("child-id")); highlightField = searchResponse.getHits().getAt(0).getHighlightFields().get("searchText"); @@ -1783,10 +1715,10 @@ public class ChildQuerySearchIT extends ParentChildTestCase { ); assertAcked(indicesAdmin().prepareAliases().addAlias("my-index", "filter2", hasParentQuery("parent", matchAllQuery(), false))); - SearchResponse response = client().prepareSearch("filter1").get(); + SearchResponse response = prepareSearch("filter1").get(); assertHitCount(response, 1); assertThat(response.getHits().getAt(0).getId(), equalTo("1")); - response = client().prepareSearch("filter2").get(); + response = prepareSearch("filter2").get(); assertHitCount(response, 1); assertThat(response.getHits().getAt(0).getId(), equalTo("2")); } 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 23c7802507ae..e64d5594fa77 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 @@ -114,9 +114,9 @@ public class InnerHitsIT extends ParentChildTestCase { requests.add(createIndexRequest("articles", "comment", "c6", "p2", "message", "elephant scared by mice x y")); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("articles") - .setQuery(hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit(new InnerHitBuilder())) - .get(); + SearchResponse response = prepareSearch("articles").setQuery( + hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("p1")); @@ -130,13 +130,11 @@ public class InnerHitsIT extends ParentChildTestCase { assertThat(innerHits.getAt(1).getId(), equalTo("c2")); final boolean seqNoAndTerm = randomBoolean(); - response = client().prepareSearch("articles") - .setQuery( - hasChildQuery("comment", matchQuery("message", "elephant"), ScoreMode.None).innerHit( - new InnerHitBuilder().setSeqNoAndPrimaryTerm(seqNoAndTerm) - ) + response = prepareSearch("articles").setQuery( + hasChildQuery("comment", matchQuery("message", "elephant"), ScoreMode.None).innerHit( + new InnerHitBuilder().setSeqNoAndPrimaryTerm(seqNoAndTerm) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("p2")); @@ -165,17 +163,15 @@ public class InnerHitsIT extends ParentChildTestCase { assertThat(innerHits.getAt(2).getSeqNo(), equalTo(UNASSIGNED_SEQ_NO)); } - response = client().prepareSearch("articles") - .setQuery( - hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit( - new InnerHitBuilder().addFetchField("message") - .setHighlightBuilder(new HighlightBuilder().field("message")) - .setExplain(true) - .setSize(1) - .addScriptField("script", new Script(ScriptType.INLINE, MockScriptEngine.NAME, "5", Collections.emptyMap())) - ) + response = prepareSearch("articles").setQuery( + hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit( + new InnerHitBuilder().addFetchField("message") + .setHighlightBuilder(new HighlightBuilder().field("message")) + .setExplain(true) + .setSize(1) + .addScriptField("script", new Script(ScriptType.INLINE, MockScriptEngine.NAME, "5", Collections.emptyMap())) ) - .get(); + ).get(); assertNoFailures(response); innerHits = response.getHits().getAt(0).getInnerHits().get("comment"); assertThat(innerHits.getHits().length, equalTo(1)); @@ -184,13 +180,11 @@ public class InnerHitsIT extends ParentChildTestCase { assertThat(innerHits.getAt(0).getFields().get("message").getValue().toString(), equalTo("fox eat quick")); assertThat(innerHits.getAt(0).getFields().get("script").getValue().toString(), equalTo("5")); - response = client().prepareSearch("articles") - .setQuery( - hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit( - new InnerHitBuilder().addDocValueField("message").setSize(1) - ) + response = prepareSearch("articles").setQuery( + hasChildQuery("comment", matchQuery("message", "fox"), ScoreMode.None).innerHit( + new InnerHitBuilder().addDocValueField("message").setSize(1) ) - .get(); + ).get(); assertNoFailures(response); innerHits = response.getHits().getAt(0).getInnerHits().get("comment"); assertThat(innerHits.getHits().length, equalTo(1)); @@ -257,11 +251,7 @@ public class InnerHitsIT extends ParentChildTestCase { ) ) ); - SearchResponse searchResponse = client().prepareSearch("idx") - .setSize(numDocs) - .addSort("id", SortOrder.ASC) - .setQuery(boolQuery) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setSize(numDocs).addSort("id", SortOrder.ASC).setQuery(boolQuery).get(); assertNoFailures(searchResponse); assertHitCount(searchResponse, numDocs); @@ -330,8 +320,7 @@ public class InnerHitsIT extends ParentChildTestCase { ); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("stack") - .addSort("id", SortOrder.ASC) + SearchResponse response = prepareSearch("stack").addSort("id", SortOrder.ASC) .setQuery( boolQuery().must(matchQuery("body", "fail2ban")) .must(hasParentQuery("question", matchAllQuery(), false).innerHit(new InnerHitBuilder())) @@ -373,15 +362,13 @@ public class InnerHitsIT extends ParentChildTestCase { requests.add(createIndexRequest("articles", "remark", "6", "4", "message", "bad").setRouting("2")); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("articles") - .setQuery( - hasChildQuery( - "comment", - hasChildQuery("remark", matchQuery("message", "good"), ScoreMode.None).innerHit(new InnerHitBuilder()), - ScoreMode.None - ).innerHit(new InnerHitBuilder()) - ) - .get(); + SearchResponse response = prepareSearch("articles").setQuery( + hasChildQuery( + "comment", + hasChildQuery("remark", matchQuery("message", "good"), ScoreMode.None).innerHit(new InnerHitBuilder()), + ScoreMode.None + ).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); @@ -396,15 +383,13 @@ public class InnerHitsIT extends ParentChildTestCase { assertThat(innerHits.getTotalHits().value, equalTo(1L)); assertThat(innerHits.getAt(0).getId(), equalTo("5")); - response = client().prepareSearch("articles") - .setQuery( - hasChildQuery( - "comment", - hasChildQuery("remark", matchQuery("message", "bad"), ScoreMode.None).innerHit(new InnerHitBuilder()), - ScoreMode.None - ).innerHit(new InnerHitBuilder()) - ) - .get(); + response = prepareSearch("articles").setQuery( + hasChildQuery( + "comment", + hasChildQuery("remark", matchQuery("message", "bad"), ScoreMode.None).innerHit(new InnerHitBuilder()), + ScoreMode.None + ).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); @@ -452,26 +437,22 @@ public class InnerHitsIT extends ParentChildTestCase { requests.add(createIndexRequest("royals", "baron", "baron4", "earl4").setRouting("king")); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("royals") - .setQuery( - boolQuery().filter( - hasParentQuery( - "prince", - hasParentQuery("king", matchAllQuery(), false).innerHit(new InnerHitBuilder().setName("kings")), - false - ).innerHit(new InnerHitBuilder().setName("princes")) - ) - .filter( - hasChildQuery( - "earl", - hasChildQuery("baron", matchAllQuery(), ScoreMode.None).innerHit(new InnerHitBuilder().setName("barons")), - ScoreMode.None - ).innerHit( - new InnerHitBuilder().addSort(SortBuilders.fieldSort("id").order(SortOrder.ASC)).setName("earls").setSize(4) - ) - ) + SearchResponse response = prepareSearch("royals").setQuery( + boolQuery().filter( + hasParentQuery( + "prince", + hasParentQuery("king", matchAllQuery(), false).innerHit(new InnerHitBuilder().setName("kings")), + false + ).innerHit(new InnerHitBuilder().setName("princes")) ) - .get(); + .filter( + hasChildQuery( + "earl", + hasChildQuery("baron", matchAllQuery(), ScoreMode.None).innerHit(new InnerHitBuilder().setName("barons")), + ScoreMode.None + ).innerHit(new InnerHitBuilder().addSort(SortBuilders.fieldSort("id").order(SortOrder.ASC)).setName("earls").setSize(4)) + ) + ).get(); assertHitCount(response, 1); assertThat(response.getHits().getAt(0).getId(), equalTo("duke")); @@ -517,12 +498,9 @@ public class InnerHitsIT extends ParentChildTestCase { requests.add(createIndexRequest("index", "child", "5", "2", "field", "value1")); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("index") - .setQuery( - hasChildQuery("child", matchQuery("field", "value1").queryName("_name1"), ScoreMode.None).innerHit(new InnerHitBuilder()) - ) - .addSort("id", SortOrder.ASC) - .get(); + SearchResponse response = prepareSearch("index").setQuery( + hasChildQuery("child", matchQuery("field", "value1").queryName("_name1"), ScoreMode.None).innerHit(new InnerHitBuilder()) + ).addSort("id", SortOrder.ASC).get(); assertHitCount(response, 2); assertThat(response.getHits().getAt(0).getId(), equalTo("1")); assertThat(response.getHits().getAt(0).getInnerHits().get("child").getTotalHits().value, equalTo(1L)); @@ -537,7 +515,7 @@ public class InnerHitsIT extends ParentChildTestCase { QueryBuilder query = hasChildQuery("child", matchQuery("field", "value2").queryName("_name2"), ScoreMode.None).innerHit( new InnerHitBuilder() ); - response = client().prepareSearch("index").setQuery(query).addSort("id", SortOrder.ASC).get(); + response = prepareSearch("index").setQuery(query).addSort("id", SortOrder.ASC).get(); assertHitCount(response, 1); assertThat(response.getHits().getAt(0).getId(), equalTo("1")); assertThat(response.getHits().getAt(0).getInnerHits().get("child").getTotalHits().value, equalTo(1L)); @@ -561,7 +539,7 @@ public class InnerHitsIT extends ParentChildTestCase { QueryBuilder query = hasChildQuery("child", matchQuery("field", "value1"), ScoreMode.None).innerHit( new InnerHitBuilder().setSize(ArrayUtil.MAX_ARRAY_LENGTH - 1) ); - SearchResponse response = client().prepareSearch("index1").setQuery(query).get(); + SearchResponse response = prepareSearch("index1").setQuery(query).get(); assertNoFailures(response); assertHitCount(response, 1); } @@ -579,18 +557,16 @@ public class InnerHitsIT extends ParentChildTestCase { createIndexRequest("test", "parent_type", "1", null, "key", "value").get(); createIndexRequest("test", "child_type", "2", "1", "nested_type", Collections.singletonMap("key", "value")).get(); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery( - boolQuery().must(matchQuery("key", "value")) - .should( - hasChildQuery( - "child_type", - nestedQuery("nested_type", matchAllQuery(), ScoreMode.None).innerHit(new InnerHitBuilder()), - ScoreMode.None - ).innerHit(new InnerHitBuilder()) - ) - ) - .get(); + SearchResponse response = prepareSearch("test").setQuery( + boolQuery().must(matchQuery("key", "value")) + .should( + hasChildQuery( + "child_type", + nestedQuery("nested_type", matchAllQuery(), ScoreMode.None).innerHit(new InnerHitBuilder()), + ScoreMode.None + ).innerHit(new InnerHitBuilder()) + ) + ).get(); assertHitCount(response, 1); SearchHit hit = response.getHits().getAt(0); String parentId = (String) extractValue("join_field.parent", hit.getInnerHits().get("child_type").getAt(0).getSourceAsMap()); @@ -640,22 +616,19 @@ public class InnerHitsIT extends ParentChildTestCase { createIndexRequest("index1", "child_type", "2", "1").get(); refresh(); assertHitCountAndNoFailures( - client().prepareSearch("index1") - .setQuery( - hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) - .innerHit(new InnerHitBuilder().setFrom(50).setSize(10).setName("_name")) - ), + prepareSearch("index1").setQuery( + hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) + .innerHit(new InnerHitBuilder().setFrom(50).setSize(10).setName("_name")) + ), 1 ); Exception e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("index1") - .setQuery( - hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) - .innerHit(new InnerHitBuilder().setFrom(100).setSize(10).setName("_name")) - ) - .get() + () -> prepareSearch("index1").setQuery( + hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) + .innerHit(new InnerHitBuilder().setFrom(100).setSize(10).setName("_name")) + ).get() ); assertThat( e.getCause().getMessage(), @@ -663,12 +636,10 @@ public class InnerHitsIT extends ParentChildTestCase { ); e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("index1") - .setQuery( - hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) - .innerHit(new InnerHitBuilder().setFrom(10).setSize(100).setName("_name")) - ) - .get() + () -> prepareSearch("index1").setQuery( + hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) + .innerHit(new InnerHitBuilder().setFrom(10).setSize(100).setName("_name")) + ).get() ); assertThat( e.getCause().getMessage(), @@ -676,18 +647,16 @@ public class InnerHitsIT extends ParentChildTestCase { ); updateIndexSettings(Settings.builder().put(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey(), 110), "index1"); assertNoFailures( - client().prepareSearch("index1") - .setQuery( - hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) - .innerHit(new InnerHitBuilder().setFrom(100).setSize(10).setName("_name")) - ) + prepareSearch("index1").setQuery( + hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) + .innerHit(new InnerHitBuilder().setFrom(100).setSize(10).setName("_name")) + ) ); assertNoFailures( - client().prepareSearch("index1") - .setQuery( - hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) - .innerHit(new InnerHitBuilder().setFrom(10).setSize(100).setName("_name")) - ) + prepareSearch("index1").setQuery( + hasChildQuery("child_type", matchAllQuery(), ScoreMode.None).ignoreUnmapped(true) + .innerHit(new InnerHitBuilder().setFrom(10).setSize(100).setName("_name")) + ) ); } } 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 5d6d51e548ee..39b42b25ca65 100644 --- a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java @@ -1101,48 +1101,44 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { MultiSearchResponse response = client().prepareMultiSearch() .add( - client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "query", - BytesReference.bytes(jsonBuilder().startObject().field("field1", "b").endObject()), - XContentType.JSON - ) + prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "query", + BytesReference.bytes(jsonBuilder().startObject().field("field1", "b").endObject()), + XContentType.JSON ) + ) ) .add( - client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "query", - BytesReference.bytes(yamlBuilder().startObject().field("field1", "c").endObject()), - XContentType.YAML - ) + prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "query", + BytesReference.bytes(yamlBuilder().startObject().field("field1", "c").endObject()), + XContentType.YAML ) + ) ) .add( - client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "query", - BytesReference.bytes(jsonBuilder().startObject().field("field1", "b c").endObject()), - XContentType.JSON - ) + prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "query", + BytesReference.bytes(jsonBuilder().startObject().field("field1", "b c").endObject()), + XContentType.JSON ) + ) ) .add( - client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "query", - BytesReference.bytes(jsonBuilder().startObject().field("field1", "d").endObject()), - XContentType.JSON - ) + prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "query", + BytesReference.bytes(jsonBuilder().startObject().field("field1", "d").endObject()), + XContentType.JSON ) + ) ) - .add(client().prepareSearch("test").setQuery(new PercolateQueryBuilder("query", "test", "5", null, null, null))) + .add(prepareSearch("test").setQuery(new PercolateQueryBuilder("query", "test", "5", null, null, null))) .add( - client().prepareSearch("test") // non existing doc, so error element + prepareSearch("test") // non existing doc, so error element .setQuery(new PercolateQueryBuilder("query", "test", "6", null, null, null)) ) .get(); @@ -1241,40 +1237,33 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { indicesAdmin().prepareRefresh().get(); - SearchResponse response = client().prepareSearch("test") - .setQuery( + SearchResponse response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q", + BytesReference.bytes(jsonBuilder().startObject().field("d", "2020-02-01T15:00:00.000+11:00").endObject()), + XContentType.JSON + ) + ).get(); + assertEquals(1, response.getHits().getTotalHits().value); + + response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q", + BytesReference.bytes(jsonBuilder().startObject().field("d", "2020-02-01T15:00:00.000+11:00").endObject()), + XContentType.JSON + ) + ).addSort("_doc", SortOrder.ASC).get(); + assertEquals(1, response.getHits().getTotalHits().value); + + response = prepareSearch("test").setQuery( + constantScoreQuery( new PercolateQueryBuilder( "q", BytesReference.bytes(jsonBuilder().startObject().field("d", "2020-02-01T15:00:00.000+11:00").endObject()), XContentType.JSON ) ) - .get(); - assertEquals(1, response.getHits().getTotalHits().value); - - response = client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "q", - BytesReference.bytes(jsonBuilder().startObject().field("d", "2020-02-01T15:00:00.000+11:00").endObject()), - XContentType.JSON - ) - ) - .addSort("_doc", SortOrder.ASC) - .get(); - assertEquals(1, response.getHits().getTotalHits().value); - - response = client().prepareSearch("test") - .setQuery( - constantScoreQuery( - new PercolateQueryBuilder( - "q", - BytesReference.bytes(jsonBuilder().startObject().field("d", "2020-02-01T15:00:00.000+11:00").endObject()), - XContentType.JSON - ) - ) - ) - .get(); + ).get(); assertEquals(1, response.getHits().getTotalHits().value); } @@ -1310,48 +1299,40 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .execute() .actionGet(); - SearchResponse response = client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "q_simple", - BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), - XContentType.JSON - ) + SearchResponse response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q_simple", + BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), + XContentType.JSON ) - .get(); + ).get(); assertEquals(1, response.getHits().getTotalHits().value); - response = client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "q_string", - BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), - XContentType.JSON - ) + response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q_string", + BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), + XContentType.JSON ) - .get(); + ).get(); assertEquals(1, response.getHits().getTotalHits().value); - response = client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "q_match", - BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), - XContentType.JSON - ) + response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q_match", + BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), + XContentType.JSON ) - .get(); + ).get(); assertEquals(1, response.getHits().getTotalHits().value); - response = client().prepareSearch("test") - .setQuery( - new PercolateQueryBuilder( - "q_combo", - BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), - XContentType.JSON - ) + response = prepareSearch("test").setQuery( + new PercolateQueryBuilder( + "q_combo", + BytesReference.bytes(jsonBuilder().startObject().field("text_1", "yada").endObject()), + XContentType.JSON ) - .get(); + ).get(); assertEquals(1, response.getHits().getTotalHits().value); } } diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java index dd9bde8035ef..9947d8a727d2 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/client/documentation/ReindexDocumentationIT.java @@ -282,7 +282,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase { ); // Checks that the all documents have been indexed and correctly counted - assertHitCount(client().prepareSearch(INDEX_NAME).setSize(0), numDocs); + assertHitCount(prepareSearch(INDEX_NAME).setSize(0), numDocs); assertThat(ALLOWED_OPERATIONS.drainPermits(), equalTo(0)); ReindexRequestBuilder builder = new ReindexRequestBuilder(client, ReindexAction.INSTANCE).source(INDEX_NAME) diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java index 148189152b30..d7f71fcc510a 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java +++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/index/reindex/BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests.java @@ -201,8 +201,7 @@ public class BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests extends // Ensure that the write thread blocking task is currently executing barrier.await(); - final SearchResponse searchResponse = client().prepareSearch(sourceIndex) - .setSize(numDocs) // Get all indexed docs + final SearchResponse searchResponse = prepareSearch(sourceIndex).setSize(numDocs) // Get all indexed docs .addSort(SORTING_FIELD, SortOrder.DESC) .execute() .actionGet(); diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java index 803264f6b73b..35ad5fe9532c 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java @@ -102,7 +102,7 @@ public class CancelTests extends ReindexTestCase { ); // Checks that the all documents have been indexed and correctly counted - assertHitCount(client().prepareSearch(INDEX).setSize(0), numDocs); + assertHitCount(prepareSearch(INDEX).setSize(0), numDocs); assertThat(ALLOWED_OPERATIONS.drainPermits(), equalTo(0)); // Scroll by 1 so that cancellation is easier to control @@ -225,7 +225,7 @@ public class CancelTests extends ReindexTestCase { assertThat(response, matcher().created(modified).reasonCancelled(equalTo("by user request"))); refresh("dest"); - assertHitCount(client().prepareSearch("dest").setSize(0), modified); + assertHitCount(prepareSearch("dest").setSize(0), modified); }, equalTo("reindex from [" + INDEX + "] to [dest]")); } @@ -241,7 +241,7 @@ public class CancelTests extends ReindexTestCase { testCancel(UpdateByQueryAction.NAME, updateByQuery().setPipeline("set-processed").source(INDEX), (response, total, modified) -> { assertThat(response, matcher().updated(modified).reasonCancelled(equalTo("by user request"))); - assertHitCount(client().prepareSearch(INDEX).setSize(0).setQuery(termQuery("processed", true)), modified); + assertHitCount(prepareSearch(INDEX).setSize(0).setQuery(termQuery("processed", true)), modified); }, equalTo("update-by-query [" + INDEX + "]")); assertAcked(clusterAdmin().deletePipeline(new DeletePipelineRequest("set-processed")).get()); @@ -253,7 +253,7 @@ public class CancelTests extends ReindexTestCase { deleteByQuery().source(INDEX).filter(QueryBuilders.matchAllQuery()), (response, total, modified) -> { assertThat(response, matcher().deleted(modified).reasonCancelled(equalTo("by user request"))); - assertHitCount(client().prepareSearch(INDEX).setSize(0), total - modified); + assertHitCount(prepareSearch(INDEX).setSize(0), total - modified); }, equalTo("delete-by-query [" + INDEX + "]") ); @@ -266,7 +266,7 @@ public class CancelTests extends ReindexTestCase { (response, total, modified) -> { assertThat(response, matcher().created(modified).reasonCancelled(equalTo("by user request")).slices(hasSize(5))); refresh("dest"); - assertHitCount(client().prepareSearch("dest").setSize(0), modified); + assertHitCount(prepareSearch("dest").setSize(0), modified); }, equalTo("reindex from [" + INDEX + "] to [dest]") ); @@ -287,7 +287,7 @@ public class CancelTests extends ReindexTestCase { updateByQuery().setPipeline("set-processed").source(INDEX).setSlices(5), (response, total, modified) -> { assertThat(response, matcher().updated(modified).reasonCancelled(equalTo("by user request")).slices(hasSize(5))); - assertHitCount(client().prepareSearch(INDEX).setSize(0).setQuery(termQuery("processed", true)), modified); + assertHitCount(prepareSearch(INDEX).setSize(0).setQuery(termQuery("processed", true)), modified); }, equalTo("update-by-query [" + INDEX + "]") ); @@ -301,7 +301,7 @@ public class CancelTests extends ReindexTestCase { deleteByQuery().source(INDEX).filter(QueryBuilders.matchAllQuery()).setSlices(5), (response, total, modified) -> { assertThat(response, matcher().deleted(modified).reasonCancelled(equalTo("by user request")).slices(hasSize(5))); - assertHitCount(client().prepareSearch(INDEX).setSize(0), total - modified); + assertHitCount(prepareSearch(INDEX).setSize(0), total - modified); }, equalTo("delete-by-query [" + INDEX + "]") ); 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 cfcd78374bca..d3b401ab3541 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java @@ -61,25 +61,25 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { client().prepareIndex("test").setId("7").setSource("foo", "f") ); - assertHitCount(client().prepareSearch("test").setSize(0), 7); + assertHitCount(prepareSearch("test").setSize(0), 7); // Deletes two docs that matches "foo:a" assertThat(deleteByQuery().source("test").filter(termQuery("foo", "a")).refresh(true).get(), matcher().deleted(2)); - assertHitCount(client().prepareSearch("test").setSize(0), 5); + assertHitCount(prepareSearch("test").setSize(0), 5); // Deletes the two first docs with limit by size DeleteByQueryRequestBuilder request = deleteByQuery().source("test").filter(QueryBuilders.matchAllQuery()).size(2).refresh(true); request.source().addSort("foo.keyword", SortOrder.ASC); assertThat(request.get(), matcher().deleted(2)); - assertHitCount(client().prepareSearch("test").setSize(0), 3); + assertHitCount(prepareSearch("test").setSize(0), 3); // Deletes but match no docs assertThat(deleteByQuery().source("test").filter(termQuery("foo", "no_match")).refresh(true).get(), matcher().deleted(0)); - assertHitCount(client().prepareSearch("test").setSize(0), 3); + assertHitCount(prepareSearch("test").setSize(0), 3); // Deletes all remaining docs assertThat(deleteByQuery().source("test").filter(QueryBuilders.matchAllQuery()).refresh(true).get(), matcher().deleted(3)); - assertHitCount(client().prepareSearch("test").setSize(0), 0); + assertHitCount(prepareSearch("test").setSize(0), 0); } public void testDeleteByQueryWithOneIndex() throws Exception { @@ -92,7 +92,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { indexRandom(true, true, true, builders); assertThat(deleteByQuery().source("t*").filter(QueryBuilders.matchAllQuery()).refresh(true).get(), matcher().deleted(docs)); - assertHitCount(client().prepareSearch("test").setSize(0), 0); + assertHitCount(prepareSearch("test").setSize(0), 0); } public void testDeleteByQueryWithMultipleIndices() throws Exception { @@ -122,7 +122,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { for (int i = 0; i < indices; i++) { long remaining = docs - candidates[i]; - assertHitCount(client().prepareSearch("test-" + i).setSize(0), remaining); + assertHitCount(prepareSearch("test-" + i).setSize(0), remaining); } assertHitCount(client().prepareSearch().setSize(0), (indices * docs) - deletions); @@ -186,13 +186,13 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { indexRandom(true, true, true, builders); int n = between(0, docs - 1); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(matchQuery("_id", Integer.toString(n))), 1); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(QueryBuilders.matchAllQuery()), docs); + assertHitCount(prepareSearch("test").setSize(0).setQuery(matchQuery("_id", Integer.toString(n))), 1); + assertHitCount(prepareSearch("test").setSize(0).setQuery(QueryBuilders.matchAllQuery()), docs); DeleteByQueryRequestBuilder delete = deleteByQuery().source("alias").filter(matchQuery("_id", Integer.toString(n))); assertThat(delete.refresh(true).get(), matcher().deleted(1L)); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(QueryBuilders.matchAllQuery()), docs - 1); + assertHitCount(prepareSearch("test").setSize(0).setQuery(QueryBuilders.matchAllQuery()), docs - 1); } public void testDeleteByQueryWithDateMath() throws Exception { @@ -201,7 +201,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { DeleteByQueryRequestBuilder delete = deleteByQuery().source("test").filter(rangeQuery("d").to("now-1h")); assertThat(delete.refresh(true).get(), matcher().deleted(1L)); - assertHitCount(client().prepareSearch("test").setSize(0), 0); + assertHitCount(prepareSearch("test").setSize(0), 0); } public void testDeleteByQueryOnReadOnlyIndex() throws Exception { @@ -224,7 +224,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { disableIndexBlock("test", SETTING_READ_ONLY); } - assertHitCount(client().prepareSearch("test").setSize(0), docs); + assertHitCount(prepareSearch("test").setSize(0), docs); } public void testDeleteByQueryOnReadOnlyAllowDeleteIndex() throws Exception { @@ -280,9 +280,9 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { } } if (diskAllocationDeciderEnabled) { - assertHitCount(client().prepareSearch("test").setSize(0), 0); + assertHitCount(prepareSearch("test").setSize(0), 0); } else { - assertHitCount(client().prepareSearch("test").setSize(0), docs); + assertHitCount(prepareSearch("test").setSize(0), docs); } } @@ -297,7 +297,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { client().prepareIndex("test").setId("6").setSource("foo", "e"), client().prepareIndex("test").setId("7").setSource("foo", "f") ); - assertHitCount(client().prepareSearch("test").setSize(0), 7); + assertHitCount(prepareSearch("test").setSize(0), 7); int slices = randomSlices(); int expectedSlices = expectedSliceStatuses(slices, "test"); @@ -307,14 +307,14 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { deleteByQuery().source("test").filter(termQuery("foo", "a")).refresh(true).setSlices(slices).get(), matcher().deleted(2).slices(hasSize(expectedSlices)) ); - assertHitCount(client().prepareSearch("test").setSize(0), 5); + assertHitCount(prepareSearch("test").setSize(0), 5); // Delete remaining docs assertThat( deleteByQuery().source("test").filter(QueryBuilders.matchAllQuery()).refresh(true).setSlices(slices).get(), matcher().deleted(5).slices(hasSize(expectedSlices)) ); - assertHitCount(client().prepareSearch("test").setSize(0), 0); + assertHitCount(prepareSearch("test").setSize(0), 0); } public void testMultipleSources() throws Exception { @@ -333,7 +333,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { List allDocs = docs.values().stream().flatMap(Collection::stream).collect(Collectors.toList()); indexRandom(true, allDocs); for (Map.Entry> entry : docs.entrySet()) { - assertHitCount(client().prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); + assertHitCount(prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); } int slices = randomSlices(1, 10); @@ -347,7 +347,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { ); for (String index : docs.keySet()) { - assertHitCount(client().prepareSearch(index).setSize(0), 0); + assertHitCount(prepareSearch(index).setSize(0), 0); } } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java index 2e5fd4803fbe..81d00d98b1fe 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java @@ -40,7 +40,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase { final CountDownLatch start = new CountDownLatch(1); for (int t = 0; t < threads.length; t++) { final int threadNum = t; - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(QueryBuilders.termQuery("field", threadNum)), docs); + assertHitCount(prepareSearch("test").setSize(0).setQuery(QueryBuilders.termQuery("field", threadNum)), docs); Runnable r = () -> { try { @@ -64,7 +64,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase { } for (int t = 0; t < threads.length; t++) { - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(QueryBuilders.termQuery("field", t)), 0); + assertHitCount(prepareSearch("test").setSize(0).setQuery(QueryBuilders.termQuery("field", t)), 0); } } @@ -105,7 +105,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase { thread.join(); } - assertHitCount(client().prepareSearch("test").setSize(0), 0L); + assertHitCount(prepareSearch("test").setSize(0), 0L); assertThat(deleted.get(), equalTo(docs)); } } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java index 3bc029058e70..45ca5a536f34 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java @@ -35,28 +35,28 @@ public class ReindexBasicTests extends ReindexTestCase { client().prepareIndex("source").setId("3").setSource("foo", "b"), client().prepareIndex("source").setId("4").setSource("foo", "c") ); - assertHitCount(client().prepareSearch("source").setSize(0), 4); + assertHitCount(prepareSearch("source").setSize(0), 4); // Copy all the docs ReindexRequestBuilder copy = reindex().source("source").destination("dest").refresh(true); assertThat(copy.get(), matcher().created(4)); - assertHitCount(client().prepareSearch("dest").setSize(0), 4); + assertHitCount(prepareSearch("dest").setSize(0), 4); // Now none of them createIndex("none"); copy = reindex().source("source").destination("none").filter(termQuery("foo", "no_match")).refresh(true); assertThat(copy.get(), matcher().created(0)); - assertHitCount(client().prepareSearch("none").setSize(0), 0); + assertHitCount(prepareSearch("none").setSize(0), 0); // Now half of them copy = reindex().source("source").destination("dest_half").filter(termQuery("foo", "a")).refresh(true); assertThat(copy.get(), matcher().created(2)); - assertHitCount(client().prepareSearch("dest_half").setSize(0), 2); + assertHitCount(prepareSearch("dest_half").setSize(0), 2); // Limit with maxDocs copy = reindex().source("source").destination("dest_size_one").maxDocs(1).refresh(true); assertThat(copy.get(), matcher().created(1)); - assertHitCount(client().prepareSearch("dest_size_one").setSize(0), 1); + assertHitCount(prepareSearch("dest_size_one").setSize(0), 1); } public void testCopyMany() throws Exception { @@ -67,14 +67,14 @@ public class ReindexBasicTests extends ReindexTestCase { } indexRandom(true, docs); - assertHitCount(client().prepareSearch("source").setSize(0), max); + assertHitCount(prepareSearch("source").setSize(0), max); // Copy all the docs ReindexRequestBuilder copy = reindex().source("source").destination("dest").refresh(true); // Use a small batch size so we have to use more than one batch copy.source().setSize(5); assertThat(copy.get(), matcher().created(max).batches(max, 5)); - assertHitCount(client().prepareSearch("dest").setSize(0), max); + assertHitCount(prepareSearch("dest").setSize(0), max); // Copy some of the docs int half = max / 2; @@ -83,7 +83,7 @@ public class ReindexBasicTests extends ReindexTestCase { copy.source().setSize(5); copy.maxDocs(half); assertThat(copy.get(), matcher().created(half).batches(half, 5)); - assertHitCount(client().prepareSearch("dest_half").setSize(0), half); + assertHitCount(prepareSearch("dest_half").setSize(0), half); } public void testCopyManyWithSlices() throws Exception { @@ -94,7 +94,7 @@ public class ReindexBasicTests extends ReindexTestCase { } indexRandom(true, docs); - assertHitCount(client().prepareSearch("source").setSize(0), max); + assertHitCount(prepareSearch("source").setSize(0), max); int slices = randomSlices(); int expectedSlices = expectedSliceStatuses(slices, "source"); @@ -104,7 +104,7 @@ public class ReindexBasicTests extends ReindexTestCase { // Use a small batch size so we have to use more than one batch copy.source().setSize(5); assertThat(copy.get(), matcher().created(max).batches(greaterThanOrEqualTo(max / 5)).slices(hasSize(expectedSlices))); - assertHitCount(client().prepareSearch("dest").setSize(0), max); + assertHitCount(prepareSearch("dest").setSize(0), max); // Copy some of the docs int half = max / 2; @@ -114,7 +114,7 @@ public class ReindexBasicTests extends ReindexTestCase { copy.maxDocs(half); BulkByScrollResponse response = copy.get(); assertThat(response, matcher().created(lessThanOrEqualTo((long) half)).slices(hasSize(expectedSlices))); - assertHitCount(client().prepareSearch("dest_half").setSize(0), response.getCreated()); + assertHitCount(prepareSearch("dest_half").setSize(0), response.getCreated()); } public void testMultipleSources() throws Exception { @@ -134,7 +134,7 @@ public class ReindexBasicTests extends ReindexTestCase { List allDocs = docs.values().stream().flatMap(Collection::stream).collect(Collectors.toList()); indexRandom(true, allDocs); for (Map.Entry> entry : docs.entrySet()) { - assertHitCount(client().prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); + assertHitCount(prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); } int slices = randomSlices(1, 10); @@ -145,7 +145,7 @@ public class ReindexBasicTests extends ReindexTestCase { BulkByScrollResponse response = request.get(); assertThat(response, matcher().created(allDocs.size()).slices(hasSize(expectedSlices))); - assertHitCount(client().prepareSearch("dest").setSize(0), allDocs.size()); + assertHitCount(prepareSearch("dest").setSize(0), allDocs.size()); } public void testMissingSources() { @@ -166,12 +166,12 @@ public class ReindexBasicTests extends ReindexTestCase { client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") ); - assertHitCount(client().prepareSearch(sourceIndexName).setSize(0), 4); + assertHitCount(prepareSearch(sourceIndexName).setSize(0), 4); // Copy all the docs ReindexRequestBuilder copy = reindex().source(sourceIndexName).destination(destIndexName).refresh(true); assertThat(copy.get(), matcher().created(4)); - assertHitCount(client().prepareSearch(destIndexName).setSize(0), 4); + assertHitCount(prepareSearch(destIndexName).setSize(0), 4); } } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java index 8a3066ebac83..5e868598d165 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java @@ -128,7 +128,7 @@ public class ReindexFailureTests extends ReindexTestCase { client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") ); - assertHitCount(client().prepareSearch(sourceIndexName).setSize(0), 4); + assertHitCount(prepareSearch(sourceIndexName).setSize(0), 4); ActionRequestValidationException e = expectThrows( ActionRequestValidationException.class, diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java index fb02abdab0f6..f37c9b589141 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java @@ -34,7 +34,7 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { client().prepareIndex("test").setId("3").setSource("foo", "b"), client().prepareIndex("test").setId("4").setSource("foo", "c") ); - assertHitCount(client().prepareSearch("test").setSize(0), 4); + assertHitCount(prepareSearch("test").setSize(0), 4); assertEquals(1, client().prepareGet("test", "1").get().getVersion()); assertEquals(1, client().prepareGet("test", "4").get().getVersion()); @@ -74,7 +74,7 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { client().prepareIndex("test").setId("3").setSource("foo", "b"), client().prepareIndex("test").setId("4").setSource("foo", "c") ); - assertHitCount(client().prepareSearch("test").setSize(0), 4); + assertHitCount(prepareSearch("test").setSize(0), 4); assertEquals(1, client().prepareGet("test", "1").get().getVersion()); assertEquals(1, client().prepareGet("test", "4").get().getVersion()); @@ -124,7 +124,7 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { List allDocs = docs.values().stream().flatMap(Collection::stream).collect(Collectors.toList()); indexRandom(true, allDocs); for (Map.Entry> entry : docs.entrySet()) { - assertHitCount(client().prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); + assertHitCount(prepareSearch(entry.getKey()).setSize(0), entry.getValue().size()); } int slices = randomSlices(1, 10); diff --git a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java index 5790fdb785bb..b23e32b65169 100644 --- a/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java +++ b/modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java @@ -198,7 +198,7 @@ public class S3BlobStoreRepositoryTests extends ESMockAPIBasedRepositoryIntegTes flushAndRefresh(index); ForceMergeResponse forceMerge = client().admin().indices().prepareForceMerge(index).setFlush(true).setMaxNumSegments(1).get(); assertThat(forceMerge.getSuccessfulShards(), equalTo(1)); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); // Intentionally fail snapshot to trigger abortMultipartUpload requests shouldFailCompleteMultipartUploadRequest.set(true); @@ -240,14 +240,14 @@ public class S3BlobStoreRepositoryTests extends ESMockAPIBasedRepositoryIntegTes flushAndRefresh(index); ForceMergeResponse forceMerge = client().admin().indices().prepareForceMerge(index).setFlush(true).setMaxNumSegments(1).get(); assertThat(forceMerge.getSuccessfulShards(), equalTo(1)); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); final String snapshot = "snapshot"; assertSuccessfulSnapshot(clusterAdmin().prepareCreateSnapshot(repository, snapshot).setWaitForCompletion(true).setIndices(index)); assertAcked(client().admin().indices().prepareDelete(index)); assertSuccessfulRestore(clusterAdmin().prepareRestoreSnapshot(repository, snapshot).setWaitForCompletion(true)); ensureGreen(index); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); assertAcked(clusterAdmin().prepareDeleteSnapshot(repository, snapshot).get()); final Map aggregatedMetrics = new HashMap<>(); diff --git a/plugins/mapper-size/src/internalClusterTest/java/org/elasticsearch/index/mapper/size/SizeMappingIT.java b/plugins/mapper-size/src/internalClusterTest/java/org/elasticsearch/index/mapper/size/SizeMappingIT.java index ead12a7b2246..e92c7ca4bdeb 100644 --- a/plugins/mapper-size/src/internalClusterTest/java/org/elasticsearch/index/mapper/size/SizeMappingIT.java +++ b/plugins/mapper-size/src/internalClusterTest/java/org/elasticsearch/index/mapper/size/SizeMappingIT.java @@ -110,15 +110,15 @@ public class SizeMappingIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("_size", "enabled=true")); final String source = "{\"f\":\"" + randomAlphaOfLengthBetween(1, 100) + "\"}"; indexRandom(true, client().prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); - SearchResponse searchResponse = client().prepareSearch("test").addFetchField("_size").get(); + SearchResponse searchResponse = prepareSearch("test").addFetchField("_size").get(); assertEquals(source.length(), ((Long) searchResponse.getHits().getHits()[0].getFields().get("_size").getValue()).intValue()); // this should not work when requesting fields via wildcard expression - searchResponse = client().prepareSearch("test").addFetchField("*").get(); + searchResponse = prepareSearch("test").addFetchField("*").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); // This should STILL work - searchResponse = client().prepareSearch("test").addStoredField("*").get(); + searchResponse = prepareSearch("test").addStoredField("*").get(); assertNotNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); } @@ -126,13 +126,13 @@ public class SizeMappingIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("_size", "enabled=false")); final String source = "{\"f\":\"" + randomAlphaOfLengthBetween(1, 100) + "\"}"; indexRandom(true, client().prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); - SearchResponse searchResponse = client().prepareSearch("test").addFetchField("_size").get(); + SearchResponse searchResponse = prepareSearch("test").addFetchField("_size").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); - searchResponse = client().prepareSearch("test").addFetchField("*").get(); + searchResponse = prepareSearch("test").addFetchField("*").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); - searchResponse = client().prepareSearch("test").addStoredField("*").get(); + searchResponse = prepareSearch("test").addStoredField("*").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); } @@ -140,13 +140,13 @@ public class SizeMappingIT extends ESIntegTestCase { assertAcked(prepareCreate("test")); final String source = "{\"f\":\"" + randomAlphaOfLengthBetween(1, 100) + "\"}"; indexRandom(true, client().prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); - SearchResponse searchResponse = client().prepareSearch("test").addFetchField("_size").get(); + SearchResponse searchResponse = prepareSearch("test").addFetchField("_size").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); - searchResponse = client().prepareSearch("test").addFetchField("*").get(); + searchResponse = prepareSearch("test").addFetchField("*").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); - searchResponse = client().prepareSearch("test").addStoredField("*").get(); + searchResponse = prepareSearch("test").addStoredField("*").get(); assertNull(searchResponse.getHits().getHits()[0].getFields().get("_size")); } } diff --git a/plugins/store-smb/src/internalClusterTest/java/org/elasticsearch/index/store/smb/AbstractAzureFsTestCase.java b/plugins/store-smb/src/internalClusterTest/java/org/elasticsearch/index/store/smb/AbstractAzureFsTestCase.java index d4763af7a505..4d1f6426821c 100644 --- a/plugins/store-smb/src/internalClusterTest/java/org/elasticsearch/index/store/smb/AbstractAzureFsTestCase.java +++ b/plugins/store-smb/src/internalClusterTest/java/org/elasticsearch/index/store/smb/AbstractAzureFsTestCase.java @@ -32,7 +32,7 @@ public abstract class AbstractAzureFsTestCase extends ESIntegTestCase { indexDoc("test", "" + i, "foo", "bar"); } refresh(); - SearchResponse response = client().prepareSearch("test").get(); + SearchResponse response = prepareSearch("test").get(); assertThat(response.getHits().getTotalHits().value, is(nbDocs)); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java index a98f98ded28b..c7082f7979ed 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java @@ -50,8 +50,7 @@ public class RejectionActionIT extends ESIntegTestCase { final CountDownLatch latch = new CountDownLatch(numberOfAsyncOps); final CopyOnWriteArrayList responses = new CopyOnWriteArrayList<>(); for (int i = 0; i < numberOfAsyncOps; i++) { - client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(QueryBuilders.matchQuery("field", "1")) .execute(new LatchedActionListener<>(new ActionListener() { @Override diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java index c0a54ef874de..4d488ede6f0d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/TasksIT.java @@ -782,15 +782,15 @@ public class TasksIT extends ESIntegTestCase { assertNoFailures(indicesAdmin().prepareRefresh(TaskResultsService.TASK_INDEX).get()); - SearchResponse searchResponse = client().prepareSearch(TaskResultsService.TASK_INDEX) - .setSource(SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.action", taskInfo.action()))) - .get(); + SearchResponse searchResponse = prepareSearch(TaskResultsService.TASK_INDEX).setSource( + SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.action", taskInfo.action())) + ).get(); assertEquals(1L, searchResponse.getHits().getTotalHits().value); - searchResponse = client().prepareSearch(TaskResultsService.TASK_INDEX) - .setSource(SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.node", taskInfo.taskId().getNodeId()))) - .get(); + searchResponse = prepareSearch(TaskResultsService.TASK_INDEX).setSource( + SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("task.node", taskInfo.taskId().getNodeId())) + ).get(); assertEquals(1L, searchResponse.getHits().getTotalHits().value); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java index 4f84509086a5..b18564beb655 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java @@ -80,21 +80,21 @@ public class CloneIndexIT extends ESIntegTestCase { } final int size = docs > 0 ? 2 * docs : 1; - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); if (createWithReplicas == false) { // bump replicas setReplicaCount(1, "target"); ensureGreen(); - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); } for (int i = docs; i < 2 * docs; i++) { client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); - assertHitCount(client().prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); + assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get(); assertThat( target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId), diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java index 27154c883d27..e3ea54f382c0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java @@ -270,11 +270,10 @@ public class CreateIndexIT extends ESIntegTestCase { // we only really assert that we never reuse segments of old indices or anything like this here and that nothing fails with // crazy exceptions - SearchResponse expected = client().prepareSearch("test") - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) + SearchResponse expected = prepareSearch("test").setIndicesOptions(IndicesOptions.lenientExpandOpen()) .setQuery(new RangeQueryBuilder("index_version").from(indexVersion.get(), true)) .get(); - SearchResponse all = client().prepareSearch("test").setIndicesOptions(IndicesOptions.lenientExpandOpen()).get(); + SearchResponse all = prepareSearch("test").setIndicesOptions(IndicesOptions.lenientExpandOpen()).get(); assertEquals(expected + " vs. " + all, expected.getHits().getTotalHits().value, all.getHits().getTotalHits().value); logger.info("total: {}", expected.getHits().getTotalHits().value); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java index 173719a8dc92..ac206a0ed060 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java @@ -107,7 +107,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { .get() ); ensureGreen(); - assertHitCount(client().prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); for (int i = 0; i < 20; i++) { // now update client().prepareIndex("first_shrink") @@ -116,8 +116,8 @@ public class ShrinkIndexIT extends ESIntegTestCase { .get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(client().prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); // relocate all shards to one node such that we can merge it. updateIndexSettings( @@ -134,14 +134,14 @@ public class ShrinkIndexIT extends ESIntegTestCase { .get() ); ensureGreen(); - assertHitCount(client().prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); // let it be allocated anywhere and bump replicas updateIndexSettings( Settings.builder().putNull("index.routing.allocation.include._id").put("index.number_of_replicas", 1), "second_shrink" ); ensureGreen(); - assertHitCount(client().prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); for (int i = 0; i < 20; i++) { // now update client().prepareIndex("second_shrink") @@ -150,9 +150,9 @@ public class ShrinkIndexIT extends ESIntegTestCase { .get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(client().prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); - assertHitCount(client().prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); assertNoResizeSourceIndexSettings("first_shrink"); assertNoResizeSourceIndexSettings("second_shrink"); @@ -311,21 +311,21 @@ public class ShrinkIndexIT extends ESIntegTestCase { } final int size = docs > 0 ? 2 * docs : 1; - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); if (createWithReplicas == false) { // bump replicas setReplicaCount(1, "target"); ensureGreen(); - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); } for (int i = docs; i < 2 * docs; i++) { client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); - assertHitCount(client().prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); + assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get(); assertThat( target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId), @@ -409,7 +409,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { // we support the expected shard size in the allocator to sum up over the source index shards assertTrue("expected shard size must be set but wasn't: " + expectedShardSize, expectedShardSize > 0); ensureGreen(); - assertHitCount(client().prepareSearch("target").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); + assertHitCount(prepareSearch("target").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20); assertNoResizeSourceIndexSettings("target"); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java index 84fe73ead7d8..68b75fc04770 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java @@ -189,7 +189,7 @@ public class SplitIndexIT extends ESIntegTestCase { .get() ); ensureGreen(); - assertHitCount(client().prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); assertNoResizeSourceIndexSettings("first_split"); for (int i = 0; i < numDocs; i++) { // now update @@ -200,8 +200,8 @@ public class SplitIndexIT extends ESIntegTestCase { builder.get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); - assertHitCount(client().prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); for (int i = 0; i < numDocs; i++) { GetResponse getResponse = client().prepareGet("first_split", Integer.toString(i)).setRouting(routingValue[i]).get(); assertTrue(getResponse.isExists()); @@ -217,13 +217,13 @@ public class SplitIndexIT extends ESIntegTestCase { .get() ); ensureGreen(); - assertHitCount(client().prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); assertNoResizeSourceIndexSettings("second_split"); // let it be allocated anywhere and bump replicas setReplicaCount(1, "second_split"); ensureGreen(); - assertHitCount(client().prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); for (int i = 0; i < numDocs; i++) { // now update IndexRequestBuilder builder = indexFunc.apply("second_split", i); @@ -237,30 +237,24 @@ public class SplitIndexIT extends ESIntegTestCase { GetResponse getResponse = client().prepareGet("second_split", Integer.toString(i)).setRouting(routingValue[i]).get(); assertTrue(getResponse.isExists()); } - assertHitCount(client().prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); - assertHitCount(client().prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); - assertHitCount(client().prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); + assertHitCount(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs); if (useNested) { assertNested("source", numDocs); assertNested("first_split", numDocs); assertNested("second_split", numDocs); } - assertAllUniqueDocs( - client().prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), - numDocs - ); - assertAllUniqueDocs( - client().prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), - numDocs - ); - assertAllUniqueDocs(client().prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), numDocs); + assertAllUniqueDocs(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), numDocs); + assertAllUniqueDocs(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), numDocs); + assertAllUniqueDocs(prepareSearch("source").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")).get(), numDocs); } public void assertNested(String index, int numDocs) { // now, do a nested query - SearchResponse searchResponse = client().prepareSearch(index) - .setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) - .get(); + SearchResponse searchResponse = prepareSearch(index).setQuery( + nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) numDocs)); } @@ -410,21 +404,21 @@ public class SplitIndexIT extends ESIntegTestCase { } final int size = docs > 0 ? 2 * docs : 1; - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); if (createWithReplicas == false) { // bump replicas setReplicaCount(1, "target"); ensureGreen(); - assertHitCount(client().prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); } for (int i = docs; i < 2 * docs; i++) { client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); - assertHitCount(client().prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); - assertHitCount(client().prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); + assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); + assertHitCount(prepareSearch("source").setSize(size).setQuery(new TermsQueryBuilder("foo", "bar")), docs); GetSettingsResponse target = indicesAdmin().prepareGetSettings("target").get(); assertThat( target.getIndexToSettings().get("target").getAsVersionId("index.version.created", IndexVersion::fromId), diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java index 33fcaaea3985..18a8ae2dd280 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java @@ -136,7 +136,7 @@ public class BulkProcessor2RetryIT extends ESIntegTestCase { indicesAdmin().refresh(new RefreshRequest()).get(); - SearchResponse results = client().prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).setSize(0).get(); + SearchResponse results = prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).setSize(0).get(); assertThat(bulkProcessor.getTotalBytesInFlight(), equalTo(0L)); if (rejectedExecutionExpected) { assertThat((int) results.getHits().getTotalHits().value, lessThanOrEqualTo(numberOfAsyncOps)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java index 44b7040ba326..e664f6e6bb42 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java @@ -131,7 +131,7 @@ public class BulkProcessorRetryIT extends ESIntegTestCase { indicesAdmin().refresh(new RefreshRequest()).get(); - SearchResponse results = client().prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).setSize(0).get(); + SearchResponse results = prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchAllQuery()).setSize(0).get(); if (rejectedExecutionExpected) { assertThat((int) results.getHits().getTotalHits().value, lessThanOrEqualTo(numberOfAsyncOps)); 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 7009ba7858dd..0f1295951932 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java @@ -634,7 +634,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { .setRefreshPolicy(RefreshPolicy.IMMEDIATE); client().bulk(bulkRequest).get(); - assertHitCount(client().prepareSearch("bulkindex*"), 3); + assertHitCount(prepareSearch("bulkindex*"), 3); assertBusy(() -> assertAcked(indicesAdmin().prepareClose("bulkindex2"))); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java index f0c6359876aa..6ec01c3be562 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java @@ -42,7 +42,7 @@ public class WriteAckDelayIT extends ESIntegTestCase { for (int j = 0; j < numOfChecks; j++) { try { logger.debug("running search"); - SearchResponse response = client().prepareSearch("test").get(); + SearchResponse response = prepareSearch("test").get(); if (response.getHits().getTotalHits().value != numOfDocs) { final String message = "Count is " + response.getHits().getTotalHits().value diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java index 78fd60579d5d..7871a1426494 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java @@ -132,8 +132,7 @@ public class LookupRuntimeFieldIT extends ESIntegTestCase { } public void testBasic() { - SearchResponse searchResponse = client().prepareSearch("books") - .addFetchField("author") + SearchResponse searchResponse = prepareSearch("books").addFetchField("author") .addFetchField("title") .addSort("published_date", SortOrder.DESC) .setSize(3) @@ -169,18 +168,17 @@ public class LookupRuntimeFieldIT extends ESIntegTestCase { } public void testLookupMultipleIndices() throws IOException { - SearchResponse searchResponse = client().prepareSearch("books") - .setRuntimeMappings(parseMapping(""" - { - "publisher": { - "type": "lookup", - "target_index": "publishers", - "input_field": "publisher_id", - "target_field": "_id", - "fetch_fields": ["name", "city"] - } + SearchResponse searchResponse = prepareSearch("books").setRuntimeMappings(parseMapping(""" + { + "publisher": { + "type": "lookup", + "target_index": "publishers", + "input_field": "publisher_id", + "target_field": "_id", + "fetch_fields": ["name", "city"] } - """)) + } + """)) .setFetchSource(false) .addFetchField("title") .addFetchField("author") @@ -217,7 +215,7 @@ public class LookupRuntimeFieldIT extends ESIntegTestCase { } public void testFetchField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("books").setRuntimeMappings(parseMapping(""" + SearchResponse searchResponse = prepareSearch("books").setRuntimeMappings(parseMapping(""" { "author": { "type": "lookup", 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 09e0c064685a..2f8199297314 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java @@ -96,7 +96,7 @@ public class PointInTimeIT extends ESIntegTestCase { } refresh("test"); if (randomBoolean()) { - SearchResponse resp2 = client().prepareSearch("test").setPreference(null).setQuery(new MatchAllQueryBuilder()).get(); + SearchResponse resp2 = prepareSearch("test").setPreference(null).setQuery(new MatchAllQueryBuilder()).get(); assertNoFailures(resp2); assertHitCount(resp2, numDocs - deletedDocs); } @@ -259,7 +259,7 @@ public class PointInTimeIT extends ESIntegTestCase { assertHitCount(resp, index1 + index2); indicesAdmin().prepareDelete("index-1").get(); if (randomBoolean()) { - resp = client().prepareSearch("index-*").get(); + resp = prepareSearch("index-*").get(); assertNoFailures(resp); assertHitCount(resp, index2); } 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 e44a5a6a4818..1d320571864f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java @@ -310,12 +310,11 @@ public class TransportSearchIT extends ESIntegTestCase { Arrays.fill(validCheckpoints, SequenceNumbers.UNASSIGNED_SEQ_NO); // no exception - client().prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("testAlias", validCheckpoints)).get(); + prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("testAlias", validCheckpoints)).get(); IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("testFailedAlias") - .setWaitForCheckpoints(Collections.singletonMap("testFailedAlias", validCheckpoints)) + () -> prepareSearch("testFailedAlias").setWaitForCheckpoints(Collections.singletonMap("testFailedAlias", validCheckpoints)) .get() ); assertThat( @@ -328,7 +327,7 @@ public class TransportSearchIT extends ESIntegTestCase { IllegalArgumentException e2 = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("test1").setWaitForCheckpoints(Collections.singletonMap("test1", new long[2])).get() + () -> prepareSearch("test1").setWaitForCheckpoints(Collections.singletonMap("test1", new long[2])).get() ); assertThat( e2.getMessage(), @@ -342,7 +341,7 @@ public class TransportSearchIT extends ESIntegTestCase { IllegalArgumentException e3 = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("testAlias", new long[2])).get() + () -> prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("testAlias", new long[2])).get() ); assertThat( e3.getMessage(), @@ -356,7 +355,7 @@ public class TransportSearchIT extends ESIntegTestCase { IllegalArgumentException e4 = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("test2", validCheckpoints)).get() + () -> prepareSearch("testAlias").setWaitForCheckpoints(Collections.singletonMap("test2", validCheckpoints)).get() ); assertThat( e4.getMessage(), @@ -375,11 +374,11 @@ public class TransportSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test2").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numPrimaries2))); // no exception - client().prepareSearch("test1").get(); + prepareSearch("test1").get(); updateClusterSettings(Settings.builder().put(TransportSearchAction.SHARD_COUNT_LIMIT_SETTING.getKey(), numPrimaries1 - 1)); - IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> client().prepareSearch("test1").get()); + IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> prepareSearch("test1").get()); assertThat( e.getMessage(), containsString("Trying to query " + numPrimaries1 + " shards, which is over the limit of " + (numPrimaries1 - 1)) @@ -388,7 +387,7 @@ public class TransportSearchIT extends ESIntegTestCase { updateClusterSettings(Settings.builder().put(TransportSearchAction.SHARD_COUNT_LIMIT_SETTING.getKey(), numPrimaries1)); // no exception - client().prepareSearch("test1").get(); + prepareSearch("test1").get(); e = expectThrows(IllegalArgumentException.class, () -> client().prepareSearch("test1", "test2").get()); assertThat( @@ -425,8 +424,7 @@ public class TransportSearchIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get(); client().prepareIndex("test").setId("3").setSource("created_date", "2020-01-03").get(); assertBusy(() -> { - SearchResponse resp = client().prepareSearch("test") - .setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) + SearchResponse resp = prepareSearch("test").setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) .setPreFilterShardSize(randomIntBetween(1, 3)) .get(); assertThat(resp.getHits().getTotalHits().value, equalTo(2L)); @@ -442,8 +440,7 @@ public class TransportSearchIT extends ESIntegTestCase { final CountDownLatch latch = new CountDownLatch(10); for (int i = 0; i < 10; i++) { int batchReduceSize = randomIntBetween(2, Math.max(numShards + 1, 3)); - SearchRequest request = client().prepareSearch("test") - .addAggregation(new TestAggregationBuilder("test")) + SearchRequest request = prepareSearch("test").addAggregation(new TestAggregationBuilder("test")) .setBatchedReduceSize(batchReduceSize) .request(); final int index = i; @@ -484,8 +481,7 @@ public class TransportSearchIT extends ESIntegTestCase { final CountDownLatch latch = new CountDownLatch(10); for (int i = 0; i < 10; i++) { int batchReduceSize = randomIntBetween(2, Math.max(numShards + 1, 3)); - SearchRequest request = client().prepareSearch("test") - .addAggregation(new TestAggregationBuilder("test")) + SearchRequest request = prepareSearch("test").addAggregation(new TestAggregationBuilder("test")) .setBatchedReduceSize(batchReduceSize) .request(); final int index = i; @@ -522,8 +518,7 @@ public class TransportSearchIT extends ESIntegTestCase { final CountDownLatch latch = new CountDownLatch(10); for (int i = 0; i < 10; i++) { int batchReduceSize = randomIntBetween(2, Math.max(numShards + 1, 3)); - SearchRequest request = client().prepareSearch("boom") - .setBatchedReduceSize(batchReduceSize) + SearchRequest request = prepareSearch("boom").setBatchedReduceSize(batchReduceSize) .setAllowPartialSearchResults(false) .request(); final int index = i; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java index 9e50d57f5eb9..837c55e81b47 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/master/IndexingMasterFailoverIT.java @@ -97,7 +97,7 @@ public class IndexingMasterFailoverIT extends ESIntegTestCase { ensureGreen("myindex"); refresh(); - assertThat(client().prepareSearch("myindex").get().getHits().getTotalHits().value, equalTo(10L)); + assertThat(prepareSearch("myindex").get().getHits().getTotalHits().value, equalTo(10L)); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java index 9aa78f44881e..978b9dda888f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java @@ -269,23 +269,22 @@ public class IndexAliasesIT extends ESIntegTestCase { ).actionGet(); logger.info("--> checking single filtering alias search"); - SearchResponse searchResponse = client().prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()).get(); + SearchResponse searchResponse = prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1"); logger.info("--> checking single filtering alias wildcard search"); - searchResponse = client().prepareSearch("fo*").setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("fo*").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1"); - searchResponse = client().prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1", "2", "3"); logger.info("--> checking single filtering alias search with sort"); - searchResponse = client().prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).addSort("_index", SortOrder.ASC).get(); + searchResponse = prepareSearch("tests").setQuery(QueryBuilders.matchAllQuery()).addSort("_index", SortOrder.ASC).get(); assertHits(searchResponse.getHits(), "1", "2", "3"); logger.info("--> checking single filtering alias search with global facets"); - searchResponse = client().prepareSearch("tests") - .setQuery(QueryBuilders.matchQuery("name", "bar")) + searchResponse = prepareSearch("tests").setQuery(QueryBuilders.matchQuery("name", "bar")) .addAggregation(AggregationBuilders.global("global").subAggregation(AggregationBuilders.terms("test").field("name"))) .get(); assertNoFailures(searchResponse); @@ -294,8 +293,7 @@ public class IndexAliasesIT extends ESIntegTestCase { assertThat(terms.getBuckets().size(), equalTo(4)); logger.info("--> checking single filtering alias search with global facets and sort"); - searchResponse = client().prepareSearch("tests") - .setQuery(QueryBuilders.matchQuery("name", "bar")) + searchResponse = prepareSearch("tests").setQuery(QueryBuilders.matchQuery("name", "bar")) .addAggregation(AggregationBuilders.global("global").subAggregation(AggregationBuilders.terms("test").field("name"))) .addSort("_index", SortOrder.ASC) .get(); @@ -305,8 +303,7 @@ public class IndexAliasesIT extends ESIntegTestCase { assertThat(terms.getBuckets().size(), equalTo(4)); logger.info("--> checking single filtering alias search with non-global facets"); - searchResponse = client().prepareSearch("tests") - .setQuery(QueryBuilders.matchQuery("name", "bar")) + searchResponse = prepareSearch("tests").setQuery(QueryBuilders.matchQuery("name", "bar")) .addAggregation(AggregationBuilders.terms("test").field("name")) .addSort("_index", SortOrder.ASC) .get(); @@ -318,7 +315,7 @@ public class IndexAliasesIT extends ESIntegTestCase { assertHits(searchResponse.getHits(), "1", "2"); logger.info("--> checking single non-filtering alias search"); - searchResponse = client().prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1", "2", "3", "4"); logger.info("--> checking non-filtering alias and filtering alias search"); @@ -376,18 +373,18 @@ public class IndexAliasesIT extends ESIntegTestCase { refresh(); logger.info("--> checking filtering alias for two indices"); - SearchResponse searchResponse = client().prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()).get(); + SearchResponse searchResponse = prepareSearch("foos").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1", "5"); assertThat( - client().prepareSearch("foos").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, + prepareSearch("foos").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(2L) ); logger.info("--> checking filtering alias for one index"); - searchResponse = client().prepareSearch("bars").setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("bars").setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "2"); assertThat( - client().prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, + prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L) ); @@ -614,7 +611,7 @@ public class IndexAliasesIT extends ESIntegTestCase { logger.info("--> checking counts before delete"); assertThat( - client().prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, + prepareSearch("bars").setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(1L) ); } @@ -1141,8 +1138,8 @@ public class IndexAliasesIT extends ESIntegTestCase { client().prepareIndex("my-index").setSource("timestamp", "2016-12-12").get(); if (i % 2 == 0) { refresh(); - assertHitCount(client().prepareSearch("filter1"), i); - assertHitCount(client().prepareSearch("filter2"), i); + assertHitCount(prepareSearch("filter1"), i); + assertHitCount(prepareSearch("filter2"), i); } } } @@ -1239,7 +1236,7 @@ public class IndexAliasesIT extends ESIntegTestCase { "test_2", () -> assertAcked(indicesAdmin().prepareAliases().addAlias("test_2", "test").removeIndex("test")) ); - assertHitCount(client().prepareSearch("test"), 1); + assertHitCount(prepareSearch("test"), 1); } public void testHiddenAliasesMustBeConsistent() { @@ -1331,22 +1328,21 @@ public class IndexAliasesIT extends ESIntegTestCase { refresh(writeIndex, nonWriteIndex); // Make sure that the doc written to the alias made it - SearchResponse searchResponse = client().prepareSearch(writeIndex).setQuery(QueryBuilders.matchAllQuery()).get(); + SearchResponse searchResponse = prepareSearch(writeIndex).setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "2", "3"); // Ensure that all docs can be gotten through the alias - searchResponse = client().prepareSearch(alias).setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch(alias).setQuery(QueryBuilders.matchAllQuery()).get(); assertHits(searchResponse.getHits(), "1", "2", "3"); // And querying using a wildcard with indices options set to expand hidden - searchResponse = client().prepareSearch("alias*") - .setQuery(QueryBuilders.matchAllQuery()) + searchResponse = prepareSearch("alias*").setQuery(QueryBuilders.matchAllQuery()) .setIndicesOptions(IndicesOptions.fromOptions(false, false, true, false, true, true, true, false, false)) .get(); assertHits(searchResponse.getHits(), "1", "2", "3"); // And that querying the alias with a wildcard and no expand options fails - searchResponse = client().prepareSearch("alias*").setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("alias*").setQuery(QueryBuilders.matchAllQuery()).get(); assertThat(searchResponse.getHits().getHits(), emptyArray()); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java index 91253b57f852..9b78bb9369fd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java @@ -265,7 +265,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { } indicesAdmin().prepareRefresh(indexName).get(); - assertHitCount(client().prepareSearch(indexName).setSize(0), nbDocs); + assertHitCount(prepareSearch(indexName).setSize(0), nbDocs); } public void testSameBlockTwice() throws Exception { @@ -390,7 +390,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { disableIndexBlock(indexName, block); } refresh(indexName); - assertHitCount(client().prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), nbDocs); + assertHitCount(prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), nbDocs); } public void testAddBlockWhileDeletingIndices() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/broadcast/BroadcastActionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/broadcast/BroadcastActionsIT.java index 1542c2880683..5e8e6c634fa4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/broadcast/BroadcastActionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/broadcast/BroadcastActionsIT.java @@ -42,7 +42,7 @@ public class BroadcastActionsIT extends ESIntegTestCase { // check count for (int i = 0; i < 5; i++) { // test successful - SearchResponse countResponse = client().prepareSearch("test").setSize(0).setQuery(matchAllQuery()).get(); + SearchResponse countResponse = prepareSearch("test").setSize(0).setQuery(matchAllQuery()).get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(countResponse.getTotalShards(), equalTo(numShards.numPrimaries)); assertThat(countResponse.getSuccessfulShards(), equalTo(numShards.numPrimaries)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java index df6e6dada393..3a2c6b5ebd0f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java @@ -213,7 +213,7 @@ public class RareClusterStateIT extends ESIntegTestCase { long dataClusterStateVersion = internalCluster().clusterService(dataNode).state().version(); assertThat(masterClusterStateVersion, equalTo(dataClusterStateVersion)); }); - assertHitCount(client().prepareSearch("test"), 0); + assertHitCount(prepareSearch("test"), 0); } public void testDelayedMappingPropagationOnPrimary() throws Exception { 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 0bcf49bdd2ae..0f42b5999920 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java @@ -498,7 +498,7 @@ public class ShardRoutingRoleIT extends ESIntegTestCase { } // Regular search for (int i = 0; i < 10; i++) { - final var search = client().prepareSearch(INDEX_NAME).setProfile(true); + final var search = prepareSearch(INDEX_NAME).setProfile(true); switch (randomIntBetween(0, 2)) { case 0 -> search.setRouting(randomAlphaOfLength(10)); case 1 -> search.setPreference(randomSearchPreference(routingTableWatcher.numShards, internalCluster().getNodeNames())); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java index 8b4a82cc36c2..965674b77299 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java @@ -195,7 +195,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase { } client().prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); - assertSearchHits(client().prepareSearch("test"), "1"); + assertSearchHits(prepareSearch("test"), "1"); // Move all nodes above the low watermark so no shard movement can occur, and at least one node above the flood stage watermark so // the index is blocked @@ -221,7 +221,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase { client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK ); - assertSearchHits(client().prepareSearch("test"), "1"); + assertSearchHits(prepareSearch("test"), "1"); logger.info("--> index is confirmed read-only, releasing disk space"); @@ -240,7 +240,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase { throw new AssertionError("retrying", e); } }); - assertSearchHits(client().prepareSearch("test"), "1", "3"); + assertSearchHits(prepareSearch("test"), "1", "3"); } public void testOnlyMovesEnoughShardsToDropBelowHighWatermark() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java index 828ae839cdd7..42bc0f19bf75 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java @@ -154,14 +154,14 @@ public class DocumentActionsIT extends ESIntegTestCase { // check count for (int i = 0; i < 5; i++) { // test successful - SearchResponse countResponse = client().prepareSearch("test").setSize(0).setQuery(matchAllQuery()).execute().actionGet(); + SearchResponse countResponse = prepareSearch("test").setSize(0).setQuery(matchAllQuery()).execute().actionGet(); assertNoFailures(countResponse); assertThat(countResponse.getHits().getTotalHits().value, equalTo(2L)); assertThat(countResponse.getSuccessfulShards(), equalTo(numShards.numPrimaries)); assertThat(countResponse.getFailedShards(), equalTo(0)); // count with no query is a match all one - countResponse = client().prepareSearch("test").setSize(0).execute().actionGet(); + countResponse = prepareSearch("test").setSize(0).execute().actionGet(); assertThat( "Failures " + countResponse.getShardFailures(), countResponse.getShardFailures() == null ? 0 : countResponse.getShardFailures().length, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java index ffa6799601b1..ab4706c865be 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java @@ -139,7 +139,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); assertEquals(RestStatus.CREATED, indexResponse.status()); - SearchResponse target = client().prepareSearch("target").get(); + SearchResponse target = prepareSearch("target").get(); assertEquals(1, target.getHits().getTotalHits().value); assertFalse(target.getHits().getAt(0).getSourceAsMap().containsKey("final")); } @@ -165,7 +165,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); assertEquals(RestStatus.CREATED, indexResponse.status()); - SearchResponse target = client().prepareSearch("target").get(); + SearchResponse target = prepareSearch("target").get(); assertEquals(1, target.getHits().getTotalHits().value); assertEquals(true, target.getHits().getAt(0).getSourceAsMap().get("final")); } @@ -191,7 +191,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); assertEquals(RestStatus.CREATED, indexResponse.status()); - SearchResponse target = client().prepareSearch("target").get(); + SearchResponse target = prepareSearch("target").get(); assertEquals(1, target.getHits().getTotalHits().value); assertFalse(target.getHits().getAt(0).getSourceAsMap().containsKey("final")); } @@ -217,7 +217,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); assertEquals(RestStatus.CREATED, indexResponse.status()); - SearchResponse target = client().prepareSearch("target").get(); + SearchResponse target = prepareSearch("target").get(); assertEquals(1, target.getHits().getTotalHits().value); assertTrue(target.getHits().getAt(0).getSourceAsMap().containsKey("final")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java index ae1b68913460..63e5c7acc67b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java @@ -40,21 +40,19 @@ public class HiddenIndexIT extends ESIntegTestCase { client().prepareIndex("hidden-index").setSource("foo", "bar").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); // default not visible to wildcard expansion - SearchResponse searchResponse = client().prepareSearch(randomFrom("*", "_all", "h*", "*index")) - .setSize(1000) + SearchResponse searchResponse = prepareSearch(randomFrom("*", "_all", "h*", "*index")).setSize(1000) .setQuery(QueryBuilders.matchAllQuery()) .get(); boolean matchedHidden = Arrays.stream(searchResponse.getHits().getHits()).anyMatch(hit -> "hidden-index".equals(hit.getIndex())); assertFalse(matchedHidden); // direct access allowed - searchResponse = client().prepareSearch("hidden-index").setSize(1000).setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch("hidden-index").setSize(1000).setQuery(QueryBuilders.matchAllQuery()).get(); matchedHidden = Arrays.stream(searchResponse.getHits().getHits()).anyMatch(hit -> "hidden-index".equals(hit.getIndex())); assertTrue(matchedHidden); // with indices option to include hidden - searchResponse = client().prepareSearch(randomFrom("*", "_all", "h*", "*index")) - .setSize(1000) + searchResponse = prepareSearch(randomFrom("*", "_all", "h*", "*index")).setSize(1000) .setQuery(QueryBuilders.matchAllQuery()) .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_HIDDEN) .get(); @@ -64,16 +62,13 @@ public class HiddenIndexIT extends ESIntegTestCase { // implicit based on use of pattern starting with . and a wildcard assertAcked(indicesAdmin().prepareCreate(".hidden-index").setSettings(Settings.builder().put("index.hidden", true).build()).get()); client().prepareIndex(".hidden-index").setSource("foo", "bar").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); - searchResponse = client().prepareSearch(randomFrom(".*", ".hidden-*")).setSize(1000).setQuery(QueryBuilders.matchAllQuery()).get(); + searchResponse = prepareSearch(randomFrom(".*", ".hidden-*")).setSize(1000).setQuery(QueryBuilders.matchAllQuery()).get(); matchedHidden = Arrays.stream(searchResponse.getHits().getHits()).anyMatch(hit -> ".hidden-index".equals(hit.getIndex())); assertTrue(matchedHidden); // make index not hidden updateIndexSettings(Settings.builder().put("index.hidden", false), "hidden-index"); - searchResponse = client().prepareSearch(randomFrom("*", "_all", "h*", "*index")) - .setSize(1000) - .setQuery(QueryBuilders.matchAllQuery()) - .get(); + searchResponse = prepareSearch(randomFrom("*", "_all", "h*", "*index")).setSize(1000).setQuery(QueryBuilders.matchAllQuery()).get(); matchedHidden = Arrays.stream(searchResponse.getHits().getHits()).anyMatch(hit -> "hidden-index".equals(hit.getIndex())); assertTrue(matchedHidden); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java index b69bb7b42fa1..31368a3cfb8f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java @@ -37,7 +37,7 @@ public class IndexRequestBuilderIT extends ESIntegTestCase { client().prepareIndex("test").setSource(map) }; indexRandom(true, builders); ElasticsearchAssertions.assertHitCount( - client().prepareSearch("test").setQuery(QueryBuilders.termQuery("test_field", "foobar")), + prepareSearch("test").setQuery(QueryBuilders.termQuery("test_field", "foobar")), builders.length ); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java index 09290f40d6c2..ec03a740f8ad 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java @@ -63,25 +63,25 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { .get(); assertEquals(RestStatus.CREATED, index.status()); assertFalse("request shouldn't have forced a refresh", index.forcedRefresh()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); } public void testDelete() throws InterruptedException, ExecutionException { // Index normally indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "bar")); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); // Now delete with blockUntilRefresh DeleteResponse delete = client().prepareDelete("test", "1").setRefreshPolicy(RefreshPolicy.WAIT_UNTIL).get(); assertEquals(DocWriteResponse.Result.DELETED, delete.getResult()); assertFalse("request shouldn't have forced a refresh", delete.forcedRefresh()); - assertNoSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar"))); + assertNoSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar"))); } public void testUpdate() throws InterruptedException, ExecutionException { // Index normally indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "bar")); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); // Update with RefreshPolicy.WAIT_UNTIL UpdateResponse update = client().prepareUpdate("test", "1") @@ -90,7 +90,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { .get(); assertEquals(2, update.getVersion()); assertFalse("request shouldn't have forced a refresh", update.forcedRefresh()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "baz")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "baz")), "1"); // Upsert with RefreshPolicy.WAIT_UNTIL update = client().prepareUpdate("test", "2") @@ -100,7 +100,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { .get(); assertEquals(1, update.getVersion()); assertFalse("request shouldn't have forced a refresh", update.forcedRefresh()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "cat")), "2"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "cat")), "2"); // Update-becomes-delete with RefreshPolicy.WAIT_UNTIL update = client().prepareUpdate("test", "2") @@ -109,7 +109,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { .get(); assertEquals(2, update.getVersion()); assertFalse("request shouldn't have forced a refresh", update.forcedRefresh()); - assertNoSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "cat"))); + assertNoSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "cat"))); } public void testBulk() { @@ -117,19 +117,19 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { BulkRequestBuilder bulk = client().prepareBulk().setRefreshPolicy(RefreshPolicy.WAIT_UNTIL); bulk.add(client().prepareIndex("test").setId("1").setSource("foo", "bar")); assertBulkSuccess(bulk.get()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); // Update by bulk with RefreshPolicy.WAIT_UNTIL bulk = client().prepareBulk().setRefreshPolicy(RefreshPolicy.WAIT_UNTIL); bulk.add(client().prepareUpdate("test", "1").setDoc(Requests.INDEX_CONTENT_TYPE, "foo", "baz")); assertBulkSuccess(bulk.get()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "baz")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "baz")), "1"); // Delete by bulk with RefreshPolicy.WAIT_UNTIL bulk = client().prepareBulk().setRefreshPolicy(RefreshPolicy.WAIT_UNTIL); bulk.add(client().prepareDelete("test", "1")); assertBulkSuccess(bulk.get()); - assertNoSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar"))); + assertNoSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar"))); // Update makes a noop bulk = client().prepareBulk().setRefreshPolicy(RefreshPolicy.WAIT_UNTIL); @@ -153,7 +153,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { } assertEquals(RestStatus.CREATED, index.get().status()); assertFalse("request shouldn't have forced a refresh", index.get().forcedRefresh()); - assertSearchHits(client().prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); + assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); } private void assertBulkSuccess(BulkResponse response) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java index 56e1598bd7a1..f297b61e7087 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java @@ -108,8 +108,7 @@ public class MaxDocsLimitIT extends ESIntegTestCase { ); assertThat(deleteError.getMessage(), containsString("Number of documents in the index can't exceed [" + maxDocs.get() + "]")); indicesAdmin().prepareRefresh("test").get(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(new MatchAllQueryBuilder()) + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchAllQueryBuilder()) .setTrackTotalHitsUpTo(Integer.MAX_VALUE) .setSize(0) .get(); @@ -121,8 +120,7 @@ public class MaxDocsLimitIT extends ESIntegTestCase { internalCluster().fullRestart(); internalCluster().ensureAtLeastNumDataNodes(2); ensureGreen("test"); - searchResponse = client().prepareSearch("test") - .setQuery(new MatchAllQueryBuilder()) + searchResponse = prepareSearch("test").setQuery(new MatchAllQueryBuilder()) .setTrackTotalHitsUpTo(Integer.MAX_VALUE) .setSize(0) .get(); @@ -137,8 +135,7 @@ public class MaxDocsLimitIT extends ESIntegTestCase { assertThat(indexingResult.numFailures, greaterThan(0)); assertThat(indexingResult.numSuccess, both(greaterThan(0)).and(lessThanOrEqualTo(maxDocs.get()))); indicesAdmin().prepareRefresh("test").get(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(new MatchAllQueryBuilder()) + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchAllQueryBuilder()) .setTrackTotalHitsUpTo(Integer.MAX_VALUE) .setSize(0) .get(); @@ -155,8 +152,7 @@ public class MaxDocsLimitIT extends ESIntegTestCase { assertThat(indexingResult.numSuccess, equalTo(0)); } indicesAdmin().prepareRefresh("test").get(); - searchResponse = client().prepareSearch("test") - .setQuery(new MatchAllQueryBuilder()) + searchResponse = prepareSearch("test").setQuery(new MatchAllQueryBuilder()) .setTrackTotalHitsUpTo(Integer.MAX_VALUE) .setSize(0) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java index c6055a295eab..7a93c315a84b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java @@ -37,8 +37,7 @@ public class CopyToMapperIntegrationIT extends ESIntegTestCase { SubAggCollectionMode aggCollectionMode = randomFrom(SubAggCollectionMode.values()); - SearchResponse response = client().prepareSearch("test-idx") - .setQuery(QueryBuilders.termQuery("even", true)) + SearchResponse response = prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("even", true)) .addAggregation(AggregationBuilders.terms("test").field("test_field").size(recordCount * 2).collectMode(aggCollectionMode)) .addAggregation( AggregationBuilders.terms("test_raw").field("test_field_raw").size(recordCount * 2).collectMode(aggCollectionMode) @@ -67,7 +66,7 @@ public class CopyToMapperIntegrationIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test-idx").setMapping(mapping)); client().prepareIndex("test-idx").setId("1").setSource("foo", "bar").get(); indicesAdmin().prepareRefresh("test-idx").execute().actionGet(); - SearchResponse response = client().prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("root.top.child", "bar")).get(); + SearchResponse response = prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("root.top.child", "bar")).get(); assertThat(response.getHits().getTotalHits().value, equalTo(1L)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java index be2cd1eeb358..5760b8bebf7c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java @@ -372,15 +372,17 @@ public class DynamicMappingIT extends ESIntegTestCase { assertFalse(bulkResponse.hasFailures()); assertSearchHits( - client().prepareSearch("test") - .setQuery(new GeoBoundingBoxQueryBuilder("location").setCorners(new GeoPoint(42, -72), new GeoPoint(40, -74))), + prepareSearch("test").setQuery( + new GeoBoundingBoxQueryBuilder("location").setCorners(new GeoPoint(42, -72), new GeoPoint(40, -74)) + ), "1", "2", "4" ); assertSearchHits( - client().prepareSearch("test") - .setQuery(new GeoBoundingBoxQueryBuilder("address.location").setCorners(new GeoPoint(42, -72), new GeoPoint(40, -74))), + prepareSearch("test").setQuery( + new GeoBoundingBoxQueryBuilder("address.location").setCorners(new GeoPoint(42, -72), new GeoPoint(40, -74)) + ), "3" ); } @@ -460,15 +462,15 @@ public class DynamicMappingIT extends ESIntegTestCase { assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures()); { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } } @@ -508,21 +510,19 @@ public class DynamicMappingIT extends ESIntegTestCase { assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures()); { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } @@ -569,9 +569,7 @@ public class DynamicMappingIT extends ESIntegTestCase { ); { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(new MatchQueryBuilder("obj.runtime.dynamic.number", 1)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.dynamic.number", 1)).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java index d6eeee220658..64a4f8d30e60 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java @@ -47,9 +47,9 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); - SearchResponse searchResponse = client().prepareSearch("my-index").setQuery(matchQuery("title", "multi")).get(); + SearchResponse searchResponse = prepareSearch("my-index").setQuery(matchQuery("title", "multi")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("my-index").setQuery(matchQuery("title.not_analyzed", "Multi fields")).get(); + searchResponse = prepareSearch("my-index").setQuery(matchQuery("title.not_analyzed", "Multi fields")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertAcked(indicesAdmin().preparePutMapping("my-index").setSource(createPutMappingSource())); @@ -68,7 +68,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); - searchResponse = client().prepareSearch("my-index").setQuery(matchQuery("title.uncased", "Multi")).get(); + searchResponse = prepareSearch("my-index").setQuery(matchQuery("title.uncased", "Multi")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); } @@ -92,12 +92,11 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { GeoPoint point = new GeoPoint(51, 19); client().prepareIndex("my-index").setId("1").setSource("a", point.toString()).setRefreshPolicy(IMMEDIATE).get(); - SearchResponse countResponse = client().prepareSearch("my-index") - .setSize(0) + SearchResponse countResponse = prepareSearch("my-index").setSize(0) .setQuery(constantScoreQuery(geoDistanceQuery("a").point(51, 19).distance(50, DistanceUnit.KILOMETERS))) .get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(1L)); - countResponse = client().prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", point.geohash())).get(); + countResponse = prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", point.geohash())).get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(1L)); } @@ -119,7 +118,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(bField.get("type").toString(), equalTo("keyword")); client().prepareIndex("my-index").setId("1").setSource("a", "complete me").setRefreshPolicy(IMMEDIATE).get(); - SearchResponse countResponse = client().prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", "complete me")).get(); + SearchResponse countResponse = prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", "complete me")).get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(1L)); } @@ -141,7 +140,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(bField.get("type").toString(), equalTo("keyword")); client().prepareIndex("my-index").setId("1").setSource("a", "127.0.0.1").setRefreshPolicy(IMMEDIATE).get(); - SearchResponse countResponse = client().prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", "127.0.0.1")).get(); + SearchResponse countResponse = prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", "127.0.0.1")).get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(1L)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java index 5526343619e1..bb20ddd321d7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java @@ -42,10 +42,10 @@ public class CustomQueryParserIT extends ESIntegTestCase { } public void testCustomDummyQuery() { - assertHitCount(client().prepareSearch("index").setQuery(new DummyQueryBuilder()), 1L); + assertHitCount(prepareSearch("index").setQuery(new DummyQueryBuilder()), 1L); } public void testCustomDummyQueryWithinBooleanQuery() { - assertHitCount(client().prepareSearch("index").setQuery(new BoolQueryBuilder().must(new DummyQueryBuilder())), 1L); + assertHitCount(prepareSearch("index").setQuery(new BoolQueryBuilder().must(new DummyQueryBuilder())), 1L); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java index 369e6cef2897..7751d5e7783b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java @@ -47,10 +47,10 @@ public class MatchPhraseQueryIT extends ESIntegTestCase { MatchPhraseQueryBuilder baseQuery = matchPhraseQuery("name", "the who").analyzer("standard_stopwords"); MatchPhraseQueryBuilder matchNoneQuery = baseQuery.zeroTermsQuery(ZeroTermsQueryOption.NONE); - assertHitCount(client().prepareSearch(INDEX).setQuery(matchNoneQuery), 0L); + assertHitCount(prepareSearch(INDEX).setQuery(matchNoneQuery), 0L); MatchPhraseQueryBuilder matchAllQuery = baseQuery.zeroTermsQuery(ZeroTermsQueryOption.ALL); - assertHitCount(client().prepareSearch(INDEX).setQuery(matchAllQuery), 2L); + assertHitCount(prepareSearch(INDEX).setQuery(matchAllQuery), 2L); } private List getIndexRequests() { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java index 345f2a82d82c..d57cbe50074a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java @@ -255,7 +255,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { ensureGreen(indexName); - assertHitCount(client().prepareSearch(indexName).setQuery(matchAllQuery()), expectedNumDocs); + assertHitCount(prepareSearch(indexName).setQuery(matchAllQuery()), expectedNumDocs); } public void testCorruptTranslogTruncation() throws Exception { @@ -424,13 +424,13 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { ensureYellow(indexName); // Run a search and make sure it succeeds - assertHitCount(client().prepareSearch(indexName).setQuery(matchAllQuery()), numDocsToKeep); + assertHitCount(prepareSearch(indexName).setQuery(matchAllQuery()), numDocsToKeep); logger.info("--> starting the replica node to test recovery"); internalCluster().startNode(node2PathSettings); ensureGreen(indexName); for (String node : internalCluster().nodesInclude(indexName)) { - SearchRequestBuilder q = client().prepareSearch(indexName).setPreference("_only_nodes:" + node).setQuery(matchAllQuery()); + SearchRequestBuilder q = prepareSearch(indexName).setPreference("_only_nodes:" + node).setQuery(matchAllQuery()); assertHitCount(q, numDocsToKeep); } final RecoveryResponse recoveryResponse = indicesAdmin().prepareRecoveries(indexName).setActiveOnly(false).get(); @@ -513,7 +513,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { ensureYellow(); // Run a search and make sure it succeeds - assertHitCount(client().prepareSearch(indexName).setQuery(matchAllQuery()), totalDocs); + assertHitCount(prepareSearch(indexName).setQuery(matchAllQuery()), totalDocs); // check replica corruption final RemoveCorruptedShardDataCommand command = new RemoveCorruptedShardDataCommand(); @@ -534,7 +534,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { internalCluster().startNode(node2PathSettings); ensureGreen(indexName); for (String node : internalCluster().nodesInclude(indexName)) { - assertHitCount(client().prepareSearch(indexName).setPreference("_only_nodes:" + node).setQuery(matchAllQuery()), totalDocs); + assertHitCount(prepareSearch(indexName).setPreference("_only_nodes:" + node).setQuery(matchAllQuery()), totalDocs); } final RecoveryResponse recoveryResponse = indicesAdmin().prepareRecoveries(indexName).setActiveOnly(false).get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java index 8731c319043a..b8ecbc2e750a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java @@ -97,8 +97,7 @@ public class CorruptedTranslogIT extends ESIntegTestCase { }); assertThat( - expectThrows(SearchPhaseExecutionException.class, () -> client().prepareSearch("test").setQuery(matchAllQuery()).get()) - .getMessage(), + expectThrows(SearchPhaseExecutionException.class, () -> prepareSearch("test").setQuery(matchAllQuery()).get()).getMessage(), containsString("all shards failed") ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/ExceptionRetryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/ExceptionRetryIT.java index b1b3a6850c06..2ea5be52cb51 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/ExceptionRetryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/ExceptionRetryIT.java @@ -107,7 +107,7 @@ public class ExceptionRetryIT extends ESIntegTestCase { } refresh(); - SearchResponse searchResponse = client().prepareSearch("index").setSize(numDocs * 2).addStoredField("_id").get(); + SearchResponse searchResponse = prepareSearch("index").setSize(numDocs * 2).addStoredField("_id").get(); Set uniqueIds = new HashSet<>(); long dupCounter = 0; @@ -115,10 +115,9 @@ public class ExceptionRetryIT extends ESIntegTestCase { for (int i = 0; i < searchResponse.getHits().getHits().length; i++) { if (uniqueIds.add(searchResponse.getHits().getHits()[i].getId()) == false) { if (found_duplicate_already == false) { - SearchResponse dupIdResponse = client().prepareSearch("index") - .setQuery(termQuery("_id", searchResponse.getHits().getHits()[i].getId())) - .setExplain(true) - .get(); + SearchResponse dupIdResponse = prepareSearch("index").setQuery( + termQuery("_id", searchResponse.getHits().getHits()[i].getId()) + ).setExplain(true).get(); assertThat(dupIdResponse.getHits().getTotalHits().value, greaterThan(1L)); logger.info("found a duplicate id:"); for (SearchHit hit : dupIdResponse.getHits()) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java index 6c1b9a56f04c..e3c66f3dabfd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java @@ -55,7 +55,7 @@ public class IndexActionIT extends ESIntegTestCase { for (int j = 0; j < numOfChecks; j++) { try { logger.debug("running search with all types"); - SearchResponse response = client().prepareSearch("test").get(); + SearchResponse response = prepareSearch("test").get(); if (response.getHits().getTotalHits().value != numOfDocs) { final String message = "Count is " + response.getHits().getTotalHits().value @@ -74,7 +74,7 @@ public class IndexActionIT extends ESIntegTestCase { } try { logger.debug("running search with a specific type"); - SearchResponse response = client().prepareSearch("test").get(); + SearchResponse response = prepareSearch("test").get(); if (response.getHits().getTotalHits().value != numOfDocs) { final String message = "Count is " + response.getHits().getTotalHits().value diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java index 9f5138a1a0d3..e46564314326 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java @@ -395,7 +395,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { public void testAllMissingLenient() throws Exception { createIndex("test1"); client().prepareIndex("test1").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get(); - assertHitCount(client().prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 0L); + assertHitCount(prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 0L); assertHitCount( client().prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen()), 0L @@ -406,7 +406,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { public void testAllMissingStrict() throws Exception { createIndex("test1"); - expectThrows(IndexNotFoundException.class, () -> client().prepareSearch("test2").setQuery(matchAllQuery()).execute().actionGet()); + expectThrows(IndexNotFoundException.class, () -> prepareSearch("test2").setQuery(matchAllQuery()).execute().actionGet()); expectThrows( IndexNotFoundException.class, @@ -606,7 +606,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { } static SearchRequestBuilder search(String... indices) { - return client().prepareSearch(indices).setQuery(matchAllQuery()); + return prepareSearch(indices).setQuery(matchAllQuery()); } static MultiSearchRequestBuilder msearch(IndicesOptions options, String... indices) { @@ -614,7 +614,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { if (options != null) { multiSearchRequestBuilder.setIndicesOptions(options); } - return multiSearchRequestBuilder.add(client().prepareSearch(indices).setQuery(matchAllQuery())); + return multiSearchRequestBuilder.add(prepareSearch(indices).setQuery(matchAllQuery())); } static ClearIndicesCacheRequestBuilder clearCache(String... indices) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java index ce38fed6a706..7541bce29fbe 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java @@ -77,8 +77,8 @@ public class ConcurrentDynamicTemplateIT extends ESIntegTestCase { latch.await(); assertThat(throwable, emptyIterable()); refresh(); - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery(fieldName, "test-user")), numDocs); - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.matchQuery(fieldName, "test user")), 0); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery(fieldName, "test-user")), numDocs); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery(fieldName, "test user")), 0); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java index ce916541dfaa..c3f7fbd86f1b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java @@ -60,7 +60,7 @@ public class MalformedDynamicTemplateIT extends ESIntegTestCase { ); client().prepareIndex(indexName).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); assertNoFailures((indicesAdmin().prepareRefresh(indexName)).get()); - assertHitCount(client().prepareSearch(indexName), 1); + assertHitCount(prepareSearch(indexName), 1); MapperParsingException ex = expectThrows( MapperParsingException.class, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java index 5e1e81945c17..0eca3d689903 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java @@ -86,7 +86,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase { logger.info("checking all the documents are there"); RefreshResponse refreshResponse = indicesAdmin().prepareRefresh().execute().actionGet(); assertThat(refreshResponse.getFailedShards(), equalTo(0)); - SearchResponse response = client().prepareSearch("test").setSize(0).execute().actionGet(); + SearchResponse response = prepareSearch("test").setSize(0).execute().actionGet(); assertThat(response.getHits().getTotalHits().value, equalTo((long) recCount)); logger.info("checking all the fields are in the mappings"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java index f82ea1d89339..cdd77d5864a7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java @@ -105,10 +105,9 @@ public class IndexPrimaryRelocationIT extends ESIntegTestCase { finished.set(true); indexingThread.join(); refresh("test"); - ElasticsearchAssertions.assertHitCount(client().prepareSearch("test").setTrackTotalHits(true), numAutoGenDocs.get()); + ElasticsearchAssertions.assertHitCount(prepareSearch("test").setTrackTotalHits(true), numAutoGenDocs.get()); ElasticsearchAssertions.assertHitCount( - client().prepareSearch("test") - .setTrackTotalHits(true)// extra paranoia ;) + prepareSearch("test").setTrackTotalHits(true)// extra paranoia ;) .setQuery(QueryBuilders.termQuery("auto", true)), numAutoGenDocs.get() ); 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 e44db1d86619..7ab3cecb95d8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java @@ -394,7 +394,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { } refresh(INDEX_NAME); - assertHitCount(client().prepareSearch(INDEX_NAME).setSize(0), numOfDocs); + assertHitCount(prepareSearch(INDEX_NAME).setSize(0), numOfDocs); final boolean closedIndex = randomBoolean(); if (closedIndex) { @@ -439,7 +439,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { if (closedIndex) { assertAcked(indicesAdmin().prepareOpen(INDEX_NAME)); } - assertHitCount(client().prepareSearch(INDEX_NAME).setSize(0), numOfDocs); + assertHitCount(prepareSearch(INDEX_NAME).setSize(0), numOfDocs); } public void testCancelNewShardRecoveryAndUsesExistingShardCopy() throws Exception { @@ -925,7 +925,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { indexRandom(true, docs); flush(); - assertThat(client().prepareSearch(name).setSize(0).get().getHits().getTotalHits().value, equalTo((long) numDocs)); + assertThat(prepareSearch(name).setSize(0).get().getHits().getTotalHits().value, equalTo((long) numDocs)); return indicesAdmin().prepareStats(name).execute().actionGet(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java index 67b885e315ae..8595f11bae42 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/ReplicaToPrimaryPromotionIT.java @@ -43,7 +43,7 @@ public class ReplicaToPrimaryPromotionIT extends ESIntegTestCase { refresh(indexName); } - assertHitCount(client().prepareSearch(indexName).setSize(0), numOfDocs); + assertHitCount(prepareSearch(indexName).setSize(0), numOfDocs); ensureGreen(indexName); // sometimes test with a closed index @@ -76,6 +76,6 @@ public class ReplicaToPrimaryPromotionIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareOpen(indexName)); ensureYellowAndNoInitializingShards(indexName); } - assertHitCount(client().prepareSearch(indexName).setSize(0), numOfDocs); + assertHitCount(prepareSearch(indexName).setSize(0), numOfDocs); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java index fd9bfdd9e013..91425067bd81 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java @@ -132,7 +132,7 @@ public class CloseIndexIT extends ESIntegTestCase { assertIndexIsClosed(indexName); assertAcked(indicesAdmin().prepareOpen(indexName)); - assertHitCount(client().prepareSearch(indexName).setSize(0), nbDocs); + assertHitCount(prepareSearch(indexName).setSize(0), nbDocs); } public void testCloseAlreadyClosedIndex() throws Exception { @@ -244,7 +244,7 @@ public class CloseIndexIT extends ESIntegTestCase { assertIndexIsClosed(indexName); assertAcked(indicesAdmin().prepareOpen(indexName)); - assertHitCount(client().prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), nbDocs); + assertHitCount(prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), nbDocs); } public void testCloseWhileDeletingIndices() throws Exception { @@ -348,10 +348,7 @@ public class CloseIndexIT extends ESIntegTestCase { } refresh(indexName); assertIndexIsOpened(indexName); - assertHitCount( - client().prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), - indexer.totalIndexedDocs() - ); + assertHitCount(prepareSearch(indexName).setSize(0).setTrackTotalHitsUpTo(TRACK_TOTAL_HITS_ACCURATE), indexer.totalIndexedDocs()); } public void testCloseIndexWaitForActiveShards() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java index b67098c8f37a..5fa512eafc45 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java @@ -246,7 +246,7 @@ public class CloseWhileRelocatingShardsIT extends ESIntegTestCase { ensureGreen(indices); for (String index : acknowledgedCloses) { - long docsCount = client().prepareSearch(index).setSize(0).setTrackTotalHits(true).get().getHits().getTotalHits().value; + long docsCount = prepareSearch(index).setSize(0).setTrackTotalHits(true).get().getHits().getTotalHits().value; assertEquals( "Expected " + docsPerIndex.get(index) 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 494d9c4b0a6f..d4d3596349b9 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java @@ -374,7 +374,7 @@ public class IndexStatsIT extends ESIntegTestCase { assertThat(indicesAdmin().prepareStats("idx").setRequestCache(true).get().getTotal().getRequestCache().getMissCount(), equalTo(0L)); for (int i = 0; i < 10; i++) { assertThat( - client().prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, equalTo((long) numDocs) ); assertThat( @@ -409,7 +409,7 @@ public class IndexStatsIT extends ESIntegTestCase { for (int i = 0; i < 10; i++) { assertThat( - client().prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, equalTo((long) numDocs) ); assertThat( @@ -427,8 +427,7 @@ public class IndexStatsIT extends ESIntegTestCase { // test explicit request parameter assertThat( - client().prepareSearch("idx") - .setSearchType(SearchType.QUERY_THEN_FETCH) + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH) .setSize(0) .setRequestCache(false) .get() @@ -442,8 +441,7 @@ public class IndexStatsIT extends ESIntegTestCase { ); assertThat( - client().prepareSearch("idx") - .setSearchType(SearchType.QUERY_THEN_FETCH) + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH) .setSize(0) .setRequestCache(true) .get() @@ -462,7 +460,7 @@ public class IndexStatsIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), false), "idx"); assertThat( - client().prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setSize(0).get().getHits().getTotalHits().value, equalTo((long) numDocs) ); assertThat( @@ -471,8 +469,7 @@ public class IndexStatsIT extends ESIntegTestCase { ); assertThat( - client().prepareSearch("idx") - .setSearchType(SearchType.QUERY_THEN_FETCH) + prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH) .setSize(0) .setRequestCache(true) .get() @@ -1013,7 +1010,7 @@ public class IndexStatsIT extends ESIntegTestCase { client().prepareIndex("test1").setId(Integer.toString(1)).setSource("foo", "bar").execute().actionGet(); refresh(); - client().prepareSearch("_all").setStats("bar", "baz").execute().actionGet(); + prepareSearch("_all").setStats("bar", "baz").execute().actionGet(); IndicesStatsRequestBuilder builder = indicesAdmin().prepareStats(); IndicesStatsResponse stats = builder.execute().actionGet(); @@ -1163,9 +1160,7 @@ public class IndexStatsIT extends ESIntegTestCase { // the query cache has an optimization that disables it automatically if there is contention, // so we run it in an assertBusy block which should eventually succeed assertBusy(() -> { - assertNoFailures( - client().prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz"))) - ); + assertNoFailures(prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz")))); IndicesStatsResponse stats = indicesAdmin().prepareStats("index").setQueryCache(true).get(); assertCumulativeQueryCacheStats(stats); assertThat(stats.getTotal().queryCache.getHitCount(), equalTo(0L)); @@ -1174,9 +1169,7 @@ public class IndexStatsIT extends ESIntegTestCase { }); assertBusy(() -> { - assertNoFailures( - client().prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz"))) - ); + assertNoFailures(prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz")))); IndicesStatsResponse stats = indicesAdmin().prepareStats("index").setQueryCache(true).get(); assertCumulativeQueryCacheStats(stats); assertThat(stats.getTotal().queryCache.getHitCount(), greaterThan(0L)); @@ -1224,9 +1217,7 @@ public class IndexStatsIT extends ESIntegTestCase { ); assertBusy(() -> { - assertNoFailures( - client().prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz"))) - ); + assertNoFailures(prepareSearch("index").setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.matchQuery("foo", "baz")))); IndicesStatsResponse stats = indicesAdmin().prepareStats("index").setQueryCache(true).get(); assertCumulativeQueryCacheStats(stats); assertThat(stats.getTotal().queryCache.getHitCount(), greaterThan(0L)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java index 76e3ad8ef74d..17f64a689d1a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java @@ -152,8 +152,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { client().prepareIndex("test_index").setId("1").setSource("field1", "value1", "field2", "value 2").setRefreshPolicy(IMMEDIATE).get(); ensureGreen(); - SearchResponse searchResponse = client().prepareSearch("test_index") - .setQuery(termQuery("field1", "value1")) + SearchResponse searchResponse = prepareSearch("test_index").setQuery(termQuery("field1", "value1")) .addStoredField("field1") .addStoredField("field2") .execute() @@ -168,8 +167,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { ensureGreen(); // now only match on one template (template_1) - searchResponse = client().prepareSearch("text_index") - .setQuery(termQuery("field1", "value1")) + searchResponse = prepareSearch("text_index").setQuery(termQuery("field1", "value1")) .addStoredField("field1") .addStoredField("field2") .execute() @@ -512,16 +510,16 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { refresh(); - assertHitCount(client().prepareSearch("test_index"), 5L); - assertHitCount(client().prepareSearch("simple_alias"), 5L); - assertHitCount(client().prepareSearch("templated_alias-test_index"), 5L); + assertHitCount(prepareSearch("test_index"), 5L); + assertHitCount(prepareSearch("simple_alias"), 5L); + assertHitCount(prepareSearch("templated_alias-test_index"), 5L); - SearchResponse searchResponse = client().prepareSearch("filtered_alias").get(); + SearchResponse searchResponse = prepareSearch("filtered_alias").get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getSourceAsMap().get("type"), equalTo("type2")); // Search the complex filter alias - searchResponse = client().prepareSearch("complex_filtered_alias").get(); + searchResponse = prepareSearch("complex_filtered_alias").get(); assertHitCount(searchResponse, 3L); Set types = new HashSet<>(); @@ -558,9 +556,9 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { client().prepareIndex("test_index").setId("2").setSource("field", "value2").get(); refresh(); - assertHitCount(client().prepareSearch("test_index"), 2L); + assertHitCount(prepareSearch("test_index"), 2L); - SearchResponse searchResponse = client().prepareSearch("my_alias").get(); + SearchResponse searchResponse = prepareSearch("my_alias").get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getSourceAsMap().get("field"), equalTo("value2")); } @@ -593,10 +591,10 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { client().prepareIndex("test_index").setId("2").setSource("field", "value2").get(); refresh(); - assertHitCount(client().prepareSearch("test_index"), 2L); - assertHitCount(client().prepareSearch("alias1"), 2L); + assertHitCount(prepareSearch("test_index"), 2L); + assertHitCount(prepareSearch("alias1"), 2L); - SearchResponse searchResponse = client().prepareSearch("alias2").get(); + SearchResponse searchResponse = prepareSearch("alias2").get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getSourceAsMap().get("field"), equalTo("value2")); } @@ -852,8 +850,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { ensureGreen(); // ax -> matches template - SearchResponse searchResponse = client().prepareSearch("ax") - .setQuery(termQuery("field1", "value1")) + SearchResponse searchResponse = prepareSearch("ax").setQuery(termQuery("field1", "value1")) .addStoredField("field1") .addStoredField("field2") .execute() @@ -864,8 +861,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { assertNull(searchResponse.getHits().getAt(0).field("field2")); // bx -> matches template - searchResponse = client().prepareSearch("bx") - .setQuery(termQuery("field1", "value1")) + searchResponse = prepareSearch("bx").setQuery(termQuery("field1", "value1")) .addStoredField("field1") .addStoredField("field2") .execute() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java index 6a8de644b00c..c221fbf78ccc 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java @@ -133,7 +133,7 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> verifying count"); indicesAdmin().prepareRefresh().execute().actionGet(); - assertThat(client().prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); + assertThat(prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); logger.info("--> start another node"); final String node_2 = internalCluster().startNode(); @@ -157,7 +157,7 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> verifying count again..."); indicesAdmin().prepareRefresh().execute().actionGet(); - assertThat(client().prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); + assertThat(prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); } public void testRelocationWhileIndexingRandom() throws Exception { @@ -236,8 +236,7 @@ public class RelocationIT extends ESIntegTestCase { boolean ranOnce = false; for (int i = 0; i < 10; i++) { logger.info("--> START search test round {}", i + 1); - SearchHits hits = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchHits hits = prepareSearch("test").setQuery(matchAllQuery()) .setSize((int) indexer.totalIndexedDocs()) .storedFields() .execute() @@ -486,7 +485,7 @@ public class RelocationIT extends ESIntegTestCase { for (int i = 0; i < searchThreads.length; i++) { searchThreads[i] = new Thread(() -> { while (stopped.get() == false) { - assertNoFailures(client().prepareSearch("test").setRequestCache(false)); + assertNoFailures(prepareSearch("test").setRequestCache(false)); } }); searchThreads[i].start(); @@ -501,7 +500,7 @@ public class RelocationIT extends ESIntegTestCase { docs[i] = client().prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(i)); } indexRandom(true, docs); - assertHitCount(client().prepareSearch("test"), numDocs); + assertHitCount(prepareSearch("test"), numDocs); logger.info(" --> moving index to new nodes"); updateIndexSettings( @@ -580,7 +579,7 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> verifying count"); indicesAdmin().prepareRefresh().execute().actionGet(); - assertThat(client().prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); + assertThat(prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(20L)); } public void testRelocateWhileContinuouslyIndexingAndWaitingForRefresh() throws Exception { @@ -650,7 +649,7 @@ public class RelocationIT extends ESIntegTestCase { assertTrue(pendingIndexResponses.stream().allMatch(ActionFuture::isDone)); }, 1, TimeUnit.MINUTES); - assertThat(client().prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(120L)); + assertThat(prepareSearch("test").setSize(0).execute().actionGet().getHits().getTotalHits().value, equalTo(120L)); } public void testRelocationEstablishedPeerRecoveryRetentionLeases() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java index f6abb5939e54..7acd0e8b62ff 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java @@ -152,18 +152,12 @@ public class AliasRoutingIT extends ESIntegTestCase { ); assertThat( - client().prepareSearch("alias1") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(0L) ); assertThat( - client().prepareSearch("alias1") - .setSize(0) + prepareSearch("alias1").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -198,17 +192,11 @@ public class AliasRoutingIT extends ESIntegTestCase { equalTo(1L) ); assertThat( - client().prepareSearch("alias0") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(1L) ); assertThat( - client().prepareSearch("alias0") - .setSize(0) + prepareSearch("alias0").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -263,17 +251,11 @@ public class AliasRoutingIT extends ESIntegTestCase { equalTo(1L) ); assertThat( - client().prepareSearch("alias0") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias0").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(1L) ); assertThat( - client().prepareSearch("alias0") - .setSize(0) + prepareSearch("alias0").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -307,17 +289,11 @@ public class AliasRoutingIT extends ESIntegTestCase { equalTo(1L) ); assertThat( - client().prepareSearch("alias1") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias1").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(1L) ); assertThat( - client().prepareSearch("alias1") - .setSize(0) + prepareSearch("alias1").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -351,17 +327,11 @@ public class AliasRoutingIT extends ESIntegTestCase { equalTo(2L) ); assertThat( - client().prepareSearch("alias01") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias01").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(2L) ); assertThat( - client().prepareSearch("alias01") - .setSize(0) + prepareSearch("alias01").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -511,17 +481,11 @@ public class AliasRoutingIT extends ESIntegTestCase { logger.info("--> search with alias-ab, should find two"); for (int i = 0; i < 5; i++) { assertThat( - client().prepareSearch("alias-ab") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias-ab").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(2L) ); assertThat( - client().prepareSearch("alias-ab") - .setSize(0) + prepareSearch("alias-ab").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -574,12 +538,7 @@ public class AliasRoutingIT extends ESIntegTestCase { logger.info("--> search all on index_* should find two"); for (int i = 0; i < 5; i++) { assertThat( - client().prepareSearch("index_*") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("index_*").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(2L) ); } @@ -602,8 +561,7 @@ public class AliasRoutingIT extends ESIntegTestCase { logger.info("--> indexing on index_2 which is a concrete index"); client().prepareIndex("index_2").setId("2").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); - SearchResponse searchResponse = client().prepareSearch("index_*") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse searchResponse = prepareSearch("index_*").setSearchType(SearchType.QUERY_THEN_FETCH) .setSize(1) .setQuery(QueryBuilders.matchAllQuery()) .execute() @@ -630,17 +588,11 @@ public class AliasRoutingIT extends ESIntegTestCase { for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "0").setRouting("3").execute().actionGet().isExists(), equalTo(true)); assertThat( - client().prepareSearch("alias") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(1L) ); assertThat( - client().prepareSearch("alias") - .setSize(0) + prepareSearch("alias").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -656,17 +608,11 @@ public class AliasRoutingIT extends ESIntegTestCase { logger.info("--> verifying search with wrong routing should not find"); for (int i = 0; i < 5; i++) { assertThat( - client().prepareSearch("alias") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(0L) ); assertThat( - client().prepareSearch("alias") - .setSize(0) + prepareSearch("alias").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() @@ -691,17 +637,11 @@ public class AliasRoutingIT extends ESIntegTestCase { assertThat(client().prepareGet("test", "0").setRouting("3").execute().actionGet().isExists(), equalTo(true)); assertThat(client().prepareGet("test", "1").setRouting("4").execute().actionGet().isExists(), equalTo(true)); assertThat( - client().prepareSearch("alias") - .setQuery(QueryBuilders.matchAllQuery()) - .execute() - .actionGet() - .getHits() - .getTotalHits().value, + prepareSearch("alias").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().getTotalHits().value, equalTo(2L) ); assertThat( - client().prepareSearch("alias") - .setSize(0) + prepareSearch("alias").setSize(0) .setQuery(QueryBuilders.matchAllQuery()) .execute() .actionGet() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java index 233c492e54b7..05fa9dc66928 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java @@ -65,9 +65,9 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { indexTestData(); logger.info("Executing search"); - ActionFuture searchResponse = client().prepareSearch("test") - .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()))) - .execute(); + ActionFuture searchResponse = prepareSearch("test").setQuery( + scriptQuery(new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap())) + ).execute(); awaitForBlock(plugins); cancelSearch(SearchAction.NAME); @@ -82,9 +82,10 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { indexTestData(); logger.info("Executing search"); - ActionFuture searchResponse = client().prepareSearch("test") - .addScriptField("test_field", new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap())) - .execute(); + ActionFuture searchResponse = prepareSearch("test").addScriptField( + "test_field", + new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()) + ).execute(); awaitForBlock(plugins); cancelSearch(SearchAction.NAME); @@ -110,8 +111,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { termsAggregationBuilder.field("field.keyword"); } - ActionFuture searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + ActionFuture searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addAggregation( termsAggregationBuilder.subAggregation( new ScriptedMetricAggregationBuilder("sub_agg").initScript( @@ -144,8 +144,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { indexTestData(); logger.info("Executing search"); - ActionFuture searchResponse = client().prepareSearch("test") - .setScroll(TimeValue.timeValueSeconds(10)) + ActionFuture searchResponse = prepareSearch("test").setScroll(TimeValue.timeValueSeconds(10)) .setSize(5) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()))) .execute(); @@ -171,8 +170,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { logger.info("Executing search"); TimeValue keepAlive = TimeValue.timeValueSeconds(5); - SearchResponse searchResponse = client().prepareSearch("test") - .setScroll(keepAlive) + SearchResponse searchResponse = prepareSearch("test").setScroll(keepAlive) .setSize(2) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()))) .get(); @@ -209,11 +207,10 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { indexTestData(); ActionFuture msearchResponse = client().prepareMultiSearch() .add( - client().prepareSearch("test") - .addScriptField( - "test_field", - new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()) - ) + prepareSearch("test").addScriptField( + "test_field", + new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()) + ) ) .execute(); awaitForBlock(plugins); @@ -244,8 +241,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { Thread searchThread = new Thread(() -> { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + () -> prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SEARCH_BLOCK_SCRIPT_NAME, Collections.emptyMap()))) .setAllowPartialSearchResults(false) .setSize(1000) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java index 732f61ad9d15..e84afecb96f3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchServiceCleanupOnLostMasterIT.java @@ -73,7 +73,7 @@ public class SearchServiceCleanupOnLostMasterIT extends ESIntegTestCase { index("test", "test", "{}"); - assertThat(client().prepareSearch("test").setScroll("30m").get().getScrollId(), is(notNullValue())); + assertThat(prepareSearch("test").setScroll("30m").get().getScrollId(), is(notNullValue())); loseMaster.accept(master, dataNode); // in the past, this failed because the search context for the scroll would prevent the shard lock from being released. diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java index 008e164dd265..1bcf2d8fb327 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java @@ -55,8 +55,7 @@ public class SearchTimeoutIT extends ESIntegTestCase { @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98369") public void testTopHitsTimeout() { indexDocs(); - SearchResponse searchResponse = client().prepareSearch("test") - .setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) + SearchResponse searchResponse = prepareSearch("test").setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SCRIPT_NAME, Collections.emptyMap()))) .get(); assertThat(searchResponse.isTimedOut(), equalTo(true)); @@ -71,8 +70,7 @@ public class SearchTimeoutIT extends ESIntegTestCase { @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/98053") public void testAggsTimeout() { indexDocs(); - SearchResponse searchResponse = client().prepareSearch("test") - .setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) + SearchResponse searchResponse = prepareSearch("test").setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) .setSize(0) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SCRIPT_NAME, Collections.emptyMap()))) .addAggregation(new TermsAggregationBuilder("terms").field("field.keyword")) @@ -96,8 +94,7 @@ public class SearchTimeoutIT extends ESIntegTestCase { ElasticsearchException ex = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch("test") - .setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) + () -> prepareSearch("test").setTimeout(new TimeValue(10, TimeUnit.MILLISECONDS)) .setQuery(scriptQuery(new Script(ScriptType.INLINE, "mockscript", SCRIPT_NAME, Collections.emptyMap()))) .setAllowPartialSearchResults(false) // this line causes timeouts to report failures .get() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index c194674d1d99..eec815d6957a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -43,7 +43,7 @@ public class StressSearchServiceReaperIT extends ESIntegTestCase { indexRandom(true, builders); final int iterations = scaledRandomIntBetween(500, 1000); for (int i = 0; i < iterations; i++) { - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(matchAllQuery()).setSize(num), num); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(matchAllQuery()).setSize(num), num); } } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java index 0c940ad1f315..cc74dcc3d0d2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java @@ -39,8 +39,7 @@ public class AggregationsIntegrationIT extends ESIntegTestCase { public void testScroll() { final int size = randomIntBetween(1, 4); - SearchResponse response = client().prepareSearch("index") - .setSize(size) + SearchResponse response = prepareSearch("index").setSize(size) .setScroll(TimeValue.timeValueMinutes(1)) .addAggregation(terms("f").field("f")) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java index 9c8786206264..a0144d30a472 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java @@ -61,8 +61,7 @@ public class CombiIT extends ESIntegTestCase { ensureSearchable(); SubAggCollectionMode aggCollectionMode = randomFrom(SubAggCollectionMode.values()); - SearchResponse response = client().prepareSearch("idx") - .addAggregation(missing("missing_values").field("value")) + SearchResponse response = prepareSearch("idx").addAggregation(missing("missing_values").field("value")) .addAggregation(terms("values").field("value").collectMode(aggCollectionMode)) .get(); @@ -109,11 +108,9 @@ public class CombiIT extends ESIntegTestCase { ensureSearchable("idx"); SubAggCollectionMode aggCollectionMode = randomFrom(SubAggCollectionMode.values()); - SearchResponse searchResponse = client().prepareSearch("idx") - .addAggregation( - histogram("values").field("value1").interval(1).subAggregation(terms("names").field("name").collectMode(aggCollectionMode)) - ) - .get(); + SearchResponse searchResponse = prepareSearch("idx").addAggregation( + histogram("values").field("value1").interval(1).subAggregation(terms("names").field("name").collectMode(aggCollectionMode)) + ).get(); assertThat(searchResponse.getHits().getTotalHits().value, Matchers.equalTo(0L)); Histogram values = searchResponse.getAggregations().get("values"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java index f8e6ed5193e9..ea896c73f888 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java @@ -152,7 +152,7 @@ public class EquivalenceIT extends ESIntegTestCase { } } - SearchRequestBuilder reqBuilder = client().prepareSearch("idx").addAggregation(query); + SearchRequestBuilder reqBuilder = prepareSearch("idx").addAggregation(query); for (int i = 0; i < ranges.length; ++i) { RangeQueryBuilder filter = QueryBuilders.rangeQuery("values"); if (ranges[i][0] != Double.NEGATIVE_INFINITY) { @@ -254,13 +254,12 @@ public class EquivalenceIT extends ESIntegTestCase { assertNoFailures(indicesAdmin().prepareRefresh("idx").setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute().get()); - SearchResponse resp = client().prepareSearch("idx") - .addAggregation( - terms("long").field("long_values") - .size(maxNumTerms) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(min("min").field("num")) - ) + SearchResponse resp = prepareSearch("idx").addAggregation( + terms("long").field("long_values") + .size(maxNumTerms) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(min("min").field("num")) + ) .addAggregation( terms("double").field("double_values") .size(maxNumTerms) @@ -356,15 +355,12 @@ public class EquivalenceIT extends ESIntegTestCase { Map params = new HashMap<>(); params.put("interval", interval); - SearchResponse resp = client().prepareSearch("idx") - .addAggregation( - terms("terms").field("values") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "floor(_value / interval)", params)) - .size(maxNumTerms) - ) - .addAggregation(histogram("histo").field("values").interval(interval).minDocCount(1)) - .get(); + SearchResponse resp = prepareSearch("idx").addAggregation( + terms("terms").field("values") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "floor(_value / interval)", params)) + .size(maxNumTerms) + ).addAggregation(histogram("histo").field("values").interval(interval).minDocCount(1)).get(); assertNoFailures(resp); @@ -402,13 +398,11 @@ public class EquivalenceIT extends ESIntegTestCase { } indexRandom(true, indexingRequests); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").field("double_value") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(percentiles("pcts").field("double_value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").field("double_value") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(percentiles("pcts").field("double_value")) + ).get(); assertAllSuccessful(response); assertEquals(numDocs, response.getHits().getTotalHits().value); } @@ -418,13 +412,11 @@ public class EquivalenceIT extends ESIntegTestCase { createIndex("idx"); final int value = randomIntBetween(0, 10); indexRandom(true, client().prepareIndex("idx").setSource("f", value)); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filter("filter", QueryBuilders.matchAllQuery()).subAggregation( - range("range").field("f").addUnboundedTo(6).addUnboundedFrom(6).subAggregation(sum("sum").field("f")) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + filter("filter", QueryBuilders.matchAllQuery()).subAggregation( + range("range").field("f").addUnboundedTo(6).addUnboundedFrom(6).subAggregation(sum("sum").field("f")) ) - .get(); + ).get(); assertNoFailures(response); @@ -481,29 +473,25 @@ public class EquivalenceIT extends ESIntegTestCase { } indexRandom(true, reqs); - final SearchResponse r1 = client().prepareSearch("idx") - .addAggregation( - terms("f1").field("f1") - .collectMode(SubAggCollectionMode.DEPTH_FIRST) - .subAggregation( - terms("f2").field("f2") - .collectMode(SubAggCollectionMode.DEPTH_FIRST) - .subAggregation(terms("f3").field("f3").collectMode(SubAggCollectionMode.DEPTH_FIRST)) - ) - ) - .get(); + final SearchResponse r1 = prepareSearch("idx").addAggregation( + terms("f1").field("f1") + .collectMode(SubAggCollectionMode.DEPTH_FIRST) + .subAggregation( + terms("f2").field("f2") + .collectMode(SubAggCollectionMode.DEPTH_FIRST) + .subAggregation(terms("f3").field("f3").collectMode(SubAggCollectionMode.DEPTH_FIRST)) + ) + ).get(); assertNoFailures(r1); - final SearchResponse r2 = client().prepareSearch("idx") - .addAggregation( - terms("f1").field("f1") - .collectMode(SubAggCollectionMode.BREADTH_FIRST) - .subAggregation( - terms("f2").field("f2") - .collectMode(SubAggCollectionMode.BREADTH_FIRST) - .subAggregation(terms("f3").field("f3").collectMode(SubAggCollectionMode.BREADTH_FIRST)) - ) - ) - .get(); + final SearchResponse r2 = prepareSearch("idx").addAggregation( + terms("f1").field("f1") + .collectMode(SubAggCollectionMode.BREADTH_FIRST) + .subAggregation( + terms("f2").field("f2") + .collectMode(SubAggCollectionMode.BREADTH_FIRST) + .subAggregation(terms("f3").field("f3").collectMode(SubAggCollectionMode.BREADTH_FIRST)) + ) + ).get(); assertNoFailures(r2); final Terms t1 = r1.getAggregations().get("f1"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java index 0cfd27f03c6e..b255a7b5f9bb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java @@ -39,12 +39,9 @@ public class MetadataIT extends ESIntegTestCase { final var nestedMetadata = Map.of("nested", "value"); var metadata = Map.of("key", "value", "numeric", 1.2, "bool", true, "complex", nestedMetadata); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("the_terms").setMetadata(metadata).field("name").subAggregation(sum("the_sum").setMetadata(metadata).field("value")) - ) - .addAggregation(maxBucket("the_max_bucket", "the_terms>the_sum").setMetadata(metadata)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("the_terms").setMetadata(metadata).field("name").subAggregation(sum("the_sum").setMetadata(metadata).field("value")) + ).addAggregation(maxBucket("the_max_bucket", "the_terms>the_sum").setMetadata(metadata)).get(); assertNoFailures(response); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java index 6ad46d7a77ee..8b7f56675004 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java @@ -54,9 +54,7 @@ public class MissingValueIT extends ESIntegTestCase { } public void testUnmappedTerms() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(terms("my_terms").field("non_existing_field").missing("bar")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation(terms("my_terms").field("non_existing_field").missing("bar")).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("my_terms"); assertEquals(1, terms.getBuckets().size()); @@ -65,16 +63,16 @@ public class MissingValueIT extends ESIntegTestCase { public void testStringTerms() { for (ExecutionMode mode : ExecutionMode.values()) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(terms("my_terms").field("str").executionHint(mode.toString()).missing("bar")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("my_terms").field("str").executionHint(mode.toString()).missing("bar") + ).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("my_terms"); assertEquals(2, terms.getBuckets().size()); assertEquals(1, terms.getBucketByKey("foo").getDocCount()); assertEquals(1, terms.getBucketByKey("bar").getDocCount()); - response = client().prepareSearch("idx").addAggregation(terms("my_terms").field("str").missing("foo")).get(); + response = prepareSearch("idx").addAggregation(terms("my_terms").field("str").missing("foo")).get(); assertNoFailures(response); terms = response.getAggregations().get("my_terms"); assertEquals(1, terms.getBuckets().size()); @@ -83,14 +81,14 @@ public class MissingValueIT extends ESIntegTestCase { } public void testLongTerms() { - SearchResponse response = client().prepareSearch("idx").addAggregation(terms("my_terms").field("long").missing(4)).get(); + SearchResponse response = prepareSearch("idx").addAggregation(terms("my_terms").field("long").missing(4)).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("my_terms"); assertEquals(2, terms.getBuckets().size()); assertEquals(1, terms.getBucketByKey("3").getDocCount()); assertEquals(1, terms.getBucketByKey("4").getDocCount()); - response = client().prepareSearch("idx").addAggregation(terms("my_terms").field("long").missing(3)).get(); + response = prepareSearch("idx").addAggregation(terms("my_terms").field("long").missing(3)).get(); assertNoFailures(response); terms = response.getAggregations().get("my_terms"); assertEquals(1, terms.getBuckets().size()); @@ -98,14 +96,14 @@ public class MissingValueIT extends ESIntegTestCase { } public void testDoubleTerms() { - SearchResponse response = client().prepareSearch("idx").addAggregation(terms("my_terms").field("double").missing(4.5)).get(); + SearchResponse response = prepareSearch("idx").addAggregation(terms("my_terms").field("double").missing(4.5)).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("my_terms"); assertEquals(2, terms.getBuckets().size()); assertEquals(1, terms.getBucketByKey("4.5").getDocCount()); assertEquals(1, terms.getBucketByKey("5.5").getDocCount()); - response = client().prepareSearch("idx").addAggregation(terms("my_terms").field("double").missing(5.5)).get(); + response = prepareSearch("idx").addAggregation(terms("my_terms").field("double").missing(5.5)).get(); assertNoFailures(response); terms = response.getAggregations().get("my_terms"); assertEquals(1, terms.getBuckets().size()); @@ -113,9 +111,9 @@ public class MissingValueIT extends ESIntegTestCase { } public void testUnmappedHistogram() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("my_histogram").field("non-existing_field").interval(5).missing(12)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("my_histogram").field("non-existing_field").interval(5).missing(12) + ).get(); assertNoFailures(response); Histogram histogram = response.getAggregations().get("my_histogram"); assertEquals(1, histogram.getBuckets().size()); @@ -124,9 +122,7 @@ public class MissingValueIT extends ESIntegTestCase { } public void testHistogram() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("my_histogram").field("long").interval(5).missing(7)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation(histogram("my_histogram").field("long").interval(5).missing(7)).get(); assertNoFailures(response); Histogram histogram = response.getAggregations().get("my_histogram"); assertEquals(2, histogram.getBuckets().size()); @@ -135,7 +131,7 @@ public class MissingValueIT extends ESIntegTestCase { assertEquals(5d, histogram.getBuckets().get(1).getKey()); assertEquals(1, histogram.getBuckets().get(1).getDocCount()); - response = client().prepareSearch("idx").addAggregation(histogram("my_histogram").field("long").interval(5).missing(3)).get(); + response = prepareSearch("idx").addAggregation(histogram("my_histogram").field("long").interval(5).missing(3)).get(); assertNoFailures(response); histogram = response.getAggregations().get("my_histogram"); assertEquals(1, histogram.getBuckets().size()); @@ -144,9 +140,9 @@ public class MissingValueIT extends ESIntegTestCase { } public void testDateHistogram() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(dateHistogram("my_histogram").field("date").calendarInterval(DateHistogramInterval.YEAR).missing("2014-05-07")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("my_histogram").field("date").calendarInterval(DateHistogramInterval.YEAR).missing("2014-05-07") + ).get(); assertNoFailures(response); Histogram histogram = response.getAggregations().get("my_histogram"); assertEquals(2, histogram.getBuckets().size()); @@ -155,9 +151,9 @@ public class MissingValueIT extends ESIntegTestCase { assertEquals("2015-01-01T00:00:00.000Z", histogram.getBuckets().get(1).getKeyAsString()); assertEquals(1, histogram.getBuckets().get(1).getDocCount()); - response = client().prepareSearch("idx") - .addAggregation(dateHistogram("my_histogram").field("date").calendarInterval(DateHistogramInterval.YEAR).missing("2015-05-07")) - .get(); + response = prepareSearch("idx").addAggregation( + dateHistogram("my_histogram").field("date").calendarInterval(DateHistogramInterval.YEAR).missing("2015-05-07") + ).get(); assertNoFailures(response); histogram = response.getAggregations().get("my_histogram"); assertEquals(1, histogram.getBuckets().size()); @@ -166,23 +162,21 @@ public class MissingValueIT extends ESIntegTestCase { } public void testCardinality() { - SearchResponse response = client().prepareSearch("idx").addAggregation(cardinality("card").field("long").missing(2)).get(); + SearchResponse response = prepareSearch("idx").addAggregation(cardinality("card").field("long").missing(2)).get(); assertNoFailures(response); Cardinality cardinality = response.getAggregations().get("card"); assertEquals(2, cardinality.getValue()); } public void testPercentiles() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(percentiles("percentiles").field("long").missing(1000)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation(percentiles("percentiles").field("long").missing(1000)).get(); assertNoFailures(response); Percentiles percentiles = response.getAggregations().get("percentiles"); assertEquals(1000, percentiles.percentile(100), 0); } public void testStats() { - SearchResponse response = client().prepareSearch("idx").addAggregation(stats("stats").field("long").missing(5)).get(); + SearchResponse response = prepareSearch("idx").addAggregation(stats("stats").field("long").missing(5)).get(); assertNoFailures(response); Stats stats = response.getAggregations().get("stats"); assertEquals(2, stats.getCount()); @@ -190,9 +184,7 @@ public class MissingValueIT extends ESIntegTestCase { } public void testUnmappedGeoBounds() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(geoBounds("bounds").field("non_existing_field").missing("2,1")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation(geoBounds("bounds").field("non_existing_field").missing("2,1")).get(); assertNoFailures(response); GeoBounds bounds = response.getAggregations().get("bounds"); assertThat(bounds.bottomRight().lat(), closeTo(2.0, 1E-5)); @@ -202,7 +194,7 @@ public class MissingValueIT extends ESIntegTestCase { } public void testGeoBounds() { - SearchResponse response = client().prepareSearch("idx").addAggregation(geoBounds("bounds").field("location").missing("2,1")).get(); + SearchResponse response = prepareSearch("idx").addAggregation(geoBounds("bounds").field("location").missing("2,1")).get(); assertNoFailures(response); GeoBounds bounds = response.getAggregations().get("bounds"); assertThat(bounds.bottomRight().lat(), closeTo(1.0, 1E-5)); @@ -212,9 +204,7 @@ public class MissingValueIT extends ESIntegTestCase { } public void testGeoCentroid() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(geoCentroid("centroid").field("location").missing("2,1")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation(geoCentroid("centroid").field("location").missing("2,1")).get(); assertNoFailures(response); GeoCentroid centroid = response.getAggregations().get("centroid"); GeoPoint point = new GeoPoint(1.5, 1.5); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java index 3f94cde9cb30..0af496d83f9d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java @@ -73,11 +73,9 @@ public class BooleanTermsIT extends ESIntegTestCase { } public void testSingleValueField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); @@ -107,11 +105,9 @@ public class BooleanTermsIT extends ESIntegTestCase { } public void testMultiValueField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); @@ -141,13 +137,11 @@ public class BooleanTermsIT extends ESIntegTestCase { } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .size(between(1, 5)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .size(between(1, 5)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); 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 8333fcd37ea3..8031c467a47a 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 @@ -225,9 +225,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -260,15 +260,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldWithTimeZone() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.DAY) - .minDocCount(1) - .timeZone(ZoneId.of("+01:00")) - ) - .execute() - .actionGet(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.DAY).minDocCount(1).timeZone(ZoneId.of("+01:00")) + ).execute().actionGet(); ZoneId tz = ZoneId.of("+01:00"); assertNoFailures(response); @@ -328,11 +322,9 @@ public class DateHistogramIT extends ESIntegTestCase { format = format + "||date_optional_time"; } ZoneId tz = ZoneId.of("+01:00"); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.DAY).minDocCount(1).timeZone(tz).format(format) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.DAY).minDocCount(1).timeZone(tz).format(format) + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); @@ -362,9 +354,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByKeyAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.key(true))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.key(true)) + ).get(); assertNoFailures(response); @@ -382,11 +374,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByKeyDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.key(false)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.key(false)) + ).get(); assertNoFailures(response); @@ -403,11 +393,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByCountAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(true)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(true)) + ).get(); assertNoFailures(response); @@ -424,11 +412,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByCountDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(false)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(false)) + ).get(); assertNoFailures(response); @@ -445,11 +431,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).subAggregation(sum("sum").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).subAggregation(sum("sum").field("value")) + ).get(); assertNoFailures(response); @@ -504,14 +488,12 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedBySubAggregationAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .order(BucketOrder.aggregation("sum", true)) - .subAggregation(max("sum").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .order(BucketOrder.aggregation("sum", true)) + .subAggregation(max("sum").field("value")) + ).get(); assertNoFailures(response); @@ -528,14 +510,12 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedBySubAggregationDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .order(BucketOrder.aggregation("sum", false)) - .subAggregation(max("sum").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .order(BucketOrder.aggregation("sum", false)) + .subAggregation(max("sum").field("value")) + ).get(); assertNoFailures(response); @@ -552,14 +532,12 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByMultiValuedSubAggregationDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .order(BucketOrder.aggregation("stats", "sum", false)) - .subAggregation(stats("stats").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .order(BucketOrder.aggregation("stats", "sum", false)) + .subAggregation(stats("stats").field("value")) + ).get(); assertNoFailures(response); @@ -576,14 +554,12 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByTieBreaker() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .order(BucketOrder.aggregation("max_constant", randomBoolean())) - .subAggregation(max("max_constant").field("constant")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .order(BucketOrder.aggregation("max_constant", randomBoolean())) + .subAggregation(max("max_constant").field("constant")) + ).get(); assertNoFailures(response); @@ -602,18 +578,16 @@ public class DateHistogramIT extends ESIntegTestCase { public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception { boolean asc = true; try { - client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.MONTH) - .order(BucketOrder.aggregation("inner_histo>avg", asc)) - .subAggregation( - dateHistogram("inner_histo").calendarInterval(DateHistogramInterval.MONTH) - .field("dates") - .subAggregation(avg("avg").field("value")) - ) - ) - .get(); + prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.MONTH) + .order(BucketOrder.aggregation("inner_histo>avg", asc)) + .subAggregation( + dateHistogram("inner_histo").calendarInterval(DateHistogramInterval.MONTH) + .field("dates") + .subAggregation(avg("avg").field("value")) + ) + ).get(); fail("Expected an exception"); } catch (SearchPhaseExecutionException e) { ElasticsearchException[] rootCauses = e.guessRootCauses(); @@ -633,13 +607,11 @@ public class DateHistogramIT extends ESIntegTestCase { public void testSingleValuedFieldWithValueScript() throws Exception { Map params = new HashMap<>(); params.put("fieldname", "date"); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.LONG_PLUS_ONE_MONTH, params)) - .calendarInterval(DateHistogramInterval.MONTH) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.LONG_PLUS_ONE_MONTH, params)) + .calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -682,9 +654,9 @@ public class DateHistogramIT extends ESIntegTestCase { */ public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(dateHistogram("histo").field("dates").calendarInterval(DateHistogramInterval.MONTH)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("dates").calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -724,11 +696,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testMultiValuedFieldOrderedByCountDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("dates").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(false)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("dates").calendarInterval(DateHistogramInterval.MONTH).order(BucketOrder.count(false)) + ).get(); assertNoFailures(response); @@ -773,13 +743,11 @@ public class DateHistogramIT extends ESIntegTestCase { public void testMultiValuedFieldWithValueScript() throws Exception { Map params = new HashMap<>(); params.put("fieldname", "dates"); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("dates") - .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.LONG_PLUS_ONE_MONTH, params)) - .calendarInterval(DateHistogramInterval.MONTH) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("dates") + .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.LONG_PLUS_ONE_MONTH, params)) + .calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -829,12 +797,10 @@ public class DateHistogramIT extends ESIntegTestCase { public void testScriptSingleValue() throws Exception { Map params = new HashMap<>(); params.put("fieldname", "date"); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.EXTRACT_FIELD, params)) - .calendarInterval(DateHistogramInterval.MONTH) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.EXTRACT_FIELD, params)) + .calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -869,12 +835,10 @@ public class DateHistogramIT extends ESIntegTestCase { public void testScriptMultiValued() throws Exception { Map params = new HashMap<>(); params.put("fieldname", "dates"); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.EXTRACT_FIELD, params)) - .calendarInterval(DateHistogramInterval.MONTH) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.EXTRACT_FIELD, params)) + .calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -923,9 +887,9 @@ public class DateHistogramIT extends ESIntegTestCase { */ public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation(dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH)) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH) + ).get(); assertNoFailures(response); @@ -971,8 +935,7 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -1010,8 +973,7 @@ public class DateHistogramIT extends ESIntegTestCase { } indexRandom(true, reqs); - SearchResponse response = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation( dateHistogram("date_histo").field("date") .timeZone(ZoneId.of("-02:00")) @@ -1106,16 +1068,14 @@ public class DateHistogramIT extends ESIntegTestCase { SearchResponse response = null; try { - response = client().prepareSearch("idx2") - .addAggregation( - dateHistogram("histo").field("date") - .fixedInterval(DateHistogramInterval.days(interval)) - .minDocCount(0) - // when explicitly specifying a format, the extended bounds should be defined by the same format - .extendedBounds(new LongBounds(format(boundsMin, pattern), format(boundsMax, pattern))) - .format(pattern) - ) - .get(); + response = prepareSearch("idx2").addAggregation( + dateHistogram("histo").field("date") + .fixedInterval(DateHistogramInterval.days(interval)) + .minDocCount(0) + // when explicitly specifying a format, the extended bounds should be defined by the same format + .extendedBounds(new LongBounds(format(boundsMin, pattern), format(boundsMax, pattern))) + .format(pattern) + ).get(); if (invalidBoundsError) { fail("Expected an exception to be thrown when bounds.min is greater than bounds.max"); @@ -1175,10 +1135,9 @@ public class DateHistogramIT extends ESIntegTestCase { SearchResponse response = null; // retrieve those docs with the same time zone and extended bounds - response = client().prepareSearch(index) - .setQuery( - QueryBuilders.rangeQuery("date").from("now/d").to("now/d").includeLower(true).includeUpper(true).timeZone(timezone.getId()) - ) + response = prepareSearch(index).setQuery( + QueryBuilders.rangeQuery("date").from("now/d").to("now/d").includeLower(true).includeUpper(true).timeZone(timezone.getId()) + ) .addAggregation( dateHistogram("histo").field("date") .calendarInterval(DateHistogramInterval.hours(1)) @@ -1236,15 +1195,13 @@ public class DateHistogramIT extends ESIntegTestCase { SearchResponse response = null; // retrieve those docs with the same time zone and extended bounds - response = client().prepareSearch(index) - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.days(1)) - .offset("+6h") - .minDocCount(0) - .extendedBounds(new LongBounds("2016-01-01T06:00:00Z", "2016-01-08T08:00:00Z")) - ) - .get(); + response = prepareSearch(index).addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.days(1)) + .offset("+6h") + .minDocCount(0) + .extendedBounds(new LongBounds("2016-01-01T06:00:00Z", "2016-01-08T08:00:00Z")) + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); @@ -1293,8 +1250,7 @@ public class DateHistogramIT extends ESIntegTestCase { } indexRandom(true, reqs); - SearchResponse response = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation(dateHistogram("date_histo").field("date").calendarInterval(DateHistogramInterval.DAY)) .get(); @@ -1313,14 +1269,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testIssue6965() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .timeZone(ZoneId.of("+01:00")) - .calendarInterval(DateHistogramInterval.MONTH) - .minDocCount(0) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").timeZone(ZoneId.of("+01:00")).calendarInterval(DateHistogramInterval.MONTH).minDocCount(0) + ).get(); assertNoFailures(response); @@ -1362,14 +1313,12 @@ public class DateHistogramIT extends ESIntegTestCase { client().prepareIndex("test9491").setSource("d", "2014-11-08T13:00:00Z") ); ensureSearchable("test9491"); - SearchResponse response = client().prepareSearch("test9491") - .addAggregation( - dateHistogram("histo").field("d") - .calendarInterval(DateHistogramInterval.YEAR) - .timeZone(ZoneId.of("Asia/Jerusalem")) - .format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX") - ) - .get(); + SearchResponse response = prepareSearch("test9491").addAggregation( + dateHistogram("histo").field("d") + .calendarInterval(DateHistogramInterval.YEAR) + .timeZone(ZoneId.of("Asia/Jerusalem")) + .format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX") + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); assertThat(histo.getBuckets().size(), equalTo(1)); @@ -1386,15 +1335,13 @@ public class DateHistogramIT extends ESIntegTestCase { client().prepareIndex("test8209").setSource("d", "2014-04-30T00:00:00Z") ); ensureSearchable("test8209"); - SearchResponse response = client().prepareSearch("test8209") - .addAggregation( - dateHistogram("histo").field("d") - .calendarInterval(DateHistogramInterval.MONTH) - .format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX") - .timeZone(ZoneId.of("CET")) - .minDocCount(0) - ) - .get(); + SearchResponse response = prepareSearch("test8209").addAggregation( + dateHistogram("histo").field("d") + .calendarInterval(DateHistogramInterval.MONTH) + .format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXXX") + .timeZone(ZoneId.of("CET")) + .minDocCount(0) + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); assertThat(histo.getBuckets().size(), equalTo(4)); @@ -1423,15 +1370,13 @@ public class DateHistogramIT extends ESIntegTestCase { indexRandom(true, client().prepareIndex(indexDateUnmapped).setSource("foo", "bar")); ensureSearchable(indexDateUnmapped); - SearchResponse response = client().prepareSearch(indexDateUnmapped) - .addAggregation( - dateHistogram("histo").field("dateField") - .calendarInterval(DateHistogramInterval.MONTH) - .format("yyyy-MM") - .minDocCount(0) - .extendedBounds(new LongBounds("2018-01", "2018-01")) - ) - .get(); + SearchResponse response = prepareSearch(indexDateUnmapped).addAggregation( + dateHistogram("histo").field("dateField") + .calendarInterval(DateHistogramInterval.MONTH) + .format("yyyy-MM") + .minDocCount(0) + .extendedBounds(new LongBounds("2018-01", "2018-01")) + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); assertThat(histo.getBuckets().size(), equalTo(1)); @@ -1450,25 +1395,21 @@ public class DateHistogramIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate(index).setMapping("d", "type=date,format=epoch_millis").get()); indexRandom(true, client().prepareIndex(index).setSource("d", "1477954800000")); ensureSearchable(index); - SearchResponse response = client().prepareSearch(index) - .addAggregation( - dateHistogram("histo").field("d").calendarInterval(DateHistogramInterval.MONTH).timeZone(ZoneId.of("Europe/Berlin")) - ) - .get(); + SearchResponse response = prepareSearch(index).addAggregation( + dateHistogram("histo").field("d").calendarInterval(DateHistogramInterval.MONTH).timeZone(ZoneId.of("Europe/Berlin")) + ).get(); assertNoFailures(response); Histogram histo = response.getAggregations().get("histo"); assertThat(histo.getBuckets().size(), equalTo(1)); assertThat(histo.getBuckets().get(0).getKeyAsString(), equalTo("1477954800000")); assertThat(histo.getBuckets().get(0).getDocCount(), equalTo(1L)); - response = client().prepareSearch(index) - .addAggregation( - dateHistogram("histo").field("d") - .calendarInterval(DateHistogramInterval.MONTH) - .timeZone(ZoneId.of("Europe/Berlin")) - .format("yyyy-MM-dd") - ) - .get(); + response = prepareSearch(index).addAggregation( + dateHistogram("histo").field("d") + .calendarInterval(DateHistogramInterval.MONTH) + .timeZone(ZoneId.of("Europe/Berlin")) + .format("yyyy-MM-dd") + ).get(); assertNoFailures(response); histo = response.getAggregations().get("histo"); assertThat(histo.getBuckets().size(), equalTo(1)); @@ -1486,8 +1427,7 @@ public class DateHistogramIT extends ESIntegTestCase { * "2015-10-25T04:00:00.000+01:00". */ public void testDSTEndTransition() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(new MatchNoneQueryBuilder()) + SearchResponse response = prepareSearch("idx").setQuery(new MatchNoneQueryBuilder()) .addAggregation( dateHistogram("histo").field("date") .timeZone(ZoneId.of("Europe/Oslo")) @@ -1516,8 +1456,7 @@ public class DateHistogramIT extends ESIntegTestCase { equalTo(3600000L) ); - response = client().prepareSearch("idx") - .setQuery(new MatchNoneQueryBuilder()) + response = prepareSearch("idx").setQuery(new MatchNoneQueryBuilder()) .addAggregation( dateHistogram("histo").field("date") .timeZone(ZoneId.of("Europe/Oslo")) @@ -1578,8 +1517,7 @@ public class DateHistogramIT extends ESIntegTestCase { // Test that a request using a nondeterministic script does not get cached Map params = new HashMap<>(); params.put("fieldname", "d"); - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( dateHistogram("histo").field("d") .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.CURRENT_DATE, params)) @@ -1598,8 +1536,7 @@ public class DateHistogramIT extends ESIntegTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( dateHistogram("histo").field("d") .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.LONG_PLUS_ONE_MONTH, params)) @@ -1618,8 +1555,7 @@ public class DateHistogramIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(dateHistogram("histo").field("d").calendarInterval(DateHistogramInterval.MONTH)) .get(); assertNoFailures(r); @@ -1676,15 +1612,13 @@ public class DateHistogramIT extends ESIntegTestCase { private void assertMultiSortResponse(int[] expectedDays, BucketOrder... order) { ZonedDateTime[] expectedKeys = Arrays.stream(expectedDays).mapToObj(d -> date(1, d)).toArray(ZonedDateTime[]::new); - SearchResponse response = client().prepareSearch("sort_idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.DAY) - .order(BucketOrder.compound(order)) - .subAggregation(avg("avg_l").field("l")) - .subAggregation(sum("sum_d").field("d")) - ) - .get(); + SearchResponse response = prepareSearch("sort_idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.DAY) + .order(BucketOrder.compound(order)) + .subAggregation(avg("avg_l").field("l")) + .subAggregation(sum("sum_d").field("d")) + ).get(); assertNoFailures(response); @@ -1722,14 +1656,11 @@ public class DateHistogramIT extends ESIntegTestCase { indexRandom(true, client().prepareIndex("nanos").setId("2").setSource("date", "2000-01-02")); // Search interval 24 hours - SearchResponse r = client().prepareSearch("nanos") - .addAggregation( - dateHistogram("histo").field("date") - .fixedInterval(DateHistogramInterval.seconds(60 * 60 * 24)) - .timeZone(ZoneId.of("Europe/Berlin")) - ) - .addDocValueField("date") - .get(); + SearchResponse r = prepareSearch("nanos").addAggregation( + dateHistogram("histo").field("date") + .fixedInterval(DateHistogramInterval.seconds(60 * 60 * 24)) + .timeZone(ZoneId.of("Europe/Berlin")) + ).addDocValueField("date").get(); assertNoFailures(r); Histogram histogram = r.getAggregations().get("histo"); @@ -1740,12 +1671,9 @@ public class DateHistogramIT extends ESIntegTestCase { assertEquals(946767600000L, ((ZonedDateTime) buckets.get(1).getKey()).toEpochSecond() * 1000); assertEquals(1, buckets.get(1).getDocCount()); - r = client().prepareSearch("nanos") - .addAggregation( - dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.seconds(60 * 60 * 24)).timeZone(ZoneId.of("UTC")) - ) - .addDocValueField("date") - .get(); + r = prepareSearch("nanos").addAggregation( + dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.seconds(60 * 60 * 24)).timeZone(ZoneId.of("UTC")) + ).addDocValueField("date").get(); assertNoFailures(r); histogram = r.getAggregations().get("histo"); @@ -1758,11 +1686,9 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testDateKeyFormatting() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).timeZone(ZoneId.of("America/Edmonton")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date").calendarInterval(DateHistogramInterval.MONTH).timeZone(ZoneId.of("America/Edmonton")) + ).get(); assertNoFailures(response); @@ -1774,13 +1700,11 @@ public class DateHistogramIT extends ESIntegTestCase { } public void testHardBoundsOnDates() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateHistogram("histo").field("date") - .calendarInterval(DateHistogramInterval.DAY) - .hardBounds(new LongBounds("2012-02-01T00:00:00.000", "2012-03-03T00:00:00.000")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateHistogram("histo").field("date") + .calendarInterval(DateHistogramInterval.DAY) + .hardBounds(new LongBounds("2012-02-01T00:00:00.000", "2012-03-03T00:00:00.000")) + ).get(); assertNoFailures(response); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java index 40ff2d25e433..64c1a7c8859f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java @@ -72,8 +72,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase { public void testSingleValueWithPositiveOffset() throws Exception { prepareIndex(date("2014-03-11T00:00:00+00:00"), 5, 1, 0); - SearchResponse response = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation( dateHistogram("date_histo").field("date").offset("2h").format(DATE_FORMAT).fixedInterval(DateHistogramInterval.DAY) ) @@ -92,8 +91,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase { public void testSingleValueWithNegativeOffset() throws Exception { prepareIndex(date("2014-03-11T00:00:00+00:00"), 5, -1, 0); - SearchResponse response = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation( dateHistogram("date_histo").field("date").offset("-2h").format(DATE_FORMAT).fixedInterval(DateHistogramInterval.DAY) ) @@ -116,8 +114,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase { prepareIndex(date("2014-03-11T00:00:00+00:00"), 12, 1, 0); prepareIndex(date("2014-03-14T00:00:00+00:00"), 12, 1, 13); - SearchResponse response = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation( dateHistogram("date_histo").field("date") .offset("6h") 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 d0e7a74c9fea..79b9b0b3628d 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 @@ -127,14 +127,12 @@ public class DateRangeIT extends ESIntegTestCase { } else { rangeBuilder.script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.EXTRACT_FIELD, params)); } - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - rangeBuilder.addUnboundedTo("a long time ago", "now-50y") - .addRange("recently", "now-50y", "now-1y") - .addUnboundedFrom("last year", "now-1y") - .timeZone(ZoneId.of("Etc/GMT+5")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + rangeBuilder.addUnboundedTo("a long time ago", "now-50y") + .addRange("recently", "now-50y", "now-1y") + .addUnboundedFrom("last year", "now-1y") + .timeZone(ZoneId.of("Etc/GMT+5")) + ).get(); assertNoFailures(response); @@ -162,14 +160,9 @@ public class DateRangeIT extends ESIntegTestCase { } public void testSingleValueField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .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").addAggregation( + dateRange("range").field("date").addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15)) + ).get(); assertNoFailures(response); @@ -208,14 +201,12 @@ public class DateRangeIT extends ESIntegTestCase { } public void testSingleValueFieldWithStringDates() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("date") - .addUnboundedTo("2012-02-15") - .addRange("2012-02-15", "2012-03-15") - .addUnboundedFrom("2012-03-15") - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("date") + .addUnboundedTo("2012-02-15") + .addRange("2012-02-15", "2012-03-15") + .addUnboundedFrom("2012-03-15") + ).get(); assertNoFailures(response); @@ -254,15 +245,13 @@ public class DateRangeIT extends ESIntegTestCase { } public void testSingleValueFieldWithStringDatesWithCustomFormat() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("date") - .format("yyyy-MM-dd") - .addUnboundedTo("2012-02-15") - .addRange("2012-02-15", "2012-03-15") - .addUnboundedFrom("2012-03-15") - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("date") + .format("yyyy-MM-dd") + .addUnboundedTo("2012-02-15") + .addRange("2012-02-15", "2012-03-15") + .addUnboundedFrom("2012-03-15") + ).get(); assertNoFailures(response); @@ -308,15 +297,13 @@ public class DateRangeIT extends ESIntegTestCase { String mar15Suffix = timeZoneOffset == 0 ? "Z" : date(3, 15, timezone).format(DateTimeFormatter.ofPattern("xxx", Locale.ROOT)); long expectedFirstBucketCount = timeZoneOffset < 0 ? 3L : 2L; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("date") - .addUnboundedTo("2012-02-15") - .addRange("2012-02-15", "2012-02-15||+1M") - .addUnboundedFrom("2012-02-15||+1M") - .timeZone(timezone) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("date") + .addUnboundedTo("2012-02-15") + .addRange("2012-02-15", "2012-02-15||+1M") + .addUnboundedFrom("2012-02-15||+1M") + .timeZone(timezone) + ).get(); assertNoFailures(response); @@ -355,14 +342,12 @@ public class DateRangeIT extends ESIntegTestCase { } public void testSingleValueFieldWithCustomKey() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("date") - .addUnboundedTo("r1", date(2, 15)) - .addRange("r2", date(2, 15), date(3, 15)) - .addUnboundedFrom("r3", date(3, 15)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("date") + .addUnboundedTo("r1", date(2, 15)) + .addRange("r2", date(2, 15), date(3, 15)) + .addUnboundedFrom("r3", date(3, 15)) + ).get(); assertNoFailures(response); @@ -410,15 +395,13 @@ public class DateRangeIT extends ESIntegTestCase { */ public void testSingleValuedFieldWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("date") - .addUnboundedTo("r1", date(2, 15)) - .addRange("r2", date(2, 15), date(3, 15)) - .addUnboundedFrom("r3", date(3, 15)) - .subAggregation(sum("sum").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("date") + .addUnboundedTo("r1", date(2, 15)) + .addRange("r2", date(2, 15), date(3, 15)) + .addUnboundedFrom("r3", date(3, 15)) + .subAggregation(sum("sum").field("value")) + ).get(); assertNoFailures(response); @@ -486,14 +469,9 @@ public class DateRangeIT extends ESIntegTestCase { */ public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field("dates") - .addUnboundedTo(date(2, 15)) - .addRange(date(2, 15), date(3, 15)) - .addUnboundedFrom(date(3, 15)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + dateRange("range").field("dates").addUnboundedTo(date(2, 15)).addRange(date(2, 15), date(3, 15)).addUnboundedFrom(date(3, 15)) + ).get(); assertNoFailures(response); @@ -578,8 +556,7 @@ public class DateRangeIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -608,7 +585,7 @@ public class DateRangeIT extends ESIntegTestCase { public void testNoRangesInQuery() { try { - client().prepareSearch("idx").addAggregation(dateRange("my_date_range_agg").field("value")).get(); + prepareSearch("idx").addAggregation(dateRange("my_date_range_agg").field("value")).get(); fail(); } catch (SearchPhaseExecutionException spee) { Throwable rootCause = spee.getCause().getCause(); @@ -650,8 +627,7 @@ public class DateRangeIT extends ESIntegTestCase { // Test that a request using a nondeterministic script does not get cached Map params = new HashMap<>(); params.put("fieldname", "date"); - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( dateRange("foo").field("date") .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.CURRENT_DATE, params)) @@ -673,8 +649,7 @@ public class DateRangeIT extends ESIntegTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( dateRange("foo").field("date") .script(new Script(ScriptType.INLINE, "mockscript", DateScriptMocksPlugin.DOUBLE_PLUS_ONE_MONTH, params)) @@ -696,8 +671,7 @@ public class DateRangeIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( dateRange("foo").field("date") .addRange( @@ -734,8 +708,7 @@ public class DateRangeIT extends ESIntegTestCase { // using no format should work when to/from is compatible with format in // mapping - SearchResponse searchResponse = client().prepareSearch(indexName) - .setSize(0) + SearchResponse searchResponse = prepareSearch(indexName).setSize(0) .addAggregation(dateRange("date_range").field("date").addRange("00:16:40", "00:50:00").addRange("00:50:00", "01:06:40")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L)); @@ -745,8 +718,7 @@ public class DateRangeIT extends ESIntegTestCase { // using different format should work when to/from is compatible with // format in aggregation - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation( dateRange("date_range").field("date").addRange("00.16.40", "00.50.00").addRange("00.50.00", "01.06.40").format("HH.mm.ss") ) @@ -758,8 +730,7 @@ public class DateRangeIT extends ESIntegTestCase { // providing numeric input with format should work, but bucket keys are // different now - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation( dateRange("date_range").field("date").addRange(1000000, 3000000).addRange(3000000, 4000000).format("epoch_millis") ) @@ -772,8 +743,7 @@ public class DateRangeIT extends ESIntegTestCase { // providing numeric input without format should throw an exception ElasticsearchException e = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch(indexName) - .setSize(0) + () -> prepareSearch(indexName).setSize(0) .addAggregation(dateRange("date_range").field("date").addRange(1000000, 3000000).addRange(3000000, 4000000)) .get() ); @@ -796,8 +766,7 @@ public class DateRangeIT extends ESIntegTestCase { // using no format should work when to/from is compatible with format in // mapping - SearchResponse searchResponse = client().prepareSearch(indexName) - .setSize(0) + SearchResponse searchResponse = prepareSearch(indexName).setSize(0) .addAggregation(dateRange("date_range").field("date").addRange(1000, 3000).addRange(3000, 4000)) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L)); @@ -806,8 +775,7 @@ public class DateRangeIT extends ESIntegTestCase { assertBucket(buckets.get(1), 1L, "3000-4000", 3000000L, 4000000L); // using no format should also work when and to/from are string values - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation(dateRange("date_range").field("date").addRange("1000", "3000").addRange("3000", "4000")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L)); @@ -816,8 +784,7 @@ public class DateRangeIT extends ESIntegTestCase { assertBucket(buckets.get(1), 1L, "3000-4000", 3000000L, 4000000L); // also e-notation should work, fractional parts should be truncated - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation(dateRange("date_range").field("date").addRange(1.0e3, 3000.8123).addRange(3000.8123, 4.0e3)) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(3L)); @@ -827,8 +794,7 @@ public class DateRangeIT extends ESIntegTestCase { // using different format should work when to/from is compatible with // format in aggregation - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation( dateRange("date_range").field("date").addRange("00.16.40", "00.50.00").addRange("00.50.00", "01.06.40").format("HH.mm.ss") ) @@ -840,8 +806,7 @@ public class DateRangeIT extends ESIntegTestCase { // providing different numeric input with format should work, but bucket // keys are different now - searchResponse = client().prepareSearch(indexName) - .setSize(0) + searchResponse = prepareSearch(indexName).setSize(0) .addAggregation( dateRange("date_range").field("date").addRange(1000000, 3000000).addRange(3000000, 4000000).format("epoch_millis") ) 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 ac0dbf6f5d0a..49e27ff40174 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 @@ -93,8 +93,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { // Tests that we can refer to nested elements under a sample in a path // statement boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .addAggregation( terms("genres").field("genre") .order(BucketOrder.aggregation("sample>max_price.value", asc)) @@ -126,8 +125,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("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(new TermQueryBuilder("genre", "fantasy")) .setFrom(0) .setSize(60) @@ -153,7 +151,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { sampleAgg.subAggregation(terms("authors").field("author")); rootTerms.subAggregation(sampleAgg); - SearchResponse response = client().prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH).addAggregation(rootTerms).get(); + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH).addAggregation(rootTerms).get(); assertNoFailures(response); Terms genres = response.getAggregations().get("genres"); List genreBuckets = genres.getBuckets(); @@ -182,10 +180,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { sampleAgg.subAggregation(terms("genres").field("genre")); rootSample.subAggregation(sampleAgg); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) - .addAggregation(rootSample) - .get(); + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH).addAggregation(rootSample).get(); assertNoFailures(response); Sampler genreSample = response.getAggregations().get("genreSample"); Sampler sample = genreSample.getAggregations().get("sample"); @@ -249,8 +244,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { DiversifiedAggregationBuilder sampleAgg = new DiversifiedAggregationBuilder("sample").shardSize(Integer.MAX_VALUE); sampleAgg.field("author").maxDocsPerValue(MAX_DOCS_PER_AUTHOR).executionHint(randomExecutionHint()); sampleAgg.subAggregation(terms("authors").field("author")); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(new TermQueryBuilder("genre", "fantasy")) .setFrom(0) .setSize(60) @@ -261,8 +255,7 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { sampleAgg = new DiversifiedAggregationBuilder("sample").shardSize(100); sampleAgg.field("author").maxDocsPerValue(Integer.MAX_VALUE).executionHint(randomExecutionHint()); sampleAgg.subAggregation(terms("authors").field("author")); - response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("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/DoubleTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java index 1664db2060e0..7f18e532d7d7 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 @@ -255,14 +255,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSizeIsZero() { IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("high_card_idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .minDocCount(randomInt(1)) - .size(0) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get() + () -> prepareSearch("high_card_idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .minDocCount(randomInt(1)) + .size(0) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get() ); assertThat(exception.getMessage(), containsString("[size] must be greater than 0. Found [0] in [terms]")); } @@ -277,11 +275,9 @@ public class DoubleTermsIT extends AbstractTermsTestCase { private void runTestFieldWithPartitionedFiltering(String field) throws Exception { // Find total number of unique terms - SearchResponse allResponse = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(field).size(10000).collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse allResponse = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field).size(10000).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(allResponse); DoubleTerms terms = allResponse.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -292,13 +288,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase { final int numPartitions = randomIntBetween(2, 4); Set foundTerms = new HashSet<>(); for (int partition = 0; partition < numPartitions; partition++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(field) - .includeExclude(new IncludeExclude(partition, numPartitions)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field) + .includeExclude(new IncludeExclude(partition, numPartitions)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); terms = response.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -312,13 +306,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase { } public void testSingleValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -337,13 +329,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -366,13 +356,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScriptNotUnique() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "(long) (_value / 1000 + 1)", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "(long) (_value / 1000 + 1)", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -406,20 +394,18 @@ public class DoubleTermsIT extends AbstractTermsTestCase { */ public void testScriptSingleValue() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .userValueTypeHint(ValueType.DOUBLE) - .script( - new Script( - ScriptType.INLINE, - CustomScriptPlugin.NAME, - "doc['" + MULTI_VALUED_FIELD_NAME + "'].value", - Collections.emptyMap() - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .userValueTypeHint(ValueType.DOUBLE) + .script( + new Script( + ScriptType.INLINE, + CustomScriptPlugin.NAME, + "doc['" + MULTI_VALUED_FIELD_NAME + "'].value", + Collections.emptyMap() ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -438,20 +424,13 @@ public class DoubleTermsIT extends AbstractTermsTestCase { } public void testScriptMultiValued() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .userValueTypeHint(ValueType.DOUBLE) - .script( - new Script( - ScriptType.INLINE, - CustomScriptPlugin.NAME, - "doc['" + MULTI_VALUED_FIELD_NAME + "']", - Collections.emptyMap() - ) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .userValueTypeHint(ValueType.DOUBLE) + .script( + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['" + MULTI_VALUED_FIELD_NAME + "']", Collections.emptyMap()) + ) + ).get(); assertNoFailures(response); @@ -524,18 +503,16 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySingleValueSubAggregationAscWithSubTermsAgg() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("avg_i", asc)) - .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)) - .subAggregation( - new TermsAggregationBuilder("subTerms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("avg_i", asc)) + .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)) + .subAggregation( + new TermsAggregationBuilder("subTerms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); assertNoFailures(response); @@ -569,14 +546,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySingleBucketSubAggregationAsc() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("num_tags").field("num_tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter", asc)) - .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("num_tags").field("num_tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter", asc)) + .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) + ).get(); assertNoFailures(response); @@ -606,18 +581,16 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySubAggregationAscMultiHierarchyLevels() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").field("num_tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter1>filter2>max", asc)) - .subAggregation( - filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( - filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME)) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").field("num_tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter1>filter2>max", asc)) + .subAggregation( + filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( + filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME)) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -663,13 +636,11 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMissingSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("avg_i", true)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("avg_i", true)) + ).get(); fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation that doesn't exist"); @@ -682,17 +653,14 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByNonMetricsOrMultiBucketSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("num_tags", true)) - .subAggregation( - new TermsAggregationBuilder("num_tags").field("num_tags") - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("num_tags", true)) + .subAggregation( + new TermsAggregationBuilder("num_tags").field("num_tags").collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation which is not of a metrics type"); @@ -705,14 +673,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithUnknownMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME + "2") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.foo", true)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME + "2") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.foo", true)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " @@ -728,14 +694,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithoutMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats", true)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats", true)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " @@ -750,14 +714,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -780,14 +742,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationDesc() throws Exception { boolean asc = false; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -810,14 +770,12 @@ public class DoubleTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueExtendedStatsAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.variance", asc)) - .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.variance", asc)) + .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -854,8 +812,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(functionScoreQuery(scriptFunction(scoringScript))) + SearchResponse response = prepareSearch("idx").setQuery(functionScoreQuery(scriptFunction(scoringScript))) .addAggregation( new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) .userValueTypeHint(ValueType.DOUBLE) @@ -920,15 +877,13 @@ public class DoubleTermsIT extends AbstractTermsTestCase { } private void assertMultiSortResponse(double[] expectedKeys, BucketOrder... order) { - SearchResponse response = client().prepareSearch("sort_idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.compound(order)) - .subAggregation(avg("avg_l").field("l")) - .subAggregation(sum("sum_d").field("d")) - ) - .get(); + SearchResponse response = prepareSearch("sort_idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.compound(order)) + .subAggregation(avg("avg_l").field("l")) + .subAggregation(sum("sum_d").field("d")) + ).get(); assertNoFailures(response); @@ -983,8 +938,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -1002,8 +956,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -1021,7 +974,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java index 065bb5924e04..5971e287882f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java @@ -79,7 +79,7 @@ public class FilterIT extends ESIntegTestCase { } public void testSimple() throws Exception { - SearchResponse response = client().prepareSearch("idx").addAggregation(filter("tag1", termQuery("tag", "tag1"))).get(); + SearchResponse response = prepareSearch("idx").addAggregation(filter("tag1", termQuery("tag", "tag1"))).get(); assertNoFailures(response); @@ -93,7 +93,7 @@ public class FilterIT extends ESIntegTestCase { // https://github.com/elastic/elasticsearch/issues/8438 public void testEmptyFilterDeclarations() throws Exception { QueryBuilder emptyFilter = new BoolQueryBuilder(); - SearchResponse response = client().prepareSearch("idx").addAggregation(filter("tag1", emptyFilter)).get(); + SearchResponse response = prepareSearch("idx").addAggregation(filter("tag1", emptyFilter)).get(); assertNoFailures(response); @@ -103,9 +103,9 @@ public class FilterIT extends ESIntegTestCase { } public void testWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(filter("tag1", termQuery("tag", "tag1")).subAggregation(avg("avg_value").field("value"))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filter("tag1", termQuery("tag", "tag1")).subAggregation(avg("avg_value").field("value")) + ).get(); assertNoFailures(response); @@ -128,9 +128,9 @@ public class FilterIT extends ESIntegTestCase { } public void testAsSubAggregation() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field("value").interval(2L).subAggregation(filter("filter", matchAllQuery()))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field("value").interval(2L).subAggregation(filter("filter", matchAllQuery())) + ).get(); assertNoFailures(response); @@ -147,7 +147,7 @@ public class FilterIT extends ESIntegTestCase { public void testWithContextBasedSubAggregation() throws Exception { try { - client().prepareSearch("idx").addAggregation(filter("tag1", termQuery("tag", "tag1")).subAggregation(avg("avg_value"))).get(); + prepareSearch("idx").addAggregation(filter("tag1", termQuery("tag", "tag1")).subAggregation(avg("avg_value"))).get(); fail( "expected execution to fail - an attempt to have a context based numeric sub-aggregation, but there is not value source" @@ -160,8 +160,7 @@ public class FilterIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation(histogram("histo").field("value").interval(1L).minDocCount(0).subAggregation(filter("filter", matchAllQuery()))) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java index 9e86c4ec80d4..fa8974371a93 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java @@ -98,14 +98,12 @@ public class FiltersIT extends ESIntegTestCase { } public void testSimple() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) ) - .get(); + ).get(); assertNoFailures(response); @@ -128,11 +126,9 @@ public class FiltersIT extends ESIntegTestCase { // https://github.com/elastic/elasticsearch/issues/8438 public void testEmptyFilterDeclarations() throws Exception { QueryBuilder emptyFilter = new BoolQueryBuilder(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters("tags", randomOrder(new KeyedFilter("all", emptyFilter), new KeyedFilter("tag1", termQuery("tag", "tag1")))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters("tags", randomOrder(new KeyedFilter("all", emptyFilter), new KeyedFilter("tag1", termQuery("tag", "tag1")))) + ).get(); assertNoFailures(response); @@ -147,14 +143,12 @@ public class FiltersIT extends ESIntegTestCase { } public void testWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ).subAggregation(avg("avg_value").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) + ).subAggregation(avg("avg_value").field("value")) + ).get(); assertNoFailures(response); @@ -202,9 +196,9 @@ public class FiltersIT extends ESIntegTestCase { } public void testAsSubAggregation() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field("value").interval(2L).subAggregation(filters("filters", matchAllQuery()))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field("value").interval(2L).subAggregation(filters("filters", matchAllQuery())) + ).get(); assertNoFailures(response); @@ -224,14 +218,12 @@ public class FiltersIT extends ESIntegTestCase { public void testWithContextBasedSubAggregation() throws Exception { try { - client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ).subAggregation(avg("avg_value")) - ) - .get(); + prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) + ).subAggregation(avg("avg_value")) + ).get(); fail( "expected execution to fail - an attempt to have a context based numeric sub-aggregation, but there is not value source" @@ -244,8 +236,7 @@ public class FiltersIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -269,8 +260,7 @@ public class FiltersIT extends ESIntegTestCase { } public void testSimpleNonKeyed() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(filters("tags", termQuery("tag", "tag1"), termQuery("tag", "tag2"))) + SearchResponse response = prepareSearch("idx").addAggregation(filters("tags", termQuery("tag", "tag1"), termQuery("tag", "tag2"))) .get(); assertNoFailures(response); @@ -294,14 +284,12 @@ public class FiltersIT extends ESIntegTestCase { } public void testOtherBucket() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ).otherBucket(true) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) + ).otherBucket(true) + ).get(); assertNoFailures(response); @@ -325,14 +313,12 @@ public class FiltersIT extends ESIntegTestCase { } public void testOtherNamedBucket() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ).otherBucket(true).otherBucketKey("foobar") - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) + ).otherBucket(true).otherBucketKey("foobar") + ).get(); assertNoFailures(response); @@ -356,9 +342,9 @@ public class FiltersIT extends ESIntegTestCase { } public void testOtherNonKeyed() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(filters("tags", termQuery("tag", "tag1"), termQuery("tag", "tag2")).otherBucket(true)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters("tags", termQuery("tag", "tag1"), termQuery("tag", "tag2")).otherBucket(true) + ).get(); assertNoFailures(response); @@ -385,14 +371,12 @@ public class FiltersIT extends ESIntegTestCase { } public void testOtherWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filters( - "tags", - randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) - ).otherBucket(true).subAggregation(avg("avg_value").field("value")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + filters( + "tags", + randomOrder(new KeyedFilter("tag1", termQuery("tag", "tag1")), new KeyedFilter("tag2", termQuery("tag", "tag2"))) + ).otherBucket(true).subAggregation(avg("avg_value").field("value")) + ).get(); assertNoFailures(response); @@ -456,8 +440,7 @@ public class FiltersIT extends ESIntegTestCase { } public void testEmptyAggregationWithOtherBucket() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) 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 a7dee3b1507e..64441466c795 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 @@ -142,7 +142,7 @@ public class GeoDistanceIT extends ESIntegTestCase { for (Consumer range : ranges) { range.accept(builder); } - SearchResponse response = client().prepareSearch("idx").addAggregation(builder).get(); + SearchResponse response = prepareSearch("idx").addAggregation(builder).get(); assertNoFailures(response); @@ -181,15 +181,13 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testSimpleWithCustomKeys() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") - .unit(DistanceUnit.KILOMETERS) - .addUnboundedTo("ring1", 500) - .addRange("ring2", 500, 1000) - .addUnboundedFrom("ring3", 1000) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") + .unit(DistanceUnit.KILOMETERS) + .addUnboundedTo("ring1", 500) + .addRange("ring2", 500, 1000) + .addUnboundedFrom("ring3", 1000) + ).get(); assertNoFailures(response); @@ -230,15 +228,13 @@ public class GeoDistanceIT extends ESIntegTestCase { public void testUnmapped() throws Exception { clusterAdmin().prepareHealth("idx_unmapped").setWaitForYellowStatus().get(); - SearchResponse response = client().prepareSearch("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_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); @@ -324,16 +320,14 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") - .unit(DistanceUnit.KILOMETERS) - .addUnboundedTo(500) - .addRange(500, 1000) - .addUnboundedFrom(1000) - .subAggregation(terms("cities").field("city").collectMode(randomFrom(SubAggCollectionMode.values()))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") + .unit(DistanceUnit.KILOMETERS) + .addUnboundedTo(500) + .addRange(500, 1000) + .addUnboundedFrom(1000) + .subAggregation(terms("cities").field("city").collectMode(randomFrom(SubAggCollectionMode.values()))) + ).get(); assertNoFailures(response); @@ -409,8 +403,7 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -441,7 +434,7 @@ public class GeoDistanceIT extends ESIntegTestCase { public void testNoRangesInQuery() { try { - client().prepareSearch("idx").addAggregation(geoDistance("geo_dist", new GeoPoint(52.3760, 4.894)).field("location")).get(); + prepareSearch("idx").addAggregation(geoDistance("geo_dist", new GeoPoint(52.3760, 4.894)).field("location")).get(); fail(); } catch (SearchPhaseExecutionException spee) { Throwable rootCause = spee.getCause().getCause(); @@ -451,16 +444,14 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testMultiValues() throws Exception { - SearchResponse response = client().prepareSearch("idx-multi") - .addAggregation( - geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") - .unit(DistanceUnit.KILOMETERS) - .distanceType(org.elasticsearch.common.geo.GeoDistance.ARC) - .addUnboundedTo(500) - .addRange(500, 1000) - .addUnboundedFrom(1000) - ) - .get(); + SearchResponse response = prepareSearch("idx-multi").addAggregation( + geoDistance("amsterdam_rings", new GeoPoint(52.3760, 4.894)).field("location") + .unit(DistanceUnit.KILOMETERS) + .distanceType(org.elasticsearch.common.geo.GeoDistance.ARC) + .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 078cc9761fb2..2767a1878c11 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 @@ -132,8 +132,7 @@ public class GeoHashGridIT extends ESIntegTestCase { public void testSimple() throws Exception { for (int precision = 1; precision <= PRECISION; precision++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) + SearchResponse response = prepareSearch("idx").addAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) .get(); assertNoFailures(response); @@ -159,9 +158,9 @@ public class GeoHashGridIT extends ESIntegTestCase { public void testMultivalued() throws Exception { for (int precision = 1; precision <= PRECISION; precision++) { - SearchResponse response = client().prepareSearch("multi_valued_idx") - .addAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) - .get(); + SearchResponse response = prepareSearch("multi_valued_idx").addAggregation( + geohashGrid("geohashgrid").field("location").precision(precision) + ).get(); assertNoFailures(response); @@ -181,12 +180,10 @@ public class GeoHashGridIT extends ESIntegTestCase { GeoBoundingBoxQueryBuilder bbox = new GeoBoundingBoxQueryBuilder("location"); bbox.setCorners(smallestGeoHash).queryName("bbox"); for (int precision = 1; precision <= PRECISION; precision++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - AggregationBuilders.filter("filtered", bbox) - .subAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + AggregationBuilders.filter("filtered", bbox) + .subAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) + ).get(); assertNoFailures(response); @@ -207,9 +204,9 @@ public class GeoHashGridIT extends ESIntegTestCase { public void testUnmapped() throws Exception { for (int precision = 1; precision <= PRECISION; precision++) { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation(geohashGrid("geohashgrid").field("location").precision(precision)) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + geohashGrid("geohashgrid").field("location").precision(precision) + ).get(); assertNoFailures(response); @@ -241,9 +238,9 @@ public class GeoHashGridIT extends ESIntegTestCase { public void testTopMatch() throws Exception { for (int precision = 1; precision <= PRECISION; precision++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(geohashGrid("geohashgrid").field("location").size(1).shardSize(100).precision(precision)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + geohashGrid("geohashgrid").field("location").size(1).shardSize(100).precision(precision) + ).get(); assertNoFailures(response); @@ -270,9 +267,7 @@ public class GeoHashGridIT extends ESIntegTestCase { final int shardSize = 10000; IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .addAggregation(geohashGrid("geohashgrid").field("location").size(size).shardSize(shardSize)) - .get() + () -> prepareSearch("idx").addAggregation(geohashGrid("geohashgrid").field("location").size(size).shardSize(shardSize)).get() ); assertThat(exception.getMessage(), containsString("[size] must be greater than 0. Found [0] in [geohashgrid]")); } @@ -282,9 +277,7 @@ public class GeoHashGridIT extends ESIntegTestCase { final int shardSize = 0; IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .addAggregation(geohashGrid("geohashgrid").field("location").size(size).shardSize(shardSize)) - .get() + () -> prepareSearch("idx").addAggregation(geohashGrid("geohashgrid").field("location").size(size).shardSize(shardSize)).get() ); assertThat(exception.getMessage(), containsString("[shardSize] must be greater than 0. Found [0] in [geohashgrid]")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java index 80133961ad73..347b2324027c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java @@ -60,8 +60,7 @@ public class GlobalIT extends ESIntegTestCase { } public void testWithStatsSubAggregator() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.termQuery("tag", "tag1")) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.termQuery("tag", "tag1")) .addAggregation(global("global").subAggregation(stats("value_stats").field("value"))) .get(); @@ -91,8 +90,7 @@ public class GlobalIT extends ESIntegTestCase { public void testNonTopLevel() throws Exception { try { - client().prepareSearch("idx") - .setQuery(QueryBuilders.termQuery("tag", "tag1")) + prepareSearch("idx").setQuery(QueryBuilders.termQuery("tag", "tag1")) .addAggregation(global("global").subAggregation(global("inner_global"))) .get(); 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 b92320c48ed1..f644c89ddbc5 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 @@ -234,8 +234,7 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval)) + SearchResponse response = prepareSearch("idx").addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval)) .get(); assertNoFailures(response); @@ -257,9 +256,9 @@ public class HistogramIT extends ESIntegTestCase { public void singleValuedField_withOffset() throws Exception { int interval1 = 10; int offset = 5; - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval1).offset(offset)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval1).offset(offset) + ).get(); // from setup we have between 6 and 20 documents, each with value 1 in test field int expectedNumberOfBuckets = (offset >= (numDocs % interval + 1)) ? numValueBuckets : numValueBuckets + 1; @@ -287,9 +286,9 @@ public class HistogramIT extends ESIntegTestCase { */ public void testSingleValuedFieldWithRandomOffset() throws Exception { int offset = randomIntBetween(2, interval); - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).offset(offset)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).offset(offset) + ).get(); assertNoFailures(response); // shifting by offset>2 creates new extra bucket [0,offset-1] // if offset is >= number of values in original last bucket, that effect is canceled @@ -320,9 +319,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByKeyAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(true))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(true)) + ).get(); assertNoFailures(response); @@ -341,9 +340,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testsingleValuedFieldOrderedByKeyDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(false))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(false)) + ).get(); assertNoFailures(response); @@ -362,9 +361,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByCountAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.count(true))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.count(true)) + ).get(); assertNoFailures(response); @@ -389,9 +388,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByCountDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.count(false))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.count(false)) + ).get(); assertNoFailures(response); @@ -416,13 +415,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -458,14 +453,12 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedBySubAggregationAsc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("sum", true)) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("sum", true)) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -500,14 +493,12 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedBySubAggregationDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("sum", false)) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("sum", false)) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -542,14 +533,12 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByMultiValuedSubAggregationDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("stats.sum", false)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("stats.sum", false)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -586,14 +575,12 @@ public class HistogramIT extends ESIntegTestCase { public void testSingleValuedFieldOrderedBySubAggregationDescDeepOrderPath() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("filter>max", asc)) - .subAggregation(filter("filter", matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("filter>max", asc)) + .subAggregation(filter("filter", matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME))) + ).get(); assertNoFailures(response); @@ -624,14 +611,12 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldOrderedByTieBreaker() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("max_constant", randomBoolean())) - .subAggregation(max("max_constant").field("constant")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("max_constant", randomBoolean())) + .subAggregation(max("max_constant").field("constant")) + ).get(); assertNoFailures(response); @@ -652,18 +637,14 @@ public class HistogramIT extends ESIntegTestCase { public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception { boolean asc = true; try { - client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .order(BucketOrder.aggregation("inner_histo>avg", asc)) - .subAggregation( - histogram("inner_histo").interval(interval) - .field(MULTI_VALUED_FIELD_NAME) - .subAggregation(avg("avg").field("value")) - ) - ) - .get(); + prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .order(BucketOrder.aggregation("inner_histo>avg", asc)) + .subAggregation( + histogram("inner_histo").interval(interval).field(MULTI_VALUED_FIELD_NAME).subAggregation(avg("avg").field("value")) + ) + ).get(); fail("Expected an exception"); } catch (SearchPhaseExecutionException e) { ElasticsearchException[] rootCauses = e.guessRootCauses(); @@ -681,13 +662,11 @@ public class HistogramIT extends ESIntegTestCase { } public void testSingleValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", emptyMap())) - .interval(interval) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", emptyMap())) + .interval(interval) + ).get(); assertNoFailures(response); @@ -713,8 +692,7 @@ public class HistogramIT extends ESIntegTestCase { } public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).interval(interval)) + SearchResponse response = prepareSearch("idx").addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).interval(interval)) .get(); assertNoFailures(response); @@ -734,9 +712,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testMultiValuedFieldOrderedByKeyDesc() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(histogram("histo").field(MULTI_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(false))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(MULTI_VALUED_FIELD_NAME).interval(interval).order(BucketOrder.key(false)) + ).get(); assertNoFailures(response); @@ -755,13 +733,11 @@ public class HistogramIT extends ESIntegTestCase { } public void testMultiValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(MULTI_VALUED_FIELD_NAME) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", emptyMap())) - .interval(interval) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(MULTI_VALUED_FIELD_NAME) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", emptyMap())) + .interval(interval) + ).get(); assertNoFailures(response); @@ -792,12 +768,10 @@ public class HistogramIT extends ESIntegTestCase { } public void testScriptSingleValue() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['l_value'].value", emptyMap())) - .interval(interval) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['l_value'].value", emptyMap())) + .interval(interval) + ).get(); assertNoFailures(response); @@ -816,12 +790,10 @@ public class HistogramIT extends ESIntegTestCase { } public void testScriptMultiValued() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['l_values']", emptyMap())) - .interval(interval) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['l_values']", emptyMap())) + .interval(interval) + ).get(); assertNoFailures(response); @@ -840,9 +812,9 @@ public class HistogramIT extends ESIntegTestCase { } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval)) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval) + ).get(); assertNoFailures(response); @@ -909,8 +881,7 @@ public class HistogramIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field(SINGLE_VALUED_FIELD_NAME) .interval(1L) @@ -968,14 +939,9 @@ public class HistogramIT extends ESIntegTestCase { SearchResponse response = null; try { - response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .minDocCount(0) - .extendedBounds(boundsMin, boundsMax) - ) - .get(); + response = prepareSearch("idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(interval).minDocCount(0).extendedBounds(boundsMin, boundsMax) + ).get(); if (invalidBoundsError) { fail("Expected an exception to be thrown when bounds.min is greater than bounds.max"); @@ -1044,8 +1010,7 @@ public class HistogramIT extends ESIntegTestCase { SearchResponse response = null; try { - response = client().prepareSearch("idx") - .setQuery(QueryBuilders.termQuery("foo", "bar")) + response = prepareSearch("idx").setQuery(QueryBuilders.termQuery("foo", "bar")) .addAggregation( histogram("histo").field(SINGLE_VALUED_FIELD_NAME) .interval(interval) @@ -1090,8 +1055,7 @@ public class HistogramIT extends ESIntegTestCase { */ public void testExeptionOnNegativerInterval() { try { - client().prepareSearch("empty_bucket_idx") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(-1).minDocCount(0)) + prepareSearch("empty_bucket_idx").addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(-1).minDocCount(0)) .get(); fail(); } catch (IllegalArgumentException e) { @@ -1107,9 +1071,7 @@ public class HistogramIT extends ESIntegTestCase { client().prepareIndex("decimal_values").setId("2").setSource("d", 0.1) ); - SearchResponse r = client().prepareSearch("decimal_values") - .addAggregation(histogram("histo").field("d").interval(0.7).offset(0.05)) - .get(); + SearchResponse r = prepareSearch("decimal_values").addAggregation(histogram("histo").field("d").interval(0.7).offset(0.05)).get(); assertNoFailures(r); Histogram histogram = r.getAggregations().get("histo"); @@ -1148,8 +1110,7 @@ public class HistogramIT extends ESIntegTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( histogram("histo").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "Math.random()", emptyMap())) @@ -1169,8 +1130,7 @@ public class HistogramIT extends ESIntegTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( histogram("histo").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", emptyMap())) @@ -1190,10 +1150,7 @@ public class HistogramIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) - .addAggregation(histogram("histo").field("d").interval(0.7).offset(0.05)) - .get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(histogram("histo").field("d").interval(0.7).offset(0.05)).get(); assertNoFailures(r); assertThat( @@ -1249,21 +1206,17 @@ public class HistogramIT extends ESIntegTestCase { public void testInvalidBounds() { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("empty_bucket_idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME).hardBounds(new DoubleBounds(0.0, 10.0)).extendedBounds(3, 20) - ) - .get() + () -> prepareSearch("empty_bucket_idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).hardBounds(new DoubleBounds(0.0, 10.0)).extendedBounds(3, 20) + ).get() ); assertThat(e.toString(), containsString("Extended bounds have to be inside hard bounds, hard bounds")); e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("empty_bucket_idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME).hardBounds(new DoubleBounds(3.0, null)).extendedBounds(0, 20) - ) - .get() + () -> prepareSearch("empty_bucket_idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME).hardBounds(new DoubleBounds(3.0, null)).extendedBounds(0, 20) + ).get() ); assertThat(e.toString(), containsString("Extended bounds have to be inside hard bounds, hard bounds")); } @@ -1277,9 +1230,9 @@ public class HistogramIT extends ESIntegTestCase { client().prepareIndex("test").setId("3").setSource("d", 0.1) ); - SearchResponse r = client().prepareSearch("test") - .addAggregation(histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(0.0, null))) - .get(); + SearchResponse r = prepareSearch("test").addAggregation( + histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(0.0, null)) + ).get(); assertNoFailures(r); Histogram histogram = r.getAggregations().get("histo"); @@ -1288,9 +1241,7 @@ public class HistogramIT extends ESIntegTestCase { assertEquals(0.1, (double) buckets.get(0).getKey(), 0.01d); assertEquals(0.5, (double) buckets.get(4).getKey(), 0.01d); - r = client().prepareSearch("test") - .addAggregation(histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(null, 0.0))) - .get(); + r = prepareSearch("test").addAggregation(histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(null, 0.0))).get(); assertNoFailures(r); histogram = r.getAggregations().get("histo"); @@ -1298,9 +1249,7 @@ public class HistogramIT extends ESIntegTestCase { assertEquals(1, buckets.size()); assertEquals(-0.6, (double) buckets.get(0).getKey(), 0.01d); - r = client().prepareSearch("test") - .addAggregation(histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(0.0, 0.3))) - .get(); + r = prepareSearch("test").addAggregation(histogram("histo").field("d").interval(0.1).hardBounds(new DoubleBounds(0.0, 0.3))).get(); assertNoFailures(r); histogram = r.getAggregations().get("histo"); @@ -1311,15 +1260,13 @@ public class HistogramIT extends ESIntegTestCase { } private void assertMultiSortResponse(long[] expectedKeys, BucketOrder... order) { - SearchResponse response = client().prepareSearch("sort_idx") - .addAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(1) - .order(BucketOrder.compound(order)) - .subAggregation(avg("avg_l").field("l")) - .subAggregation(sum("sum_d").field("d")) - ) - .get(); + SearchResponse response = prepareSearch("sort_idx").addAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(1) + .order(BucketOrder.compound(order)) + .subAggregation(avg("avg_l").field("l")) + .subAggregation(sum("sum_d").field("d")) + ).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 1768773ba769..0a076721c2e0 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 @@ -64,15 +64,13 @@ public class IpRangeIT extends ESIntegTestCase { } public void testSingleValuedField() { - SearchResponse rsp = client().prepareSearch("idx") - .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").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()); @@ -97,15 +95,13 @@ public class IpRangeIT extends ESIntegTestCase { } public void testMultiValuedField() { - SearchResponse rsp = client().prepareSearch("idx") - .addAggregation( - AggregationBuilders.ipRange("my_range") - .field("ips") - .addUnboundedTo("192.168.1.0") - .addRange("192.168.1.0", "192.168.1.10") - .addUnboundedFrom("192.168.1.10") - ) - .get(); + SearchResponse rsp = prepareSearch("idx").addAggregation( + AggregationBuilders.ipRange("my_range") + .field("ips") + .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()); @@ -130,15 +126,13 @@ public class IpRangeIT extends ESIntegTestCase { } public void testIpMask() { - SearchResponse rsp = client().prepareSearch("idx") - .addAggregation( - AggregationBuilders.ipRange("my_range") - .field("ips") - .addMaskRange("::/0") - .addMaskRange("0.0.0.0/0") - .addMaskRange("2001:db8::/64") - ) - .get(); + SearchResponse rsp = prepareSearch("idx").addAggregation( + AggregationBuilders.ipRange("my_range") + .field("ips") + .addMaskRange("::/0") + .addMaskRange("0.0.0.0/0") + .addMaskRange("2001:db8::/64") + ).get(); assertNoFailures(rsp); Range range = rsp.getAggregations().get("my_range"); assertEquals(3, range.getBuckets().size()); @@ -190,15 +184,13 @@ public class IpRangeIT extends ESIntegTestCase { } public void testUnmapped() { - SearchResponse rsp = client().prepareSearch("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_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()); @@ -225,12 +217,9 @@ public class IpRangeIT extends ESIntegTestCase { public void testRejectsScript() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .addAggregation( - AggregationBuilders.ipRange("my_range") - .script(new Script(ScriptType.INLINE, "mockscript", "dummy", Collections.emptyMap())) - ) - .get() + () -> prepareSearch("idx").addAggregation( + AggregationBuilders.ipRange("my_range").script(new Script(ScriptType.INLINE, "mockscript", "dummy", Collections.emptyMap())) + ).get() ); assertThat(e.getMessage(), containsString("[ip_range] does not support scripts")); } @@ -238,20 +227,18 @@ public class IpRangeIT extends ESIntegTestCase { public void testRejectsValueScript() { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .addAggregation( - AggregationBuilders.ipRange("my_range") - .field("ip") - .script(new Script(ScriptType.INLINE, "mockscript", "dummy", Collections.emptyMap())) - ) - .get() + () -> prepareSearch("idx").addAggregation( + AggregationBuilders.ipRange("my_range") + .field("ip") + .script(new Script(ScriptType.INLINE, "mockscript", "dummy", Collections.emptyMap())) + ).get() ); assertThat(e.getMessage(), containsString("[ip_range] does not support scripts")); } public void testNoRangesInQuery() { try { - client().prepareSearch("idx").addAggregation(AggregationBuilders.ipRange("my_range").field("ip")).get(); + prepareSearch("idx").addAggregation(AggregationBuilders.ipRange("my_range").field("ip")).get(); fail(); } catch (SearchPhaseExecutionException spee) { Throwable rootCause = spee.getCause().getCause(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java index 51733d98fd80..d50ea294287e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/IpTermsIT.java @@ -61,9 +61,9 @@ public class IpTermsIT extends AbstractTermsTestCase { ); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['ip'].value", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("index") - .addAggregation(new TermsAggregationBuilder("my_terms").script(script).executionHint(randomExecutionHint())) - .get(); + SearchResponse response = prepareSearch("index").addAggregation( + new TermsAggregationBuilder("my_terms").script(script).executionHint(randomExecutionHint()) + ).get(); assertNoFailures(response); StringTerms terms = response.getAggregations().get("my_terms"); assertEquals(2, terms.getBuckets().size()); @@ -89,9 +89,9 @@ public class IpTermsIT extends AbstractTermsTestCase { ); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['ip']", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("index") - .addAggregation(new TermsAggregationBuilder("my_terms").script(script).executionHint(randomExecutionHint())) - .get(); + SearchResponse response = prepareSearch("index").addAggregation( + new TermsAggregationBuilder("my_terms").script(script).executionHint(randomExecutionHint()) + ).get(); assertNoFailures(response); StringTerms terms = response.getAggregations().get("my_terms"); assertEquals(2, terms.getBuckets().size()); @@ -116,9 +116,9 @@ public class IpTermsIT extends AbstractTermsTestCase { client().prepareIndex("index").setId("3").setSource("ip", "127.0.0.1"), client().prepareIndex("index").setId("4").setSource("not_ip", "something") ); - SearchResponse response = client().prepareSearch("index") - .addAggregation(new TermsAggregationBuilder("my_terms").field("ip").missing("127.0.0.1").executionHint(randomExecutionHint())) - .get(); + SearchResponse response = prepareSearch("index").addAggregation( + new TermsAggregationBuilder("my_terms").field("ip").missing("127.0.0.1").executionHint(randomExecutionHint()) + ).get(); assertNoFailures(response); StringTerms terms = response.getAggregations().get("my_terms"); 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 d65a246aedc5..67f244eabbd3 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 @@ -243,14 +243,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSizeIsZero() { IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("high_card_idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .minDocCount(randomInt(1)) - .size(0) - ) - .get() + () -> prepareSearch("high_card_idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .minDocCount(randomInt(1)) + .size(0) + ).get() ); assertThat(exception.getMessage(), containsString("[size] must be greater than 0. Found [0] in [terms]")); } @@ -265,9 +263,9 @@ public class LongTermsIT extends AbstractTermsTestCase { private void runTestFieldWithPartitionedFiltering(String field) throws Exception { // Find total number of unique terms - SearchResponse allResponse = client().prepareSearch("idx") - .addAggregation(new TermsAggregationBuilder("terms").field(field).collectMode(randomFrom(SubAggCollectionMode.values()))) - .get(); + SearchResponse allResponse = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(allResponse); LongTerms terms = allResponse.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -278,13 +276,11 @@ public class LongTermsIT extends AbstractTermsTestCase { final int numPartitions = randomIntBetween(2, 4); Set foundTerms = new HashSet<>(); for (int partition = 0; partition < numPartitions; partition++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(field) - .includeExclude(new IncludeExclude(partition, numPartitions)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field) + .includeExclude(new IncludeExclude(partition, numPartitions)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); terms = response.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -298,13 +294,11 @@ public class LongTermsIT extends AbstractTermsTestCase { } public void testSingleValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -324,13 +318,11 @@ public class LongTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value - 1", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value - 1", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -354,13 +346,11 @@ public class LongTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScriptNotUnique() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "floor(_value / 1000 + 1)", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "floor(_value / 1000 + 1)", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -402,13 +392,11 @@ public class LongTermsIT extends AbstractTermsTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .userValueTypeHint(ValueType.LONG) - .script(script) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .userValueTypeHint(ValueType.LONG) + .script(script) + ).get(); assertNoFailures(response); @@ -435,13 +423,11 @@ public class LongTermsIT extends AbstractTermsTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .userValueTypeHint(ValueType.LONG) - .script(script) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .userValueTypeHint(ValueType.LONG) + .script(script) + ).get(); assertNoFailures(response); @@ -514,18 +500,16 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySingleValueSubAggregationAscWithTermsSubAgg() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("avg_i", asc)) - .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)) - .subAggregation( - new TermsAggregationBuilder("subTerms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("avg_i", asc)) + .subAggregation(avg("avg_i").field(SINGLE_VALUED_FIELD_NAME)) + .subAggregation( + new TermsAggregationBuilder("subTerms").field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); assertNoFailures(response); @@ -559,14 +543,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySingleBucketSubAggregationAsc() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("num_tags").field("num_tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter", asc)) - .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("num_tags").field("num_tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter", asc)) + .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) + ).get(); assertNoFailures(response); @@ -596,18 +578,16 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySubAggregationAscMultiHierarchyLevels() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").field("num_tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter1>filter2>max", asc)) - .subAggregation( - filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( - filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME)) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").field("num_tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter1>filter2>max", asc)) + .subAggregation( + filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( + filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(max("max").field(SINGLE_VALUED_FIELD_NAME)) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -653,13 +633,11 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMissingSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("avg_i", true)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("avg_i", true)) + ).get(); fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation that doesn't exist"); @@ -672,17 +650,14 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByNonMetricsOrMultiBucketSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("num_tags", true)) - .subAggregation( - new TermsAggregationBuilder("num_tags").field("num_tags") - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("num_tags", true)) + .subAggregation( + new TermsAggregationBuilder("num_tags").field("num_tags").collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation which is not of a metrics type"); @@ -695,14 +670,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithUnknownMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.foo", true)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.foo", true)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " @@ -718,14 +691,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithoutMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats", true)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats", true)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " @@ -740,14 +711,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -771,14 +740,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationDesc() throws Exception { boolean asc = false; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -802,14 +769,12 @@ public class LongTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueExtendedStatsAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.variance", asc)) - .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.variance", asc)) + .subAggregation(extendedStats("stats").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -872,15 +837,13 @@ public class LongTermsIT extends AbstractTermsTestCase { } private void assertMultiSortResponse(long[] expectedKeys, BucketOrder... order) { - SearchResponse response = client().prepareSearch("sort_idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.compound(order)) - .subAggregation(avg("avg_l").field("l")) - .subAggregation(sum("sum_d").field("d")) - ) - .get(); + SearchResponse response = prepareSearch("sort_idx").addAggregation( + new TermsAggregationBuilder("terms").field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.compound(order)) + .subAggregation(avg("avg_l").field("l")) + .subAggregation(sum("sum_d").field("d")) + ).get(); assertNoFailures(response); @@ -935,8 +898,7 @@ public class LongTermsIT extends AbstractTermsTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -954,8 +916,7 @@ public class LongTermsIT extends AbstractTermsTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -973,7 +934,7 @@ public class LongTermsIT extends AbstractTermsTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java index 3a49c5ba7132..36ba2a988668 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/MinDocCountIT.java @@ -306,8 +306,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { private void testMinDocCountOnTerms(String field, Script script, BucketOrder order, String include, boolean retry) throws Exception { // all terms - final SearchResponse allTermsResponse = client().prepareSearch("idx") - .setSize(0) + final SearchResponse allTermsResponse = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation( script.apply(terms("terms"), field) @@ -325,8 +324,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { for (long minDocCount = 0; minDocCount < 20; ++minDocCount) { final int size = randomIntBetween(1, cardinality + 2); - final SearchRequest request = client().prepareSearch("idx") - .setSize(0) + final SearchRequest request = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation( script.apply(terms("terms"), field) @@ -379,8 +377,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { private void testMinDocCountOnHistogram(BucketOrder order) throws Exception { final int interval = randomIntBetween(1, 3); - final SearchResponse allResponse = client().prepareSearch("idx") - .setSize(0) + final SearchResponse allResponse = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation(histogram("histo").field("d").interval(interval).order(order).minDocCount(0)) .get(); @@ -388,8 +385,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { final Histogram allHisto = allResponse.getAggregations().get("histo"); for (long minDocCount = 0; minDocCount < 50; ++minDocCount) { - final SearchResponse response = client().prepareSearch("idx") - .setSize(0) + final SearchResponse response = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation(histogram("histo").field("d").interval(interval).order(order).minDocCount(minDocCount)) .get(); @@ -398,8 +394,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { } private void testMinDocCountOnDateHistogram(BucketOrder order) throws Exception { - final SearchResponse allResponse = client().prepareSearch("idx") - .setSize(0) + final SearchResponse allResponse = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation(dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).order(order).minDocCount(0)) .get(); @@ -407,8 +402,7 @@ public class MinDocCountIT extends AbstractTermsTestCase { final Histogram allHisto = allResponse.getAggregations().get("histo"); for (long minDocCount = 0; minDocCount < 50; ++minDocCount) { - final SearchResponse response = client().prepareSearch("idx") - .setSize(0) + final SearchResponse response = prepareSearch("idx").setSize(0) .setQuery(QUERY) .addAggregation( dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).order(order).minDocCount(minDocCount) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java index d015825d775d..eb2ad6de7789 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java @@ -145,14 +145,12 @@ public class NaNSortingIT extends ESIntegTestCase { public void testTerms(String fieldName) { final boolean asc = randomBoolean(); SubAggregation agg = randomFrom(SubAggregation.values()); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").field(fieldName) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(agg.builder()) - .order(BucketOrder.aggregation(agg.sortKey(), asc)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").field(fieldName) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(agg.builder()) + .order(BucketOrder.aggregation(agg.sortKey(), asc)) + ).get(); assertNoFailures(response); final Terms terms = response.getAggregations().get("terms"); @@ -174,14 +172,12 @@ public class NaNSortingIT extends ESIntegTestCase { public void testLongHistogram() { final boolean asc = randomBoolean(); SubAggregation agg = randomFrom(SubAggregation.values()); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field("long_value") - .interval(randomIntBetween(1, 2)) - .subAggregation(agg.builder()) - .order(BucketOrder.aggregation(agg.sortKey(), asc)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field("long_value") + .interval(randomIntBetween(1, 2)) + .subAggregation(agg.builder()) + .order(BucketOrder.aggregation(agg.sortKey(), asc)) + ).get(); assertNoFailures(response); final Histogram histo = response.getAggregations().get("histo"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java index e9ec509e3b4c..2ab107c2580c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java @@ -177,9 +177,9 @@ public class NestedIT extends ESIntegTestCase { } public void testSimple() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(nested("nested", "nested").subAggregation(stats("nested_value_stats").field("nested.value"))) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + nested("nested", "nested").subAggregation(stats("nested_value_stats").field("nested.value")) + ).get(); assertNoFailures(response); @@ -213,9 +213,9 @@ public class NestedIT extends ESIntegTestCase { } public void testNonExistingNestedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .addAggregation(nested("nested", "value").subAggregation(stats("nested_value_stats").field("nested.value"))) - .get(); + SearchResponse searchResponse = prepareSearch("idx").addAggregation( + nested("nested", "value").subAggregation(stats("nested_value_stats").field("nested.value")) + ).get(); Nested nested = searchResponse.getAggregations().get("nested"); assertThat(nested, Matchers.notNullValue()); @@ -224,11 +224,9 @@ public class NestedIT extends ESIntegTestCase { } public void testNestedWithSubTermsAgg() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - nested("nested", "nested").subAggregation(terms("values").field("nested.value").size(100).collectMode(aggCollectionMode)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + nested("nested", "nested").subAggregation(terms("values").field("nested.value").size(100).collectMode(aggCollectionMode)) + ).get(); assertNoFailures(response); @@ -274,14 +272,12 @@ public class NestedIT extends ESIntegTestCase { } public void testNestedAsSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("top_values").field("value") - .size(100) - .collectMode(aggCollectionMode) - .subAggregation(nested("nested", "nested").subAggregation(max("max_value").field("nested.value"))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("top_values").field("value") + .size(100) + .collectMode(aggCollectionMode) + .subAggregation(nested("nested", "nested").subAggregation(max("max_value").field("nested.value"))) + ).get(); assertNoFailures(response); @@ -303,15 +299,13 @@ public class NestedIT extends ESIntegTestCase { } public void testNestNestedAggs() throws Exception { - SearchResponse response = client().prepareSearch("idx_nested_nested_aggs") - .addAggregation( - nested("level1", "nested1").subAggregation( - terms("a").field("nested1.a.keyword") - .collectMode(aggCollectionMode) - .subAggregation(nested("level2", "nested1.nested2").subAggregation(sum("sum").field("nested1.nested2.b"))) - ) + SearchResponse response = prepareSearch("idx_nested_nested_aggs").addAggregation( + nested("level1", "nested1").subAggregation( + terms("a").field("nested1.a.keyword") + .collectMode(aggCollectionMode) + .subAggregation(nested("level2", "nested1.nested2").subAggregation(sum("sum").field("nested1.nested2.b"))) ) - .get(); + ).get(); assertNoFailures(response); Nested level1 = response.getAggregations().get("level1"); @@ -339,8 +333,7 @@ public class NestedIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation(histogram("histo").field("value").interval(1L).minDocCount(0).subAggregation(nested("nested", "nested"))) .get(); @@ -475,26 +468,22 @@ public class NestedIT extends ESIntegTestCase { }""", XContentType.JSON)); indexRandom(true, indexRequests); - SearchResponse response = client().prepareSearch("idx2") - .addAggregation( - terms("startDate").field("dates.month.start") - .subAggregation( - terms("endDate").field("dates.month.end") - .subAggregation( - terms("period").field("dates.month.label") - .subAggregation( - nested("ctxt_idfier_nested", "comments").subAggregation( - filter("comment_filter", termQuery("comments.identifier", "29111")).subAggregation( - nested("nested_tags", "comments.tags").subAggregation( - terms("tag").field("comments.tags.name") - ) - ) + SearchResponse response = prepareSearch("idx2").addAggregation( + terms("startDate").field("dates.month.start") + .subAggregation( + terms("endDate").field("dates.month.end") + .subAggregation( + terms("period").field("dates.month.label") + .subAggregation( + nested("ctxt_idfier_nested", "comments").subAggregation( + filter("comment_filter", termQuery("comments.identifier", "29111")).subAggregation( + nested("nested_tags", "comments.tags").subAggregation(terms("tag").field("comments.tags.name")) ) ) - ) - ) - ) - .get(); + ) + ) + ) + ).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -584,12 +573,10 @@ public class NestedIT extends ESIntegTestCase { .get(); refresh(); - SearchResponse response = client().prepareSearch("idx4") - .addAggregation( - terms("category").field("categories") - .subAggregation(nested("property", "property").subAggregation(terms("property_id").field("property.id"))) - ) - .get(); + SearchResponse response = prepareSearch("idx4").addAggregation( + terms("category").field("categories") + .subAggregation(nested("property", "property").subAggregation(terms("property_id").field("property.id"))) + ).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -760,33 +747,29 @@ public class NestedIT extends ESIntegTestCase { .get(); refresh(); - SearchResponse response = client().prepareSearch("classes") - .addAggregation( - nested("to_method", "methods").subAggregation( - filter( - "num_string_params", - nestedQuery("methods.parameters", termQuery("methods.parameters.type", "String"), ScoreMode.None) - ) + SearchResponse response = prepareSearch("classes").addAggregation( + nested("to_method", "methods").subAggregation( + filter( + "num_string_params", + nestedQuery("methods.parameters", termQuery("methods.parameters.type", "String"), ScoreMode.None) ) ) - .get(); + ).get(); Nested toMethods = response.getAggregations().get("to_method"); Filter numStringParams = toMethods.getAggregations().get("num_string_params"); assertThat(numStringParams.getDocCount(), equalTo(3L)); - response = client().prepareSearch("classes") - .addAggregation( - nested("to_method", "methods").subAggregation( - terms("return_type").field("methods.return_type") - .subAggregation( - filter( - "num_string_params", - nestedQuery("methods.parameters", termQuery("methods.parameters.type", "String"), ScoreMode.None) - ) + response = prepareSearch("classes").addAggregation( + nested("to_method", "methods").subAggregation( + terms("return_type").field("methods.return_type") + .subAggregation( + filter( + "num_string_params", + nestedQuery("methods.parameters", termQuery("methods.parameters.type", "String"), ScoreMode.None) ) - ) + ) ) - .get(); + ).get(); toMethods = response.getAggregations().get("to_method"); Terms terms = toMethods.getAggregations().get("return_type"); Bucket bucket = terms.getBucketByKey("void"); @@ -812,14 +795,11 @@ public class NestedIT extends ESIntegTestCase { ); ensureGreen("idxduplicatehitnames"); - SearchRequestBuilder searchRequestBuilder = client().prepareSearch("idxduplicatehitnames") - .setQuery( - boolQuery().should( - nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih1")) - ) - .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih2"))) - .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih1"))) - ); + SearchRequestBuilder searchRequestBuilder = prepareSearch("idxduplicatehitnames").setQuery( + boolQuery().should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih1"))) + .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih2"))) + .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder("ih1"))) + ); assertFailures( searchRequestBuilder, @@ -835,12 +815,11 @@ public class NestedIT extends ESIntegTestCase { ); ensureGreen("idxnullhitnames"); - SearchRequestBuilder searchRequestBuilder = client().prepareSearch("idxnullhitnames") - .setQuery( - boolQuery().should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) - .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) - .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) - ); + SearchRequestBuilder searchRequestBuilder = prepareSearch("idxnullhitnames").setQuery( + boolQuery().should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) + .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) + .should(nestedQuery("property", termQuery("property.id", 1D), ScoreMode.None).innerHit(new InnerHitBuilder())) + ); assertFailures( searchRequestBuilder, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RandomSamplerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RandomSamplerIT.java index a22ed8e66ba9..66978eba00e2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RandomSamplerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RandomSamplerIT.java @@ -92,13 +92,11 @@ public class RandomSamplerIT extends ESIntegTestCase { double sampledDocCount = 0.0; for (int i = 0; i < NUM_SAMPLE_RUNS; i++) { - SearchRequest sampledRequest = client().prepareSearch("idx") - .addAggregation( - new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY) - .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) - .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) - ) - .request(); + SearchRequest sampledRequest = prepareSearch("idx").addAggregation( + new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY) + .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) + .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) + ).request(); InternalRandomSampler sampler = client().search(sampledRequest).actionGet().getAggregations().get("sampler"); sampleMonotonicValue += ((Avg) sampler.getAggregations().get("mean_monotonic")).getValue(); sampleNumericValue += ((Avg) sampler.getAggregations().get("mean_numeric")).getValue(); @@ -114,8 +112,7 @@ public class RandomSamplerIT extends ESIntegTestCase { double maxCountError = 6.0 * Math.sqrt(PROBABILITY * numDocs / NUM_SAMPLE_RUNS); assertThat(Math.abs(sampledDocCount - expectedDocCount), lessThan(maxCountError)); - SearchResponse trueValueResponse = client().prepareSearch("idx") - .addAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) + SearchResponse trueValueResponse = prepareSearch("idx").addAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) .addAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) .get(); double trueMonotonic = ((Avg) trueValueResponse.getAggregations().get("mean_monotonic")).getValue(); @@ -132,17 +129,15 @@ public class RandomSamplerIT extends ESIntegTestCase { Map sampledDocCount = new HashMap<>(); for (int i = 0; i < NUM_SAMPLE_RUNS; i++) { - SearchRequest sampledRequest = client().prepareSearch("idx") - .addAggregation( - new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY) - .subAggregation( - histogram("histo").field(NUMERIC_VALUE) - .interval(5.0) - .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) - .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) - ) - ) - .request(); + SearchRequest sampledRequest = prepareSearch("idx").addAggregation( + new RandomSamplerAggregationBuilder("sampler").setProbability(PROBABILITY) + .subAggregation( + histogram("histo").field(NUMERIC_VALUE) + .interval(5.0) + .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) + .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) + ) + ).request(); InternalRandomSampler sampler = client().search(sampledRequest).actionGet().getAggregations().get("sampler"); Histogram histo = sampler.getAggregations().get("histo"); for (Histogram.Bucket bucket : histo.getBuckets()) { @@ -163,14 +158,12 @@ public class RandomSamplerIT extends ESIntegTestCase { sampleMonotonicValue.put(key, sampleMonotonicValue.get(key) / NUM_SAMPLE_RUNS); } - SearchResponse trueValueResponse = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(NUMERIC_VALUE) - .interval(5.0) - .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) - .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) - ) - .get(); + SearchResponse trueValueResponse = prepareSearch("idx").addAggregation( + histogram("histo").field(NUMERIC_VALUE) + .interval(5.0) + .subAggregation(avg("mean_monotonic").field(MONOTONIC_VALUE)) + .subAggregation(avg("mean_numeric").field(NUMERIC_VALUE)) + ).get(); Histogram histogram = trueValueResponse.getAggregations().get("histo"); for (Histogram.Bucket bucket : histogram.getBuckets()) { long numDocs = bucket.getDocCount(); 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 b94ed2aed448..2b5b4d5b1d79 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 @@ -133,14 +133,12 @@ public class RangeIT extends ESIntegTestCase { } public void testRangeAsSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").field(MULTI_VALUED_FIELD_NAME) - .size(100) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").field(MULTI_VALUED_FIELD_NAME) + .size(100) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) + ).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("terms"); @@ -196,9 +194,9 @@ public class RangeIT extends ESIntegTestCase { } public void testSingleValueField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -237,9 +235,9 @@ public class RangeIT extends ESIntegTestCase { } public void testSingleValueFieldWithFormat() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6).format("#")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6).format("#") + ).get(); assertNoFailures(response); @@ -278,11 +276,9 @@ public class RangeIT extends ESIntegTestCase { } public void testSingleValueFieldWithCustomKey() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo("r1", 3).addRange("r2", 3, 6).addUnboundedFrom("r3", 6) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo("r1", 3).addRange("r2", 3, 6).addUnboundedFrom("r3", 6) + ).get(); assertNoFailures(response); @@ -321,15 +317,13 @@ public class RangeIT extends ESIntegTestCase { } public void testSingleValuedFieldWithSubAggregation() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - range("range").field(SINGLE_VALUED_FIELD_NAME) - .addUnboundedTo(3) - .addRange(3, 6) - .addUnboundedFrom(6) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME) + .addUnboundedTo(3) + .addRange(3, 6) + .addUnboundedFrom(6) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -393,15 +387,13 @@ public class RangeIT extends ESIntegTestCase { } public void testSingleValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - range("range").field(SINGLE_VALUED_FIELD_NAME) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) - .addUnboundedTo(3) - .addRange(3, 6) - .addUnboundedFrom(6) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) + .addUnboundedTo(3) + .addRange(3, 6) + .addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -453,9 +445,9 @@ public class RangeIT extends ESIntegTestCase { */ public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -507,15 +499,13 @@ public class RangeIT extends ESIntegTestCase { */ public void testMultiValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - range("range").field(MULTI_VALUED_FIELD_NAME) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) - .addUnboundedTo(3) - .addRange(3, 6) - .addUnboundedFrom(6) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(MULTI_VALUED_FIELD_NAME) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) + .addUnboundedTo(3) + .addRange(3, 6) + .addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -577,9 +567,9 @@ public class RangeIT extends ESIntegTestCase { "doc['" + SINGLE_VALUED_FIELD_NAME + "'].value", Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").script(script).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").script(script).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -618,9 +608,9 @@ public class RangeIT extends ESIntegTestCase { } public void testEmptyRange() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(-1).addUnboundedFrom(1000)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(-1).addUnboundedFrom(1000) + ).get(); assertNoFailures(response); @@ -651,7 +641,7 @@ public class RangeIT extends ESIntegTestCase { public void testNoRangesInQuery() { try { - client().prepareSearch("idx").addAggregation(range("foobar").field(SINGLE_VALUED_FIELD_NAME)).get(); + prepareSearch("idx").addAggregation(range("foobar").field(SINGLE_VALUED_FIELD_NAME)).get(); fail(); } catch (SearchPhaseExecutionException spee) { Throwable rootCause = spee.getCause().getCause(); @@ -668,9 +658,9 @@ public class RangeIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation(range("range").script(script).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").script(script).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -726,9 +716,9 @@ public class RangeIT extends ESIntegTestCase { */ public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("idx_unmapped") - .addAggregation(range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6)) - .get(); + SearchResponse response = prepareSearch("idx_unmapped").addAggregation( + range("range").field(SINGLE_VALUED_FIELD_NAME).addUnboundedTo(3).addRange(3, 6).addUnboundedFrom(6) + ).get(); assertNoFailures(response); @@ -810,11 +800,9 @@ public class RangeIT extends ESIntegTestCase { } public void testOverlappingRanges() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(5).addRange(3, 6).addRange(4, 5).addUnboundedFrom(4) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + range("range").field(MULTI_VALUED_FIELD_NAME).addUnboundedTo(5).addRange(3, 6).addRange(4, 5).addUnboundedFrom(4) + ).get(); assertNoFailures(response); @@ -862,8 +850,7 @@ public class RangeIT extends ESIntegTestCase { } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field(SINGLE_VALUED_FIELD_NAME) .interval(1L) @@ -922,8 +909,7 @@ public class RangeIT extends ESIntegTestCase { // Test that a request using a nondeterministic script does not get cached Map params = new HashMap<>(); params.put("fieldname", "date"); - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( range("foo").field("i") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -942,8 +928,7 @@ public class RangeIT extends ESIntegTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( range("foo").field("i") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -962,7 +947,7 @@ public class RangeIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(range("foo").field("i").addRange(0, 10)).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(range("foo").field("i").addRange(0, 10)).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java index d40afeb433e3..e90e73eec5bb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java @@ -143,18 +143,16 @@ public class ReverseNestedIT extends ESIntegTestCase { } public void testSimpleReverseNestedToRoot() throws Exception { - SearchResponse response = client().prepareSearch("idx1") - .addAggregation( - nested("nested1", "nested1").subAggregation( - terms("field2").field("nested1.field2") - .subAggregation( - reverseNested("nested1_to_field1").subAggregation( - terms("field1").field("field1").collectMode(randomFrom(SubAggCollectionMode.values())) - ) + SearchResponse response = prepareSearch("idx1").addAggregation( + nested("nested1", "nested1").subAggregation( + terms("field2").field("nested1.field2") + .subAggregation( + reverseNested("nested1_to_field1").subAggregation( + terms("field1").field("field1").collectMode(randomFrom(SubAggCollectionMode.values())) ) - ) + ) ) - .get(); + ).get(); assertNoFailures(response); @@ -330,13 +328,11 @@ public class ReverseNestedIT extends ESIntegTestCase { } public void testSimpleNested1ToRootToNested2() throws Exception { - SearchResponse response = client().prepareSearch("idx2") - .addAggregation( - nested("nested1", "nested1").subAggregation( - reverseNested("nested1_to_root").subAggregation(nested("root_to_nested2", "nested1.nested2")) - ) + SearchResponse response = prepareSearch("idx2").addAggregation( + nested("nested1", "nested1").subAggregation( + reverseNested("nested1_to_root").subAggregation(nested("root_to_nested2", "nested1.nested2")) ) - .get(); + ).get(); assertNoFailures(response); Nested nested = response.getAggregations().get("nested1"); @@ -351,24 +347,22 @@ public class ReverseNestedIT extends ESIntegTestCase { } public void testSimpleReverseNestedToNested1() throws Exception { - SearchResponse response = client().prepareSearch("idx2") - .addAggregation( - nested("nested1", "nested1.nested2").subAggregation( - terms("field2").field("nested1.nested2.field2") - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .size(10000) - .subAggregation( - reverseNested("nested1_to_field1").path("nested1") - .subAggregation( - terms("field1").field("nested1.field1") - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - ) + SearchResponse response = prepareSearch("idx2").addAggregation( + nested("nested1", "nested1.nested2").subAggregation( + terms("field2").field("nested1.nested2.field2") + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .size(10000) + .subAggregation( + reverseNested("nested1_to_field1").path("nested1") + .subAggregation( + terms("field1").field("nested1.field1") + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ) ) - .get(); + ).get(); assertNoFailures(response); @@ -457,17 +451,15 @@ public class ReverseNestedIT extends ESIntegTestCase { public void testReverseNestedAggWithoutNestedAgg() { try { - client().prepareSearch("idx2") - .addAggregation( - terms("field2").field("nested1.nested2.field2") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation( - reverseNested("nested1_to_field1").subAggregation( - terms("field1").field("nested1.field1").collectMode(randomFrom(SubAggCollectionMode.values())) - ) + prepareSearch("idx2").addAggregation( + terms("field2").field("nested1.nested2.field2") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation( + reverseNested("nested1_to_field1").subAggregation( + terms("field1").field("nested1.field1").collectMode(randomFrom(SubAggCollectionMode.values())) ) - ) - .get(); + ) + ).get(); fail("Expected SearchPhaseExecutionException"); } catch (SearchPhaseExecutionException e) { assertThat(e.getMessage(), is("all shards failed")); @@ -475,8 +467,7 @@ public class ReverseNestedIT extends ESIntegTestCase { } public void testNonExistingNestedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx2") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx2").setQuery(matchAllQuery()) .addAggregation(nested("nested2", "nested1.nested2").subAggregation(reverseNested("incorrect").path("nested3"))) .get(); @@ -488,8 +479,7 @@ public class ReverseNestedIT extends ESIntegTestCase { assertThat(reverseNested.getDocCount(), is(0L)); // Test that parsing the reverse_nested agg doesn't fail, because the parent nested agg is unmapped: - searchResponse = client().prepareSearch("idx1") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("idx1").setQuery(matchAllQuery()) .addAggregation(nested("incorrect1", "incorrect1").subAggregation(reverseNested("incorrect2").path("incorrect2"))) .get(); @@ -613,22 +603,20 @@ public class ReverseNestedIT extends ESIntegTestCase { ) .get(); - SearchResponse response = client().prepareSearch("idx3") - .addAggregation( - nested("nested_0", "category").subAggregation( - terms("group_by_category").field("category.name") - .subAggregation( - reverseNested("to_root").subAggregation( - nested("nested_1", "sku").subAggregation( - filter("filter_by_sku", termQuery("sku.sku_type", "bar1")).subAggregation( - count("sku_count").field("sku.sku_type") - ) + SearchResponse response = prepareSearch("idx3").addAggregation( + nested("nested_0", "category").subAggregation( + terms("group_by_category").field("category.name") + .subAggregation( + reverseNested("to_root").subAggregation( + nested("nested_1", "sku").subAggregation( + filter("filter_by_sku", termQuery("sku.sku_type", "bar1")).subAggregation( + count("sku_count").field("sku.sku_type") ) ) ) - ) + ) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); @@ -650,27 +638,25 @@ public class ReverseNestedIT extends ESIntegTestCase { assertThat(barCount.getValue(), equalTo(3L)); } - response = client().prepareSearch("idx3") - .addAggregation( - nested("nested_0", "category").subAggregation( - terms("group_by_category").field("category.name") - .subAggregation( - reverseNested("to_root").subAggregation( - nested("nested_1", "sku").subAggregation( - filter("filter_by_sku", termQuery("sku.sku_type", "bar1")).subAggregation( - nested("nested_2", "sku.colors").subAggregation( - filter("filter_sku_color", termQuery("sku.colors.name", "red")).subAggregation( - reverseNested("reverse_to_sku").path("sku") - .subAggregation(count("sku_count").field("sku.sku_type")) - ) + response = prepareSearch("idx3").addAggregation( + nested("nested_0", "category").subAggregation( + terms("group_by_category").field("category.name") + .subAggregation( + reverseNested("to_root").subAggregation( + nested("nested_1", "sku").subAggregation( + filter("filter_by_sku", termQuery("sku.sku_type", "bar1")).subAggregation( + nested("nested_2", "sku.colors").subAggregation( + filter("filter_sku_color", termQuery("sku.colors.name", "red")).subAggregation( + reverseNested("reverse_to_sku").path("sku") + .subAggregation(count("sku_count").field("sku.sku_type")) ) ) ) ) ) - ) + ) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); @@ -700,18 +686,16 @@ public class ReverseNestedIT extends ESIntegTestCase { } public void testFieldAlias() { - SearchResponse response = client().prepareSearch("idx1") - .addAggregation( - nested("nested1", "nested1").subAggregation( - terms("field2").field("nested1.field2") - .subAggregation( - reverseNested("nested1_to_field1").subAggregation( - terms("field1").field("alias").collectMode(randomFrom(SubAggCollectionMode.values())) - ) + SearchResponse response = prepareSearch("idx1").addAggregation( + nested("nested1", "nested1").subAggregation( + terms("field2").field("nested1.field2") + .subAggregation( + reverseNested("nested1_to_field1").subAggregation( + terms("field1").field("alias").collectMode(randomFrom(SubAggCollectionMode.values())) ) - ) + ) ) - .get(); + ).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 e7f1f30fd8ad..2e1bd1812ea4 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 @@ -91,8 +91,7 @@ public class SamplerIT extends ESIntegTestCase { // Tests that we can refer to nested elements under a sample in a path // statement boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .addAggregation( terms("genres").field("genre") .order(BucketOrder.aggregation("sample>max_price.value", asc)) @@ -122,8 +121,7 @@ public class SamplerIT extends ESIntegTestCase { public void testSimpleSampler() throws Exception { SamplerAggregationBuilder sampleAgg = sampler("sample").shardSize(100); sampleAgg.subAggregation(terms("authors").field("author")); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(new TermQueryBuilder("genre", "fantasy")) .setFrom(0) .setSize(60) @@ -144,8 +142,7 @@ public class SamplerIT extends ESIntegTestCase { public void testUnmappedChildAggNoDiversity() throws Exception { SamplerAggregationBuilder sampleAgg = sampler("sample").shardSize(100); sampleAgg.subAggregation(terms("authors").field("author")); - SearchResponse response = client().prepareSearch("idx_unmapped") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("idx_unmapped").setSearchType(SearchType.QUERY_THEN_FETCH) .setQuery(new TermQueryBuilder("genre", "fantasy")) .setFrom(0) .setSize(60) @@ -179,8 +176,7 @@ public class SamplerIT extends ESIntegTestCase { public void testRidiculousShardSizeSampler() throws Exception { SamplerAggregationBuilder sampleAgg = sampler("sample").shardSize(Integer.MAX_VALUE); sampleAgg.subAggregation(terms("authors").field("author")); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("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/ShardReduceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java index 63f31d2fbb97..b0f9556bc842 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java @@ -87,8 +87,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testGlobal() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( global("global").subAggregation( dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0) @@ -104,8 +103,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testFilter() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( filter("filter", QueryBuilders.matchAllQuery()).subAggregation( dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0) @@ -121,8 +119,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testMissing() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( missing("missing").field("foobar") .subAggregation(dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0)) @@ -137,8 +134,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testGlobalWithFilterWithMissing() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( global("global").subAggregation( filter("filter", QueryBuilders.matchAllQuery()).subAggregation( @@ -159,8 +155,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testNested() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( nested("nested", "nested").subAggregation( dateHistogram("histo").field("nested.date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0) @@ -176,8 +171,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testStringTerms() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( terms("terms").field("term-s") .collectMode(randomFrom(SubAggCollectionMode.values())) @@ -193,8 +187,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testLongTerms() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( terms("terms").field("term-l") .collectMode(randomFrom(SubAggCollectionMode.values())) @@ -210,8 +203,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testDoubleTerms() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( terms("terms").field("term-d") .collectMode(randomFrom(SubAggCollectionMode.values())) @@ -227,8 +219,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testRange() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( range("range").field("value") .addRange("r1", 0, 10) @@ -244,8 +235,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testDateRange() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( dateRange("range").field("date") .addRange("r1", "2014-01-01", "2014-01-10") @@ -261,8 +251,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testIpRange() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( ipRange("range").field("ip") .addRange("r1", "10.0.0.1", "10.0.0.10") @@ -278,8 +267,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testHistogram() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( histogram("topHisto").field("value") .interval(5) @@ -295,8 +283,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testDateHistogram() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( dateHistogram("topHisto").field("date") .calendarInterval(DateHistogramInterval.MONTH) @@ -313,8 +300,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testGeoHashGrid() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( geohashGrid("grid").field("location") .subAggregation(dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0)) @@ -329,8 +315,7 @@ public class ShardReduceIT extends ESIntegTestCase { } public void testGeoTileGrid() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.matchAllQuery()) .addAggregation( geotileGrid("grid").field("location") .subAggregation(dateHistogram("histo").field("date").fixedInterval(DateHistogramInterval.DAY).minDocCount(0)) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java index dc3cd1c89778..2c0c7766b646 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsIT.java @@ -26,8 +26,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.count(false)) ) @@ -50,8 +49,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -79,8 +77,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -108,8 +105,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setRouting(routing1) + SearchResponse response = prepareSearch("idx").setRouting(routing1) .setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") @@ -137,8 +133,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.key(true)) ) @@ -161,8 +156,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.count(false)) ) @@ -185,8 +179,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -213,8 +206,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -242,8 +234,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setRouting(routing1) + SearchResponse response = prepareSearch("idx").setRouting(routing1) .setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") @@ -271,8 +262,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.key(true)) ) @@ -295,8 +285,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.count(false)) ) @@ -319,8 +308,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -347,8 +335,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") .size(3) @@ -375,8 +362,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setRouting(routing1) + SearchResponse response = prepareSearch("idx").setRouting(routing1) .setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key") @@ -404,8 +390,7 @@ public class ShardSizeTermsIT extends ShardSizeTestCase { indexData(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("keys").field("key").size(3).collectMode(randomFrom(SubAggCollectionMode.values())).order(BucketOrder.key(true)) ) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java index 1932e640e785..0180bcff738b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java @@ -121,11 +121,13 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { if ("text".equals(type) && randomBoolean()) { // Use significant_text on text fields but occasionally run with alternative of // significant_terms on legacy fieldData=true too. - request = client().prepareSearch(INDEX_NAME) - .addAggregation(terms("class").field(CLASS_FIELD).subAggregation(significantText("sig_terms", TEXT_FIELD))); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD).subAggregation(significantText("sig_terms", TEXT_FIELD)) + ); } else { - request = client().prepareSearch(INDEX_NAME) - .addAggregation(terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD))); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD)) + ); } SearchResponse response = request.get(); @@ -226,13 +228,13 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { SearchRequestBuilder request; if (randomBoolean()) { - request = client().prepareSearch(INDEX_NAME) - .addAggregation( - terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD).minDocCount(1)) - ); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD).minDocCount(1)) + ); } else { - request = client().prepareSearch(INDEX_NAME) - .addAggregation(terms("class").field(CLASS_FIELD).subAggregation(significantText("sig_terms", TEXT_FIELD).minDocCount(1))); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD).subAggregation(significantText("sig_terms", TEXT_FIELD).minDocCount(1)) + ); } request.get(); @@ -266,24 +268,22 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { final boolean useSigText = randomBoolean() && type.equals("text"); SearchRequestBuilder request1; if (useSigText) { - request1 = client().prepareSearch(INDEX_NAME) - .addAggregation( - terms("class").field(CLASS_FIELD) - .subAggregation( - significantText("sig_terms", TEXT_FIELD).minDocCount(1) - .significanceHeuristic(significanceHeuristicExpectingSuperset) - ) - ); + request1 = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD) + .subAggregation( + significantText("sig_terms", TEXT_FIELD).minDocCount(1) + .significanceHeuristic(significanceHeuristicExpectingSuperset) + ) + ); } else { - request1 = client().prepareSearch(INDEX_NAME) - .addAggregation( - terms("class").field(CLASS_FIELD) - .subAggregation( - significantTerms("sig_terms").field(TEXT_FIELD) - .minDocCount(1) - .significanceHeuristic(significanceHeuristicExpectingSuperset) - ) - ); + request1 = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD) + .subAggregation( + significantTerms("sig_terms").field(TEXT_FIELD) + .minDocCount(1) + .significanceHeuristic(significanceHeuristicExpectingSuperset) + ) + ); } SearchResponse response1 = request1.get(); @@ -291,14 +291,13 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { SearchRequestBuilder request2; if (useSigText) { - request2 = client().prepareSearch(INDEX_NAME) - .addAggregation( - filter("0", QueryBuilders.termQuery(CLASS_FIELD, "0")).subAggregation( - significantText("sig_terms", TEXT_FIELD).minDocCount(1) - .backgroundFilter(QueryBuilders.termQuery(CLASS_FIELD, "1")) - .significanceHeuristic(significanceHeuristicExpectingSeparateSets) - ) + request2 = prepareSearch(INDEX_NAME).addAggregation( + filter("0", QueryBuilders.termQuery(CLASS_FIELD, "0")).subAggregation( + significantText("sig_terms", TEXT_FIELD).minDocCount(1) + .backgroundFilter(QueryBuilders.termQuery(CLASS_FIELD, "1")) + .significanceHeuristic(significanceHeuristicExpectingSeparateSets) ) + ) .addAggregation( filter("1", QueryBuilders.termQuery(CLASS_FIELD, "1")).subAggregation( significantText("sig_terms", TEXT_FIELD).minDocCount(1) @@ -307,15 +306,14 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { ) ); } else { - request2 = client().prepareSearch(INDEX_NAME) - .addAggregation( - filter("0", QueryBuilders.termQuery(CLASS_FIELD, "0")).subAggregation( - significantTerms("sig_terms").field(TEXT_FIELD) - .minDocCount(1) - .backgroundFilter(QueryBuilders.termQuery(CLASS_FIELD, "1")) - .significanceHeuristic(significanceHeuristicExpectingSeparateSets) - ) + request2 = prepareSearch(INDEX_NAME).addAggregation( + filter("0", QueryBuilders.termQuery(CLASS_FIELD, "0")).subAggregation( + significantTerms("sig_terms").field(TEXT_FIELD) + .minDocCount(1) + .backgroundFilter(QueryBuilders.termQuery(CLASS_FIELD, "1")) + .significanceHeuristic(significanceHeuristicExpectingSeparateSets) ) + ) .addAggregation( filter("1", QueryBuilders.termQuery(CLASS_FIELD, "1")).subAggregation( significantTerms("sig_terms").field(TEXT_FIELD) @@ -365,29 +363,27 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { // check that results for both classes are the same with exclude negatives = false and classes are routing ids SearchRequestBuilder request; if (randomBoolean()) { - request = client().prepareSearch("test") - .addAggregation( - terms("class").field("class") - .subAggregation( - significantTerms("mySignificantTerms").field("text") - .executionHint(randomExecutionHint()) - .significanceHeuristic(heuristic) - .minDocCount(1) - .shardSize(1000) - .size(1000) - ) - ); + request = prepareSearch("test").addAggregation( + terms("class").field("class") + .subAggregation( + significantTerms("mySignificantTerms").field("text") + .executionHint(randomExecutionHint()) + .significanceHeuristic(heuristic) + .minDocCount(1) + .shardSize(1000) + .size(1000) + ) + ); } else { - request = client().prepareSearch("test") - .addAggregation( - terms("class").field("class") - .subAggregation( - significantText("mySignificantTerms", "text").significanceHeuristic(heuristic) - .minDocCount(1) - .shardSize(1000) - .size(1000) - ) - ); + request = prepareSearch("test").addAggregation( + terms("class").field("class") + .subAggregation( + significantText("mySignificantTerms", "text").significanceHeuristic(heuristic) + .minDocCount(1) + .shardSize(1000) + .size(1000) + ) + ); } SearchResponse response = request.get(); assertNoFailures(response); @@ -427,7 +423,7 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { .size(1000) .subAggregation(subAgg); - SearchResponse response = client().prepareSearch("test").setQuery(query).addAggregation(agg).get(); + SearchResponse response = prepareSearch("test").setQuery(query).addAggregation(agg).get(); assertNoFailures(response); SignificantTerms sigTerms = response.getAggregations().get("significant_terms"); @@ -479,29 +475,27 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { SearchRequestBuilder request; if ("text".equals(type) && randomBoolean()) { - request = client().prepareSearch(INDEX_NAME) - .addAggregation( - terms("class").field(CLASS_FIELD) - .subAggregation( - significantText("mySignificantTerms", TEXT_FIELD).significanceHeuristic(scriptHeuristic) - .minDocCount(1) - .shardSize(2) - .size(2) - ) - ); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD) + .subAggregation( + significantText("mySignificantTerms", TEXT_FIELD).significanceHeuristic(scriptHeuristic) + .minDocCount(1) + .shardSize(2) + .size(2) + ) + ); } else { - request = client().prepareSearch(INDEX_NAME) - .addAggregation( - terms("class").field(CLASS_FIELD) - .subAggregation( - significantTerms("mySignificantTerms").field(TEXT_FIELD) - .executionHint(randomExecutionHint()) - .significanceHeuristic(scriptHeuristic) - .minDocCount(1) - .shardSize(2) - .size(2) - ) - ); + request = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD) + .subAggregation( + significantTerms("mySignificantTerms").field(TEXT_FIELD) + .executionHint(randomExecutionHint()) + .significanceHeuristic(scriptHeuristic) + .minDocCount(1) + .shardSize(2) + .size(2) + ) + ); } SearchResponse response = request.get(); assertNoFailures(response); @@ -588,13 +582,11 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { boolean useSigText = randomBoolean(); SearchResponse r; if (useSigText) { - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(significantText("foo", "t").significanceHeuristic(scriptHeuristic)) .get(); } else { - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(significantTerms("foo").field("s").significanceHeuristic(scriptHeuristic)) .get(); } @@ -613,13 +605,11 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { scriptHeuristic = getScriptSignificanceHeuristic(); useSigText = randomBoolean(); if (useSigText) { - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(significantText("foo", "t").significanceHeuristic(scriptHeuristic)) .get(); } else { - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(significantTerms("foo").field("s").significanceHeuristic(scriptHeuristic)) .get(); } @@ -636,9 +626,9 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { // Ensure that non-scripted requests are cached as normal if (useSigText) { - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(significantText("foo", "t")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(significantText("foo", "t")).get(); } else { - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(significantTerms("foo").field("s")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(significantTerms("foo").field("s")).get(); } assertNoFailures(r); 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 d01096238523..109c2ec356f1 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 @@ -267,29 +267,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueField() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -299,29 +295,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldSingleShard() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -332,8 +324,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse testResponse = client().prepareSearch("idx_with_routing") - .setRouting(String.valueOf(between(1, numRoutingValues))) + SearchResponse testResponse = prepareSearch("idx_with_routing").setRouting(String.valueOf(between(1, numRoutingValues))) .addAggregation( terms("terms").executionHint(randomExecutionHint()) .field(STRING_FIELD_NAME) @@ -352,31 +343,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldDocCountAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -386,31 +373,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldTermSortAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -420,31 +403,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldTermSortDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -454,33 +433,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldSubAggAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); @@ -490,33 +465,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testStringValueFieldSubAggDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(STRING_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(STRING_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); @@ -526,29 +497,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueField() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -558,29 +525,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldSingleShard() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -591,8 +554,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse testResponse = client().prepareSearch("idx_with_routing") - .setRouting(String.valueOf(between(1, numRoutingValues))) + SearchResponse testResponse = prepareSearch("idx_with_routing").setRouting(String.valueOf(between(1, numRoutingValues))) .addAggregation( terms("terms").executionHint(randomExecutionHint()) .field(LONG_FIELD_NAME) @@ -611,31 +573,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldDocCountAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -645,31 +603,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldTermSortAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -679,31 +633,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldTermSortDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -713,33 +663,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldSubAggAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); @@ -749,33 +695,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testLongValueFieldSubAggDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(DOUBLE_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(DOUBLE_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(LONG_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(DOUBLE_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(LONG_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(DOUBLE_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); @@ -785,29 +727,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueField() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -817,29 +755,25 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldSingleShard() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -850,8 +784,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse testResponse = client().prepareSearch("idx_with_routing") - .setRouting(String.valueOf(between(1, numRoutingValues))) + SearchResponse testResponse = prepareSearch("idx_with_routing").setRouting(String.valueOf(between(1, numRoutingValues))) .addAggregation( terms("terms").executionHint(randomExecutionHint()) .field(DOUBLE_FIELD_NAME) @@ -870,31 +803,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldDocCountAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.count(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.count(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -904,31 +833,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldTermSortAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -938,31 +863,27 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldTermSortDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.key(false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.key(false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(testResponse); @@ -972,33 +893,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldSubAggAsc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", true)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", true)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); @@ -1008,33 +925,29 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { public void testDoubleValueFieldSubAggDesc() throws Exception { int size = randomIntBetween(1, 20); int shardSize = randomIntBetween(size, size * 2); - SearchResponse accurateResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(10000) - .shardSize(10000) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse accurateResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(10000) + .shardSize(10000) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(accurateResponse); - SearchResponse testResponse = client().prepareSearch("idx_single_shard") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(DOUBLE_FIELD_NAME) - .showTermDocCountError(true) - .size(size) - .shardSize(shardSize) - .order(BucketOrder.aggregation("sortAgg", false)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) - ) - .get(); + SearchResponse testResponse = prepareSearch("idx_single_shard").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(DOUBLE_FIELD_NAME) + .showTermDocCountError(true) + .size(size) + .shardSize(shardSize) + .order(BucketOrder.aggregation("sortAgg", false)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .subAggregation(sum("sortAgg").field(LONG_FIELD_NAME)) + ).get(); assertNoFailures(testResponse); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java index 9b8da69a13e1..ffb9539bee73 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java @@ -61,34 +61,30 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { indexRandom(true, false, indexBuilders); // first, check that indeed when not setting the shardMinDocCount parameter 0 terms are returned - SearchResponse response = client().prepareSearch(index) - .addAggregation( - (filter("inclass", QueryBuilders.termQuery("class", true))).subAggregation( - significantTerms("mySignificantTerms").field("text") - .minDocCount(2) - .size(2) - .shardSize(2) - .executionHint(randomExecutionHint()) - ) + SearchResponse response = prepareSearch(index).addAggregation( + (filter("inclass", QueryBuilders.termQuery("class", true))).subAggregation( + significantTerms("mySignificantTerms").field("text") + .minDocCount(2) + .size(2) + .shardSize(2) + .executionHint(randomExecutionHint()) ) - .get(); + ).get(); assertNoFailures(response); InternalFilter filteredBucket = response.getAggregations().get("inclass"); SignificantTerms sigterms = filteredBucket.getAggregations().get("mySignificantTerms"); assertThat(sigterms.getBuckets().size(), equalTo(0)); - response = client().prepareSearch(index) - .addAggregation( - (filter("inclass", QueryBuilders.termQuery("class", true))).subAggregation( - significantTerms("mySignificantTerms").field("text") - .minDocCount(2) - .shardSize(2) - .shardMinDocCount(2) - .size(2) - .executionHint(randomExecutionHint()) - ) + response = prepareSearch(index).addAggregation( + (filter("inclass", QueryBuilders.termQuery("class", true))).subAggregation( + significantTerms("mySignificantTerms").field("text") + .minDocCount(2) + .shardSize(2) + .shardMinDocCount(2) + .size(2) + .executionHint(randomExecutionHint()) ) - .get(); + ).get(); assertNoFailures(response); filteredBucket = response.getAggregations().get("inclass"); sigterms = filteredBucket.getAggregations().get("mySignificantTerms"); @@ -126,31 +122,27 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { indexRandom(true, false, indexBuilders); // first, check that indeed when not setting the shardMinDocCount parameter 0 terms are returned - SearchResponse response = client().prepareSearch(index) - .addAggregation( - terms("myTerms").field("text") - .minDocCount(2) - .size(2) - .shardSize(2) - .executionHint(randomExecutionHint()) - .order(BucketOrder.key(true)) - ) - .get(); + SearchResponse response = prepareSearch(index).addAggregation( + terms("myTerms").field("text") + .minDocCount(2) + .size(2) + .shardSize(2) + .executionHint(randomExecutionHint()) + .order(BucketOrder.key(true)) + ).get(); assertNoFailures(response); Terms sigterms = response.getAggregations().get("myTerms"); assertThat(sigterms.getBuckets().size(), equalTo(0)); - response = client().prepareSearch(index) - .addAggregation( - terms("myTerms").field("text") - .minDocCount(2) - .shardMinDocCount(2) - .size(2) - .shardSize(2) - .executionHint(randomExecutionHint()) - .order(BucketOrder.key(true)) - ) - .get(); + response = prepareSearch(index).addAggregation( + terms("myTerms").field("text") + .minDocCount(2) + .shardMinDocCount(2) + .size(2) + .shardSize(2) + .executionHint(randomExecutionHint()) + .order(BucketOrder.key(true)) + ).get(); assertNoFailures(response); sigterms = response.getAggregations().get("myTerms"); assertThat(sigterms.getBuckets().size(), equalTo(2)); 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 de458c1e2bb7..58976326a8e9 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 @@ -277,15 +277,13 @@ public class StringTermsIT extends AbstractTermsTestCase { final int minDocCount = randomInt(1); IllegalArgumentException exception = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("high_card_idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .minDocCount(minDocCount) - .size(0) - ) - .get() + () -> prepareSearch("high_card_idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .minDocCount(minDocCount) + .size(0) + ).get() ); assertThat(exception.getMessage(), containsString("[size] must be greater than 0. Found [0] in [terms]")); } @@ -300,11 +298,9 @@ public class StringTermsIT extends AbstractTermsTestCase { private void runTestFieldWithPartitionedFiltering(String field) throws Exception { // Find total number of unique terms - SearchResponse allResponse = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(field).size(10000).collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse allResponse = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field).size(10000).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(allResponse); StringTerms terms = allResponse.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -315,13 +311,11 @@ public class StringTermsIT extends AbstractTermsTestCase { final int numPartitions = randomIntBetween(2, 4); Set foundTerms = new HashSet<>(); for (int partition = 0; partition < numPartitions; partition++) { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").field(field) - .includeExclude(new IncludeExclude(partition, numPartitions)) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").field(field) + .includeExclude(new IncludeExclude(partition, numPartitions)) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); terms = response.getAggregations().get("terms"); assertThat(terms, notNullValue()); @@ -334,14 +328,12 @@ public class StringTermsIT extends AbstractTermsTestCase { } public void testSingleValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "'foo_' + _value", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "'foo_' + _value", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -359,14 +351,12 @@ public class StringTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScriptNotUnique() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value.substring(0,3)", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value.substring(0,3)", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -382,20 +372,13 @@ public class StringTermsIT extends AbstractTermsTestCase { } public void testMultiValuedScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .script( - new Script( - ScriptType.INLINE, - CustomScriptPlugin.NAME, - "doc['" + MULTI_VALUED_FIELD_NAME + "']", - Collections.emptyMap() - ) - ) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .script( + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['" + MULTI_VALUED_FIELD_NAME + "']", Collections.emptyMap()) + ) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(response); @@ -417,14 +400,12 @@ public class StringTermsIT extends AbstractTermsTestCase { } public void testMultiValuedFieldWithValueScript() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "'foo_' + _value", Collections.emptyMap())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(MULTI_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "'foo_' + _value", Collections.emptyMap())) + ).get(); assertNoFailures(response); @@ -465,13 +446,11 @@ public class StringTermsIT extends AbstractTermsTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .executionHint(randomExecutionHint()) - .script(script) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .executionHint(randomExecutionHint()) + .script(script) + ).get(); assertNoFailures(response); @@ -496,13 +475,11 @@ public class StringTermsIT extends AbstractTermsTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) - .executionHint(randomExecutionHint()) - .script(script) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) + .executionHint(randomExecutionHint()) + .script(script) + ).get(); assertNoFailures(response); @@ -520,7 +497,7 @@ public class StringTermsIT extends AbstractTermsTestCase { } public void testScriptMultiValued() throws Exception { - SearchResponse response = client().prepareSearch("idx") + SearchResponse response = prepareSearch("idx") .addAggregation( new TermsAggregationBuilder("terms").collectMode(randomFrom(SubAggCollectionMode.values())) @@ -581,14 +558,11 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testStringTermsNestedIntoPerBucketAggregator() throws Exception { // no execution hint so that the logic that decides whether or not to use ordinals is executed - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - filter("filter", termQuery(MULTI_VALUED_FIELD_NAME, "val3")).subAggregation( - new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + filter("filter", termQuery(MULTI_VALUED_FIELD_NAME, "val3")).subAggregation( + new TermsAggregationBuilder("terms").field(MULTI_VALUED_FIELD_NAME).collectMode(randomFrom(SubAggCollectionMode.values())) ) - .get(); + ).get(); assertThat(response.getFailedShards(), equalTo(0)); @@ -610,17 +584,15 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception { boolean asc = true; try { - client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("inner_terms>avg", asc)) - .subAggregation( - new TermsAggregationBuilder("inner_terms").field(MULTI_VALUED_FIELD_NAME).subAggregation(avg("avg").field("i")) - ) - ) - .get(); + prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("inner_terms>avg", asc)) + .subAggregation( + new TermsAggregationBuilder("inner_terms").field(MULTI_VALUED_FIELD_NAME).subAggregation(avg("avg").field("i")) + ) + ).get(); fail("Expected an exception"); } catch (SearchPhaseExecutionException e) { ElasticsearchException[] rootCauses = e.guessRootCauses(); @@ -645,15 +617,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySingleBucketSubAggregationAsc() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) - .field("tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter", asc)) - .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) + .field("tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter", asc)) + .subAggregation(filter("filter", QueryBuilders.matchAllQuery())) + ).get(); assertNoFailures(response); @@ -683,19 +653,17 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedBySubAggregationAscMultiHierarchyLevels() throws Exception { boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) - .field("tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter1>filter2>stats.max", asc)) - .subAggregation( - filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( - filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(stats("stats").field("i")) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) + .field("tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter1>filter2>stats.max", asc)) + .subAggregation( + filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( + filter("filter2", QueryBuilders.matchAllQuery()).subAggregation(stats("stats").field("i")) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -746,19 +714,17 @@ public class StringTermsIT extends AbstractTermsTestCase { statsNameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String statsName = statsNameBuilder.toString(); boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) - .field("tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter1>" + filter2Name + ">" + statsName + ".max", asc)) - .subAggregation( - filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( - filter(filter2Name, QueryBuilders.matchAllQuery()).subAggregation(stats(statsName).field("i")) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) + .field("tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter1>" + filter2Name + ">" + statsName + ".max", asc)) + .subAggregation( + filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( + filter(filter2Name, QueryBuilders.matchAllQuery()).subAggregation(stats(statsName).field("i")) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -809,19 +775,17 @@ public class StringTermsIT extends AbstractTermsTestCase { statsNameBuilder.append(randomAlphaOfLengthBetween(3, 10).replace("[", "").replace("]", "").replace(">", "")); String statsName = statsNameBuilder.toString(); boolean asc = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) - .field("tag") - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("filter1>" + filter2Name + ">" + statsName + "[max]", asc)) - .subAggregation( - filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( - filter(filter2Name, QueryBuilders.matchAllQuery()).subAggregation(stats(statsName).field("i")) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("tags").executionHint(randomExecutionHint()) + .field("tag") + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("filter1>" + filter2Name + ">" + statsName + "[max]", asc)) + .subAggregation( + filter("filter1", QueryBuilders.matchAllQuery()).subAggregation( + filter(filter2Name, QueryBuilders.matchAllQuery()).subAggregation(stats(statsName).field("i")) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -867,14 +831,12 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMissingSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("avg_i", true)) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("avg_i", true)) + ).get(); fail("Expected search to fail when trying to sort terms aggregation by sug-aggregation that doesn't exist"); @@ -887,17 +849,15 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByNonMetricsOrMultiBucketSubAggregation() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("values", true)) - .subAggregation( - new TermsAggregationBuilder("values").field("i").collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("values", true)) + .subAggregation( + new TermsAggregationBuilder("values").field("i").collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by sug-aggregation " @@ -913,15 +873,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithUnknownMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - SearchResponse response = client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.foo", true)) - .subAggregation(stats("stats").field("i")) - ) - .get(); + SearchResponse response = prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.foo", true)) + .subAggregation(stats("stats").field("i")) + ).get(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " + "with an unknown specified metric to order by. response had " @@ -938,16 +896,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValuedSubAggregationWithoutMetric() throws Exception { for (String index : Arrays.asList("idx", "idx_unmapped")) { try { - client().prepareSearch(index) - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats", true)) - .subAggregation(stats("stats").field("i")) - ) - .execute() - .actionGet(); + prepareSearch(index).addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats", true)) + .subAggregation(stats("stats").field("i")) + ).execute().actionGet(); fail( "Expected search to fail when trying to sort terms aggregation by multi-valued sug-aggregation " @@ -962,15 +917,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field("i")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field("i")) + ).get(); assertNoFailures(response); @@ -994,15 +947,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueSubAggregationDesc() throws Exception { boolean asc = false; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.avg", asc)) - .subAggregation(stats("stats").field("i")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.avg", asc)) + .subAggregation(stats("stats").field("i")) + ).get(); assertNoFailures(response); @@ -1027,15 +978,13 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByMultiValueExtendedStatsAsc() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.sum_of_squares", asc)) - .subAggregation(extendedStats("stats").field("i")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.sum_of_squares", asc)) + .subAggregation(extendedStats("stats").field("i")) + ).get(); assertNoFailures(response); @@ -1060,18 +1009,16 @@ public class StringTermsIT extends AbstractTermsTestCase { public void testSingleValuedFieldOrderedByStatsAggAscWithTermsSubAgg() throws Exception { boolean asc = true; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("stats.sum_of_squares", asc)) - .subAggregation(extendedStats("stats").field("i")) - .subAggregation( - new TermsAggregationBuilder("subTerms").field("s_values").collectMode(randomFrom(SubAggCollectionMode.values())) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("stats.sum_of_squares", asc)) + .subAggregation(extendedStats("stats").field("i")) + .subAggregation( + new TermsAggregationBuilder("subTerms").field("s_values").collectMode(randomFrom(SubAggCollectionMode.values())) + ) + ).get(); assertNoFailures(response); @@ -1146,16 +1093,14 @@ public class StringTermsIT extends AbstractTermsTestCase { } private void assertMultiSortResponse(String[] expectedKeys, BucketOrder... order) { - SearchResponse response = client().prepareSearch("sort_idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(SINGLE_VALUED_FIELD_NAME) - .collectMode(randomFrom(SubAggCollectionMode.values())) - .order(BucketOrder.compound(order)) - .subAggregation(avg("avg_l").field("l")) - .subAggregation(sum("sum_d").field("d")) - ) - .get(); + SearchResponse response = prepareSearch("sort_idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(SINGLE_VALUED_FIELD_NAME) + .collectMode(randomFrom(SubAggCollectionMode.values())) + .order(BucketOrder.compound(order)) + .subAggregation(avg("avg_l").field("l")) + .subAggregation(sum("sum_d").field("d")) + ).get(); assertNoFailures(response); @@ -1234,8 +1179,7 @@ public class StringTermsIT extends AbstractTermsTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -1253,8 +1197,7 @@ public class StringTermsIT extends AbstractTermsTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( new TermsAggregationBuilder("terms").field("d") .script(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "'foo_' + _value", Collections.emptyMap())) @@ -1272,7 +1215,7 @@ public class StringTermsIT extends AbstractTermsTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(new TermsAggregationBuilder("terms").field("d")).get(); assertNoFailures(r); assertThat( @@ -1295,7 +1238,7 @@ public class StringTermsIT extends AbstractTermsTestCase { String source = builder.toString(); try (XContentParser parser = createParser(JsonXContent.jsonXContent, source)) { - SearchResponse response = client().prepareSearch("idx").setSource(new SearchSourceBuilder().parseXContent(parser, true)).get(); + SearchResponse response = prepareSearch("idx").setSource(new SearchSourceBuilder().parseXContent(parser, true)).get(); assertNoFailures(response); LongTerms terms = response.getAggregations().get("terms"); @@ -1309,7 +1252,7 @@ public class StringTermsIT extends AbstractTermsTestCase { try (XContentParser parser = createParser(JsonXContent.jsonXContent, invalidValueType)) { XContentParseException ex = expectThrows( XContentParseException.class, - () -> client().prepareSearch("idx").setSource(new SearchSourceBuilder().parseXContent(parser, true)).get() + () -> prepareSearch("idx").setSource(new SearchSourceBuilder().parseXContent(parser, true)).get() ); assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class)); assertThat(ex.getCause().getMessage(), containsString("Unknown value type [foobar]")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/CardinalityWithRequestBreakerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/CardinalityWithRequestBreakerIT.java index ce35f65c8a94..44361587dd09 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/CardinalityWithRequestBreakerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/CardinalityWithRequestBreakerIT.java @@ -49,14 +49,12 @@ public class CardinalityWithRequestBreakerIT extends ESIntegTestCase { ); try { - client().prepareSearch("test") - .addAggregation( - terms("terms").field("field0.keyword") - .collectMode(randomFrom(Aggregator.SubAggCollectionMode.values())) - .order(BucketOrder.aggregation("cardinality", randomBoolean())) - .subAggregation(cardinality("cardinality").precisionThreshold(randomLongBetween(1, 40000)).field("field1.keyword")) - ) - .get(); + prepareSearch("test").addAggregation( + terms("terms").field("field0.keyword") + .collectMode(randomFrom(Aggregator.SubAggCollectionMode.values())) + .order(BucketOrder.aggregation("cardinality", randomBoolean())) + .subAggregation(cardinality("cardinality").precisionThreshold(randomLongBetween(1, 40000)).field("field1.keyword")) + ).get(); } catch (ElasticsearchException e) { if (ExceptionsHelper.unwrap(e, CircuitBreakingException.class) == null) { throw e; 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 9a8eb1e7b45c..ce3140891871 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 @@ -91,8 +91,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value").interval(1L).minDocCount(0).subAggregation(extendedStats("stats").field("value")) ) @@ -126,8 +125,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testUnmapped() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").field("value")) .get(); @@ -158,8 +156,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { public void testPartiallyUnmapped() { double sigma = randomDouble() * 5; - ExtendedStats s1 = client().prepareSearch("idx") - .addAggregation(extendedStats("stats").field("value").sigma(sigma)) + ExtendedStats s1 = prepareSearch("idx").addAggregation(extendedStats("stats").field("value").sigma(sigma)) .get() .getAggregations() .get("stats"); @@ -187,8 +184,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").field("value").sigma(sigma)) .get(); @@ -215,8 +211,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { public void testSingleValuedFieldDefaultSigma() throws Exception { // Same as previous test, but uses a default value for sigma - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").field("value")) .get(); @@ -242,8 +237,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { public void testSingleValuedField_WithFormatter() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").format("0000.0").field("value").sigma(sigma)) .get(); @@ -280,8 +274,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(extendedStats("stats").field("value"))) .get(); @@ -378,8 +371,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldWithValueScript() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -412,8 +404,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("inc", 1); double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + inc", params)) @@ -444,8 +435,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").field("values").sigma(sigma)) .get(); @@ -487,8 +477,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testMultiValuedFieldWithValueScript() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", Collections.emptyMap())) @@ -534,8 +523,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - dec", params)) @@ -578,8 +566,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testScriptSingleValued() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").script( new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value", Collections.emptyMap()) @@ -615,8 +602,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value + inc", params); double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").script(script).sigma(sigma)) .get(); @@ -643,8 +629,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testScriptMultiValued() throws Exception { double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( extendedStats("stats").script( new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", Collections.emptyMap()) @@ -700,8 +685,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { ); double sigma = randomDouble() * randomIntBetween(1, 10); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(extendedStats("stats").script(script).sigma(sigma)) .get(); @@ -732,8 +716,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { } public void testEmptySubAggregation() { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("value").field("value") .subAggregation(missing("values").field("values").subAggregation(extendedStats("stats").field("value"))) @@ -776,8 +759,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>extendedStats.avg", true))) @@ -866,8 +848,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( extendedStats("foo").field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -885,8 +866,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( extendedStats("foo").field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -904,7 +884,7 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(extendedStats("foo").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(extendedStats("foo").field("d")).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java index 2fef88b7610d..3aebbce43e1e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java @@ -26,9 +26,9 @@ import static org.hamcrest.Matchers.notNullValue; public class GeoBoundsIT extends SpatialBoundsAggregationTestBase { public void testSingleValuedFieldNearDateLine() { - SearchResponse response = client().prepareSearch(DATELINE_IDX_NAME) - .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME).wrapLongitude(false)) - .get(); + SearchResponse response = prepareSearch(DATELINE_IDX_NAME).addAggregation( + boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME).wrapLongitude(false) + ).get(); assertNoFailures(response); @@ -50,9 +50,9 @@ public class GeoBoundsIT extends SpatialBoundsAggregationTestBase { GeoPoint geoValuesTopLeft = new GeoPoint(38, 170); GeoPoint geoValuesBottomRight = new GeoPoint(-24, -175); - SearchResponse response = client().prepareSearch(DATELINE_IDX_NAME) - .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME).wrapLongitude(true)) - .get(); + SearchResponse response = prepareSearch(DATELINE_IDX_NAME).addAggregation( + boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME).wrapLongitude(true) + ).get(); assertNoFailures(response); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java index d1ae1589a5c2..4b12cddde691 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/GeoCentroidIT.java @@ -29,12 +29,9 @@ import static org.hamcrest.Matchers.notNullValue; public class GeoCentroidIT extends CentroidAggregationTestBase { public void testSingleValueFieldAsSubAggToGeohashGrid() { - SearchResponse response = client().prepareSearch(HIGH_CARD_IDX_NAME) - .addAggregation( - geohashGrid("geoGrid").field(SINGLE_VALUED_FIELD_NAME) - .subAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) - ) - .get(); + SearchResponse response = prepareSearch(HIGH_CARD_IDX_NAME).addAggregation( + geohashGrid("geoGrid").field(SINGLE_VALUED_FIELD_NAME).subAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); GeoGrid grid = response.getAggregations().get("geoGrid"); 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 59393da57666..29592bb1d5d0 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 @@ -99,8 +99,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -129,8 +128,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { @Override public void testUnmapped() throws Exception { int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", new double[] { 0, 10, 15, 100 }).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -153,8 +151,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testSingleValuedField() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -173,8 +170,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { final double[] pcts = null; IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .setQuery(matchAllQuery()) + () -> prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -190,8 +186,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { final double[] pcts = new double[0]; IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .setQuery(matchAllQuery()) + () -> prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -206,8 +201,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testSingleValuedFieldGetProperty() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( global("global").subAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) @@ -236,8 +230,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testSingleValuedFieldOutsideRange() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = new double[] { minValue - 1, maxValue + 1 }; - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -274,8 +267,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testSingleValuedFieldWithValueScript() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -296,8 +288,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -316,8 +307,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testMultiValuedField() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValues, maxValues); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -335,8 +325,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScript() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -354,8 +343,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScriptReverse() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(20 - maxValues, 20 - minValues); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -376,8 +364,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -396,8 +383,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testScriptSingleValued() throws Exception { int sigDigits = randomSignificantDigits(); final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -420,8 +406,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value - dec", params); final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -442,8 +427,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", emptyMap()); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -463,8 +447,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { Script script = AggregationTestScriptsPlugin.DECREMENT_ALL_VALUES; final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.HDR) .numberOfSignificantValueDigits(sigDigits) @@ -481,8 +464,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { public void testOrderBySubAggregation() { int sigDigits = randomSignificantDigits(); boolean asc = randomBoolean(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(2L) @@ -513,8 +495,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>ranks.99", true))) @@ -576,8 +557,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentileRanks("foo", new double[] { 50.0 }).method(PercentilesMethod.HDR) .field("d") @@ -596,8 +576,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentileRanks("foo", new double[] { 50.0 }).method(PercentilesMethod.HDR) .field("d") @@ -616,8 +595,7 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(percentileRanks("foo", new double[] { 50.0 }).method(PercentilesMethod.HDR).field("d")) .get(); assertNoFailures(r); 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 19a1ce91fc4c..d0c173f8f14b 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 @@ -102,8 +102,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -133,8 +132,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { @Override public void testUnmapped() throws Exception { int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -158,8 +156,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testSingleValuedField() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomIntBetween(1, 5); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -178,8 +175,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testSingleValuedFieldGetProperty() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( global("global").subAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) @@ -230,8 +226,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testSingleValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -254,8 +249,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -275,8 +269,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testMultiValuedField() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -295,8 +288,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -315,8 +307,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScriptReverse() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -339,8 +330,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -360,8 +350,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testScriptSingleValued() throws Exception { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -385,8 +374,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -408,8 +396,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", emptyMap()); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -430,8 +417,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { final double[] pcts = randomPercentiles(); int sigDigits = randomSignificantDigits(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( percentiles("percentiles").numberOfSignificantValueDigits(sigDigits) .method(PercentilesMethod.HDR) @@ -449,8 +435,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { public void testOrderBySubAggregation() { int sigDigits = randomSignificantDigits(); boolean asc = randomBoolean(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(2L) @@ -482,8 +467,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>percentiles.99", true))) @@ -545,8 +529,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentiles("foo").method(PercentilesMethod.HDR) .field("d") @@ -566,8 +549,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentiles("foo").method(PercentilesMethod.HDR) .field("d") @@ -587,8 +569,7 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(percentiles("foo").method(PercentilesMethod.HDR).field("d").percentiles(50.0)) .get(); assertNoFailures(r); 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 844b77334f70..0b15180e3944 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 @@ -138,9 +138,9 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - final SearchResponse response = client().prepareSearch("empty_bucket_idx") - .addAggregation(histogram("histogram").field("value").interval(1).minDocCount(0).subAggregation(randomBuilder().field("value"))) - .get(); + final SearchResponse response = prepareSearch("empty_bucket_idx").addAggregation( + histogram("histogram").field("value").interval(1).minDocCount(0).subAggregation(randomBuilder().field("value")) + ).get(); assertHitCount(response, 2); @@ -162,10 +162,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(randomBuilder().field("value")) - .get(); + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(randomBuilder().field("value")).get(); assertHitCount(response, NUMBER_OF_DOCS); @@ -177,8 +174,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(randomBuilder().field("value"))) .get(); @@ -214,8 +210,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldWithValueScript() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -237,8 +232,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { final Map params = new HashMap<>(); params.put("inc", 1); - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + inc", params)) @@ -257,8 +251,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomBuilder().field("values")) .get(); @@ -272,8 +265,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testMultiValuedFieldWithValueScript() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -294,8 +286,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { final Map params = new HashMap<>(); params.put("inc", 1); - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + inc", params)) @@ -313,8 +304,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testScriptSingleValued() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().script( new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value", Collections.emptyMap()) @@ -335,8 +325,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { final Map params = new HashMap<>(); params.put("inc", 1); - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value + inc", params)) ) @@ -354,8 +343,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testScriptMultiValued() throws Exception { - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().script( new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", Collections.emptyMap()) @@ -376,8 +364,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { final Map params = new HashMap<>(); params.put("inc", 1); - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomBuilder().script( new Script( @@ -404,8 +391,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { public void testAsSubAggregation() throws Exception { final int rangeBoundary = (MAX_SAMPLE_VALUE + MIN_SAMPLE_VALUE) / 2; - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( range("range").field("value") .addRange(MIN_SAMPLE_VALUE, rangeBoundary) @@ -448,8 +434,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { final int numberOfBuckets = 10; - final SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + final SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .size(numberOfBuckets) @@ -510,8 +495,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( randomBuilder().field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "Math.random()", emptyMap())) @@ -529,8 +513,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( randomBuilder().field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -548,7 +531,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(randomBuilder().field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(randomBuilder().field("d")).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java index 41dd285e900f..e7570f013842 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java @@ -359,8 +359,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Script combineScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op aggregation", Collections.emptyMap()); Script reduceScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op list aggregation", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(scriptedMetric("scripted").mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript)) .get(); assertNoFailures(response); @@ -402,8 +401,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Script combineScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op aggregation", Collections.emptyMap()); Script reduceScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op list aggregation", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(aggregationParams) .mapScript(mapScript) @@ -451,8 +449,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Map params = new HashMap<>(); params.put("vars", varsMap); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "vars.multiplier = 3", Collections.emptyMap())) @@ -511,8 +508,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); Script reduceScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op list aggregation", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params).mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript) ) @@ -570,8 +566,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); Script reduceScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op list aggregation", Collections.emptyMap()); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(initScript) @@ -638,8 +633,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(initScript) @@ -694,8 +688,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( global("global").subAggregation( scriptedMetric("scripted").params(params) @@ -759,8 +752,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params).mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript) ) @@ -805,8 +797,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(initScript) @@ -853,8 +844,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params).mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript) ) @@ -907,8 +897,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { reduceParams ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(initScript) @@ -942,8 +931,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Map params = new HashMap<>(); params.put("vars", varsMap); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params) .initScript(new Script(ScriptType.STORED, null, "initScript_stored", Collections.emptyMap())) @@ -997,8 +985,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch("idx").setQuery(matchAllQuery()) .setSize(1000) .addAggregation( histogram("histo").field("l_value") @@ -1070,8 +1057,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Collections.emptyMap() ); - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -1144,8 +1130,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); // Test that a non-deterministic init script causes the result to not be cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( scriptedMetric("foo").initScript(ndInitScript).mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript) ) @@ -1162,8 +1147,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); // Test that a non-deterministic map script causes the result to not be cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(scriptedMetric("foo").mapScript(ndMapScript).combineScript(combineScript).reduceScript(reduceScript)) .get(); assertNoFailures(r); @@ -1178,8 +1162,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); // Test that a non-deterministic combine script causes the result to not be cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(scriptedMetric("foo").mapScript(mapScript).combineScript(ndRandom).reduceScript(reduceScript)) .get(); assertNoFailures(r); @@ -1194,8 +1177,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); // NOTE: random reduce scripts don't hit the query shard context (they are done on the coordinator) and so can be cached. - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(scriptedMetric("foo").mapScript(mapScript).combineScript(combineScript).reduceScript(ndRandom)) .get(); assertNoFailures(r); @@ -1210,8 +1192,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); // Test that all deterministic scripts cause the request to be cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation(scriptedMetric("foo").mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript)) .get(); assertNoFailures(r); @@ -1232,8 +1213,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { Script combineScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op aggregation", Collections.emptyMap()); Script reduceScript = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "no-op list aggregation", Collections.emptyMap()); - SearchRequestBuilder builder = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchRequestBuilder builder = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( scriptedMetric("scripted").params(params).mapScript(mapScript).combineScript(combineScript).reduceScript(reduceScript) ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java index 1b1bba3fc252..0492ad315c8d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java @@ -48,8 +48,7 @@ public class StatsIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation(histogram("histo").field("value").interval(1L).minDocCount(0).subAggregation(stats("stats").field("value"))) .get(); @@ -73,10 +72,7 @@ public class StatsIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(stats("stats").field("value")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(stats("stats").field("value")).get(); assertShardExecutionState(searchResponse, 0); @@ -94,8 +90,7 @@ public class StatsIT extends AbstractNumericTestCase { public void testSingleValuedField_WithFormatter() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(stats("stats").format("0000.0").field("value")) .get(); @@ -117,8 +112,7 @@ public class StatsIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(stats("stats").field("value"))) .get(); @@ -156,10 +150,7 @@ public class StatsIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(stats("stats").field("values")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(stats("stats").field("values")).get(); assertShardExecutionState(searchResponse, 0); @@ -180,8 +171,7 @@ public class StatsIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>stats.avg", true))) @@ -254,8 +244,7 @@ public class StatsIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( stats("foo").field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "Math.random()", Collections.emptyMap())) @@ -273,8 +262,7 @@ public class StatsIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( stats("foo").field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value + 1", Collections.emptyMap())) @@ -292,7 +280,7 @@ public class StatsIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(stats("foo").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(stats("foo").field("d")).get(); assertNoFailures(r); assertThat( 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 9ea866f88972..5504dd9148e8 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 @@ -77,8 +77,7 @@ public class SumIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation(histogram("histo").field("value").interval(1L).minDocCount(0).subAggregation(sum("sum").field("value"))) .get(); @@ -100,10 +99,7 @@ public class SumIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(sum("sum").field("value")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(sum("sum").field("value")).get(); assertHitCount(searchResponse, 10); @@ -114,8 +110,7 @@ public class SumIT extends AbstractNumericTestCase { } public void testSingleValuedFieldWithFormatter() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(sum("sum").format("0000.0").field("value")) .get(); @@ -131,8 +126,7 @@ public class SumIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(sum("sum").field("value"))) .get(); @@ -158,10 +152,7 @@ public class SumIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(sum("sum").field("values")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(sum("sum").field("values")).get(); assertHitCount(searchResponse, 10); @@ -173,8 +164,7 @@ public class SumIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>sum", true))) @@ -232,8 +222,7 @@ public class SumIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( sum("foo").field("d").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, RANDOM_SCRIPT, Collections.emptyMap())) ) @@ -250,8 +239,7 @@ public class SumIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( sum("foo").field("d").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, VALUE_SCRIPT, Collections.emptyMap())) ) @@ -268,7 +256,7 @@ public class SumIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(sum("foo").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(sum("foo").field("d")).get(); assertNoFailures(r); assertThat( 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 8a1ee38630be..edcb65f169bc 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 @@ -96,8 +96,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -123,8 +122,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { final double[] pcts = null; IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .setQuery(matchAllQuery()) + () -> prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.TDIGEST).field("value")) .get() ); @@ -135,8 +133,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { final double[] pcts = new double[0]; IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("idx") - .setQuery(matchAllQuery()) + () -> prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(percentileRanks("percentile_ranks", pcts).method(PercentilesMethod.TDIGEST).field("value")) .get() ); @@ -145,8 +142,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testUnmapped() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", new double[] { 0, 10, 15, 100 })).field("value")) .get(); @@ -164,8 +160,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).field("value")) .get(); @@ -178,8 +173,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).field("value"))) .get(); @@ -200,8 +194,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { public void testSingleValuedFieldOutsideRange() throws Exception { final double[] pcts = new double[] { minValue - 1, maxValue + 1 }; - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).field("value")) .get(); @@ -228,8 +221,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -247,8 +239,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - dec", params)) @@ -264,8 +255,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { final double[] pcts = randomPercents(minValues, maxValues); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).field("values")) .get(); @@ -278,8 +268,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testMultiValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -294,8 +283,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScriptReverse() throws Exception { final double[] pcts = randomPercents(-maxValues, -minValues); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value * -1", emptyMap())) @@ -313,8 +301,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - dec", params)) @@ -330,8 +317,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testScriptSingleValued() throws Exception { final double[] pcts = randomPercents(minValue, maxValue); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentileRanks("percentile_ranks", pcts)).script( new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value", emptyMap()) @@ -353,8 +339,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value - dec", params); final double[] pcts = randomPercents(minValue - 1, maxValue - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).script(script)) .get(); @@ -368,8 +353,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { public void testScriptMultiValued() throws Exception { final double[] pcts = randomPercents(minValues, maxValues); Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", emptyMap()); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).script(script)) .get(); @@ -384,8 +368,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { Script script = AggregationTestScriptsPlugin.DECREMENT_ALL_VALUES; final double[] pcts = randomPercents(minValues - 1, maxValues - 1); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentileRanks("percentile_ranks", pcts)).script(script)) .get(); @@ -397,8 +380,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { public void testOrderBySubAggregation() { boolean asc = randomBoolean(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(2L) @@ -425,8 +407,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>ranks.99", true))) @@ -488,8 +469,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentileRanks("foo", new double[] { 50.0 }).field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "Math.random()", emptyMap())) @@ -507,8 +487,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentileRanks("foo", new double[] { 50.0 }).field("d") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -526,10 +505,7 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx") - .setSize(0) - .addAggregation(percentileRanks("foo", new double[] { 50.0 }).field("d")) - .get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(percentileRanks("foo", new double[] { 50.0 }).field("d")).get(); assertNoFailures(r); assertThat( 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 5a2f246735a3..3e7f4f978032 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 @@ -102,8 +102,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("empty_bucket_idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("empty_bucket_idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(1L) @@ -127,8 +126,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testUnmapped() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).field("value").percentiles(0, 10, 15, 100)) .get(); @@ -146,8 +144,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testSingleValuedField() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).field("value").percentiles(pcts)) .get(); @@ -160,8 +157,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldGetProperty() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(randomCompression(percentiles("percentiles")).field("value").percentiles(pcts))) .get(); @@ -197,8 +193,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testSingleValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentiles("percentiles")).field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -217,8 +212,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentiles("percentiles")).field("value") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - dec", params)) @@ -235,8 +229,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testMultiValuedField() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).field("values").percentiles(pcts)) .get(); @@ -249,8 +242,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testMultiValuedFieldWithValueScript() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentiles("percentiles")).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - 1", emptyMap())) @@ -266,8 +258,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { public void testMultiValuedFieldWithValueScriptReverse() throws Exception { final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentiles("percentiles")).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value * -1", emptyMap())) @@ -286,8 +277,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { Map params = new HashMap<>(); params.put("dec", 1); final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( randomCompression(percentiles("percentiles")).field("values") .script(new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "_value - dec", params)) @@ -305,8 +295,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { public void testScriptSingleValued() throws Exception { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value", emptyMap()); final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).script(script).percentiles(pcts)) .get(); @@ -324,8 +313,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['value'].value - dec", params); final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).script(script).percentiles(pcts)) .get(); @@ -340,8 +328,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { final double[] pcts = randomPercentiles(); Script script = new Script(ScriptType.INLINE, AggregationTestScriptsPlugin.NAME, "doc['values']", emptyMap()); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).script(script).percentiles(pcts)) .get(); @@ -356,8 +343,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { Script script = AggregationTestScriptsPlugin.DECREMENT_ALL_VALUES; final double[] pcts = randomPercentiles(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(randomCompression(percentiles("percentiles")).script(script).percentiles(pcts)) .get(); @@ -369,8 +355,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { public void testOrderBySubAggregation() { boolean asc = randomBoolean(); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( histogram("histo").field("value") .interval(2L) @@ -397,8 +382,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { @Override public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>percentiles.99", true))) @@ -460,8 +444,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentiles("foo").field("d") .percentiles(50.0) @@ -480,8 +463,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( percentiles("foo").field("d") .percentiles(50.0) @@ -500,7 +482,7 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(percentiles("foo").field("d").percentiles(50.0)).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(percentiles("foo").field("d").percentiles(50.0)).get(); assertNoFailures(r); assertThat( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java index 685e269516b0..6622e4d908ef 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java @@ -311,13 +311,11 @@ public class TopHitsIT extends ESIntegTestCase { } public void testBasics() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ).get(); assertNoFailures(response); @@ -347,8 +345,7 @@ public class TopHitsIT extends ESIntegTestCase { public void testIssue11119() throws Exception { // Test that top_hits aggregation is fed scores if query results size=0 - SearchResponse response = client().prepareSearch("field-collapsing") - .setSize(0) + SearchResponse response = prepareSearch("field-collapsing").setSize(0) .setQuery(matchQuery("text", "x y z")) .addAggregation(terms("terms").executionHint(randomExecutionHint()).field("group").subAggregation(topHits("hits"))) .get(); @@ -380,8 +377,7 @@ public class TopHitsIT extends ESIntegTestCase { // (technically not a test of top_hits but implementation details are // tied up with the need to feed scores into the agg tree even when // users don't want ranked set of query results.) - response = client().prepareSearch("field-collapsing") - .setSize(0) + response = prepareSearch("field-collapsing").setSize(0) .setMinScore(0.0001f) .setQuery(matchQuery("text", "x y z")) .addAggregation(terms("terms").executionHint(randomExecutionHint()).field("group")) @@ -399,14 +395,12 @@ public class TopHitsIT extends ESIntegTestCase { } public void testBreadthFirstWithScoreNeeded() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .collectMode(SubAggCollectionMode.BREADTH_FIRST) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").size(3)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .collectMode(SubAggCollectionMode.BREADTH_FIRST) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").size(3)) + ).get(); assertNoFailures(response); @@ -430,16 +424,14 @@ public class TopHitsIT extends ESIntegTestCase { } public void testBreadthFirstWithAggOrderAndScoreNeeded() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .collectMode(SubAggCollectionMode.BREADTH_FIRST) - .field(TERMS_AGGS_FIELD) - .order(BucketOrder.aggregation("max", false)) - .subAggregation(max("max").field(SORT_FIELD)) - .subAggregation(topHits("hits").size(3)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .collectMode(SubAggCollectionMode.BREADTH_FIRST) + .field(TERMS_AGGS_FIELD) + .order(BucketOrder.aggregation("max", false)) + .subAggregation(max("max").field(SORT_FIELD)) + .subAggregation(topHits("hits").size(3)) + ).get(); assertNoFailures(response); @@ -463,8 +455,7 @@ public class TopHitsIT extends ESIntegTestCase { } public void testBasicsGetProperty() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(topHits("hits"))) .get(); @@ -486,17 +477,14 @@ public class TopHitsIT extends ESIntegTestCase { public void testPagination() throws Exception { int size = randomIntBetween(1, 10); int from = randomIntBetween(0, 10); - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)).from(from).size(size)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)).from(from).size(size)) + ).get(); assertNoFailures(response); - SearchResponse control = client().prepareSearch("idx") - .setFrom(from) + SearchResponse control = prepareSearch("idx").setFrom(from) .setSize(size) .setPostFilter(QueryBuilders.termQuery(TERMS_AGGS_FIELD, "val0")) .addSort(SORT_FIELD, SortOrder.DESC) @@ -531,15 +519,13 @@ public class TopHitsIT extends ESIntegTestCase { } public void testSortByBucket() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .order(BucketOrder.aggregation("max_sort", false)) - .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)).trackScores(true)) - .subAggregation(max("max_sort").field(SORT_FIELD)) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .order(BucketOrder.aggregation("max_sort", false)) + .subAggregation(topHits("hits").sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)).trackScores(true)) + .subAggregation(max("max_sort").field(SORT_FIELD)) + ).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("terms"); @@ -566,8 +552,7 @@ public class TopHitsIT extends ESIntegTestCase { } public void testFieldCollapsing() throws Exception { - SearchResponse response = client().prepareSearch("field-collapsing") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("field-collapsing").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(matchQuery("text", "term rare")) .addAggregation( terms("terms").executionHint(randomExecutionHint()) @@ -612,8 +597,7 @@ public class TopHitsIT extends ESIntegTestCase { public void testFetchFeatures() { final boolean seqNoAndTerm = randomBoolean(); - SearchResponse response = client().prepareSearch("idx") - .setQuery(matchQuery("text", "text").queryName("test")) + SearchResponse response = prepareSearch("idx").setQuery(matchQuery("text", "text").queryName("test")) .addAggregation( terms("terms").executionHint(randomExecutionHint()) .field(TERMS_AGGS_FIELD) @@ -683,13 +667,11 @@ public class TopHitsIT extends ESIntegTestCase { public void testInvalidSortField() throws Exception { try { - client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").sort(SortBuilders.fieldSort("xyz").order(SortOrder.DESC))) - ) - .get(); + prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").sort(SortBuilders.fieldSort("xyz").order(SortOrder.DESC))) + ).get(); fail(); } catch (SearchPhaseExecutionException e) { assertThat(e.toString(), containsString("No mapping found for [xyz] in order to sort on")); @@ -697,7 +679,7 @@ public class TopHitsIT extends ESIntegTestCase { } public void testEmptyIndex() throws Exception { - SearchResponse response = client().prepareSearch("empty").addAggregation(topHits("hits")).get(); + SearchResponse response = prepareSearch("empty").addAggregation(topHits("hits")).get(); assertNoFailures(response); TopHits hits = response.getAggregations().get("hits"); @@ -710,8 +692,7 @@ public class TopHitsIT extends ESIntegTestCase { boolean[] trackScores = new boolean[] { true, false }; for (boolean trackScore : trackScores) { logger.info("Track score={}", trackScore); - SearchResponse response = client().prepareSearch("field-collapsing") - .setQuery(matchQuery("text", "term rare")) + SearchResponse response = prepareSearch("field-collapsing").setQuery(matchQuery("text", "term rare")) .addAggregation( terms("terms").field("group") .subAggregation(topHits("hits").trackScores(trackScore).size(1).sort("_index", SortOrder.DESC)) @@ -748,8 +729,7 @@ public class TopHitsIT extends ESIntegTestCase { } public void testTopHitsInNestedSimple() throws Exception { - SearchResponse searchResponse = client().prepareSearch("articles") - .setQuery(matchQuery("title", "title")) + SearchResponse searchResponse = prepareSearch("articles").setQuery(matchQuery("title", "title")) .addAggregation( nested("to-comments", "comments").subAggregation( terms("users").field("comments.user").subAggregation(topHits("top-comments").sort("comments.date", SortOrder.ASC)) @@ -793,8 +773,7 @@ public class TopHitsIT extends ESIntegTestCase { } public void testTopHitsInSecondLayerNested() throws Exception { - SearchResponse searchResponse = client().prepareSearch("articles") - .setQuery(matchQuery("title", "title")) + SearchResponse searchResponse = prepareSearch("articles").setQuery(matchQuery("title", "title")) .addAggregation( nested("to-comments", "comments").subAggregation( nested("to-reviewers", "comments.reviewers").subAggregation( @@ -896,8 +875,9 @@ public class TopHitsIT extends ESIntegTestCase { matchQuery("comments.message", "comment") ).highlighterType(hlType); - SearchResponse searchResponse = client().prepareSearch("articles") - .setQuery(nestedQuery("comments", matchQuery("comments.message", "comment").queryName("test"), ScoreMode.Avg)) + SearchResponse searchResponse = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "comment").queryName("test"), ScoreMode.Avg) + ) .addAggregation( nested("to-comments", "comments").subAggregation( topHits("top-comments").size(1) @@ -949,21 +929,19 @@ public class TopHitsIT extends ESIntegTestCase { } public void testTopHitsInNested() throws Exception { - SearchResponse searchResponse = client().prepareSearch("articles") - .addAggregation( - histogram("dates").field("date") - .interval(5) - .subAggregation( - nested("to-comments", "comments").subAggregation( - topHits("comments").highlighter( - new HighlightBuilder().field( - new HighlightBuilder.Field("comments.message").highlightQuery(matchQuery("comments.message", "text")) - ) - ).sort("comments.id", SortOrder.ASC) - ) + SearchResponse searchResponse = prepareSearch("articles").addAggregation( + histogram("dates").field("date") + .interval(5) + .subAggregation( + nested("to-comments", "comments").subAggregation( + topHits("comments").highlighter( + new HighlightBuilder().field( + new HighlightBuilder.Field("comments.message").highlightQuery(matchQuery("comments.message", "text")) + ) + ).sort("comments.id", SortOrder.ASC) ) - ) - .get(); + ) + ).get(); Histogram histogram = searchResponse.getAggregations().get("dates"); for (int i = 0; i < numArticles; i += 5) { @@ -995,38 +973,33 @@ public class TopHitsIT extends ESIntegTestCase { "idx" ); assertNoFailures( - client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation( - topHits("hits").size(ArrayUtil.MAX_ARRAY_LENGTH - 1) - .sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)) - ) - ) + prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation( + topHits("hits").size(ArrayUtil.MAX_ARRAY_LENGTH - 1).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC)) + ) + ) ); updateIndexSettings(Settings.builder().putNull(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey()), "idx"); } public void testTooHighResultWindow() throws Exception { assertNoFailures( - client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").from(50).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) + prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").from(50).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ) ); Exception e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").from(100).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) - .get() + () -> prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").from(100).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ).get() ); assertThat( e.getCause().getMessage(), @@ -1034,13 +1007,11 @@ public class TopHitsIT extends ESIntegTestCase { ); e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").from(10).size(100).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) - .get() + () -> prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").from(10).size(100).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ).get() ); assertThat( e.getCause().getMessage(), @@ -1049,32 +1020,28 @@ public class TopHitsIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey(), 110), "idx"); assertNoFailures( - client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").from(100).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) + prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").from(100).size(10).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ) ); assertNoFailures( - client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").from(10).size(100).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) - ) + prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").from(10).size(100).sort(SortBuilders.fieldSort(SORT_FIELD).order(SortOrder.DESC))) + ) ); updateIndexSettings(Settings.builder().putNull(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey()), "idx"); } public void testNoStoredFields() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms("terms").executionHint(randomExecutionHint()) - .field(TERMS_AGGS_FIELD) - .subAggregation(topHits("hits").storedField("_none_")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms("terms").executionHint(randomExecutionHint()) + .field(TERMS_AGGS_FIELD) + .subAggregation(topHits("hits").storedField("_none_")) + ).get(); assertNoFailures(response); @@ -1129,8 +1096,7 @@ public class TopHitsIT extends ESIntegTestCase { ); // Test that a request using a nondeterministic script field does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( topHits("foo").scriptField( "bar", @@ -1150,8 +1116,7 @@ public class TopHitsIT extends ESIntegTestCase { ); // Test that a request using a nondeterministic script sort does not get cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( topHits("foo").sort( SortBuilders.scriptSort( @@ -1173,8 +1138,7 @@ public class TopHitsIT extends ESIntegTestCase { ); // Test that a request using a deterministic script field does not get cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( topHits("foo").scriptField("bar", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "5", Collections.emptyMap())) ) @@ -1191,8 +1155,7 @@ public class TopHitsIT extends ESIntegTestCase { ); // Test that a request using a deterministic script sort does not get cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( topHits("foo").sort( SortBuilders.scriptSort( @@ -1214,7 +1177,7 @@ public class TopHitsIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(topHits("foo")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(topHits("foo")).get(); assertNoFailures(r); assertThat( @@ -1233,8 +1196,7 @@ public class TopHitsIT extends ESIntegTestCase { public void testWithRescore() { // Rescore with default sort on relevancy (score) { - SearchResponse response = client().prepareSearch("idx") - .addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) + SearchResponse response = prepareSearch("idx").addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) .addAggregation(terms("terms").field(TERMS_AGGS_FIELD).subAggregation(topHits("hits"))) .get(); Terms terms = response.getAggregations().get("terms"); @@ -1247,8 +1209,7 @@ public class TopHitsIT extends ESIntegTestCase { } { - SearchResponse response = client().prepareSearch("idx") - .addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) + SearchResponse response = prepareSearch("idx").addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) .addAggregation(terms("terms").field(TERMS_AGGS_FIELD).subAggregation(topHits("hits").sort(SortBuilders.scoreSort()))) .get(); Terms terms = response.getAggregations().get("terms"); @@ -1262,8 +1223,7 @@ public class TopHitsIT extends ESIntegTestCase { // Rescore should not be applied if the sort order is not relevancy { - SearchResponse response = client().prepareSearch("idx") - .addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) + SearchResponse response = prepareSearch("idx").addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) .addAggregation( terms("terms").field(TERMS_AGGS_FIELD).subAggregation(topHits("hits").sort(SortBuilders.fieldSort("_index"))) ) @@ -1278,8 +1238,7 @@ public class TopHitsIT extends ESIntegTestCase { } { - SearchResponse response = client().prepareSearch("idx") - .addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) + SearchResponse response = prepareSearch("idx").addRescorer(new QueryRescorerBuilder(new MatchAllQueryBuilder().boost(3.0f))) .addAggregation( terms("terms").field(TERMS_AGGS_FIELD) .subAggregation(topHits("hits").sort(SortBuilders.scoreSort()).sort(SortBuilders.fieldSort("_index"))) 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 62f28211c674..4d5c06d8acdd 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 @@ -67,8 +67,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testUnmapped() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx_unmapped") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx_unmapped").setQuery(matchAllQuery()) .addAggregation(count("count").field("value")) .get(); @@ -81,10 +80,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testSingleValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(count("count").field("value")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(count("count").field("value")).get(); assertHitCount(searchResponse, 10); @@ -95,8 +91,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testSingleValuedFieldGetProperty() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(count("count").field("value"))) .get(); @@ -133,10 +128,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testMultiValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) - .addAggregation(count("count").field("values")) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()).addAggregation(count("count").field("values")).get(); assertHitCount(searchResponse, 10); @@ -147,8 +139,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testSingleValuedScript() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( count("count").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, VALUE_FIELD_SCRIPT, Collections.emptyMap())) ) @@ -163,8 +154,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testMultiValuedScript() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( count("count").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, SUM_VALUES_FIELD_SCRIPT, Collections.emptyMap())) ) @@ -180,8 +170,7 @@ public class ValueCountIT extends ESIntegTestCase { public void testSingleValuedScriptWithParams() throws Exception { Map params = Collections.singletonMap("field", "value"); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(count("count").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, SUM_FIELD_PARAMS_SCRIPT, params))) .get(); @@ -195,8 +184,7 @@ public class ValueCountIT extends ESIntegTestCase { public void testMultiValuedScriptWithParams() throws Exception { Map params = Collections.singletonMap("field", "values"); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation(count("count").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, SUM_FIELD_PARAMS_SCRIPT, params))) .get(); @@ -235,8 +223,7 @@ public class ValueCountIT extends ESIntegTestCase { ); // Test that a request using a nondeterministic script does not get cached - SearchResponse r = client().prepareSearch("cache_test_idx") - .setSize(0) + SearchResponse r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( count("foo").field("d").script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, RANDOM_SCRIPT, Collections.emptyMap())) ) @@ -253,8 +240,7 @@ public class ValueCountIT extends ESIntegTestCase { ); // Test that a request using a deterministic script gets cached - r = client().prepareSearch("cache_test_idx") - .setSize(0) + r = prepareSearch("cache_test_idx").setSize(0) .addAggregation( count("foo").field("d") .script(new Script(ScriptType.INLINE, METRIC_SCRIPT_ENGINE, VALUE_FIELD_SCRIPT, Collections.emptyMap())) @@ -272,7 +258,7 @@ public class ValueCountIT extends ESIntegTestCase { ); // Ensure that non-scripted requests are cached as normal - r = client().prepareSearch("cache_test_idx").setSize(0).addAggregation(count("foo").field("d")).get(); + r = prepareSearch("cache_test_idx").setSize(0).addAggregation(count("foo").field("d")).get(); assertNoFailures(r); assertThat( @@ -286,8 +272,7 @@ public class ValueCountIT extends ESIntegTestCase { } public void testOrderByEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("idx").setQuery(matchAllQuery()) .addAggregation( terms("terms").field("value") .order(BucketOrder.compound(BucketOrder.aggregation("filter>count", true))) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketMetricsPipeLineAggregationTestCase.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketMetricsPipeLineAggregationTestCase.java index 4947f9a3a43e..195b4a41b617 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketMetricsPipeLineAggregationTestCase.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/BucketMetricsPipeLineAggregationTestCase.java @@ -127,12 +127,9 @@ abstract class BucketMetricsPipeLineAggregationTestCase_count")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME).interval(interval).extendedBounds(minRandomValue, maxRandomValue) + ).addAggregation(BucketMetricsPipelineAgg("pipeline_agg", histoName + ">_count")).get(); assertNoFailures(response); @@ -157,18 +154,14 @@ abstract class BucketMetricsPipeLineAggregationTestCase_count")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME).interval(interval).extendedBounds(minRandomValue, maxRandomValue) + ) + .subAggregation(BucketMetricsPipelineAgg("pipeline_agg", histoName + ">_count")) + ).get(); assertNoFailures(response); @@ -203,10 +196,9 @@ abstract class BucketMetricsPipeLineAggregationTestCasesum")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag").subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).addAggregation(BucketMetricsPipelineAgg("pipeline_agg", termsName + ">sum")).get(); assertNoFailures(response); @@ -236,19 +228,17 @@ abstract class BucketMetricsPipeLineAggregationTestCasesum")) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .extendedBounds(minRandomValue, maxRandomValue) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ) + .subAggregation(BucketMetricsPipelineAgg("pipeline_agg", histoName + ">sum")) + ).get(); assertNoFailures(response); @@ -292,21 +282,19 @@ abstract class BucketMetricsPipeLineAggregationTestCasesum").gapPolicy(BucketHelpers.GapPolicy.INSERT_ZEROS) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .extendedBounds(minRandomValue, maxRandomValue) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ) + .subAggregation( + BucketMetricsPipelineAgg("pipeline_agg", histoName + ">sum").gapPolicy(BucketHelpers.GapPolicy.INSERT_ZEROS) + ) + ).get(); assertNoFailures(response); @@ -346,14 +334,11 @@ abstract class BucketMetricsPipeLineAggregationTestCasesum")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .includeExclude(new IncludeExclude(null, "tag.*", null, null)) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).addAggregation(BucketMetricsPipelineAgg("pipeline_agg", termsName + ">sum")).get(); assertNoFailures(response); @@ -371,19 +356,14 @@ abstract class BucketMetricsPipeLineAggregationTestCase_count")) - ) - .addAggregation(BucketMetricsPipelineAgg("nested_terms_bucket", termsName + ">nested_histo_bucket." + nestedMetric())) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME).interval(interval).extendedBounds(minRandomValue, maxRandomValue) + ) + .subAggregation(BucketMetricsPipelineAgg("nested_histo_bucket", histoName + ">_count")) + ).addAggregation(BucketMetricsPipelineAgg("nested_terms_bucket", termsName + ">nested_histo_bucket." + nestedMetric())).get(); assertNoFailures(response); @@ -488,7 +468,7 @@ abstract class BucketMetricsPipeLineAggregationTestCasetotal_licenses")); - SearchResponse response = client().prepareSearch("foo_*").setSize(0).addAggregation(groupByLicenseAgg).get(); + SearchResponse response = prepareSearch("foo_*").setSize(0).addAggregation(groupByLicenseAgg).get(); BytesReference bytes = XContentHelper.toXContent(response, XContentType.JSON, false); XContentHelper.convertToMap(bytes, false, XContentType.JSON); } 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 56101a7c7a4c..c53f6c276cea 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 @@ -155,24 +155,22 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScript() { - SearchResponse response = client().prepareSearch("idx") - .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").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); @@ -205,24 +203,22 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScript2() { - SearchResponse response = client().prepareSearch("idx") - .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").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); @@ -255,24 +251,22 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScriptWithDateRange() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - dateRange("range").field(FIELD_5_NAME) - .addUnboundedFrom(date) - .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").addAggregation( + dateRange("range").field(FIELD_5_NAME) + .addUnboundedFrom(date) + .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); @@ -305,20 +299,18 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScriptSingleVariable() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(FIELD_1_NAME) - .interval(interval) - .subAggregation(sum("field2Sum").field(FIELD_2_NAME)) - .subAggregation( - bucketScript( - "seriesArithmetic", - new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0", Collections.emptyMap()), - "field2Sum" - ) + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(FIELD_1_NAME) + .interval(interval) + .subAggregation(sum("field2Sum").field(FIELD_2_NAME)) + .subAggregation( + bucketScript( + "seriesArithmetic", + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0", Collections.emptyMap()), + "field2Sum" ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -349,22 +341,20 @@ public class BucketScriptIT extends ESIntegTestCase { bucketsPathsMap.put("foo", "field2Sum"); bucketsPathsMap.put("bar", "field3Sum"); bucketsPathsMap.put("baz", "field4Sum"); - SearchResponse response = client().prepareSearch("idx") - .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", - bucketsPathsMap, - new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "foo + bar + baz", Collections.emptyMap()) - ) + SearchResponse response = prepareSearch("idx").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", + bucketsPathsMap, + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "foo + bar + baz", Collections.emptyMap()) ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -402,16 +392,14 @@ public class BucketScriptIT extends ESIntegTestCase { Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "(_value0 + _value1 + _value2) * factor", params); - SearchResponse response = client().prepareSearch("idx") - .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", script, "field2Sum", "field3Sum", "field4Sum")) - ) - .get(); + SearchResponse response = prepareSearch("idx").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", script, "field2Sum", "field3Sum", "field4Sum")) + ).get(); assertNoFailures(response); @@ -444,24 +432,22 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScriptInsertZeros() { - SearchResponse response = client().prepareSearch("idx") - .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" - ).gapPolicy(GapPolicy.INSERT_ZEROS) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").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" + ).gapPolicy(GapPolicy.INSERT_ZEROS) + ) + ).get(); assertNoFailures(response); @@ -496,18 +482,13 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testInlineScriptReturnNull() { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(FIELD_1_NAME) - .interval(interval) - .subAggregation( - bucketScript( - "nullField", - new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "return null", Collections.emptyMap()) - ) - ) - ) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(FIELD_1_NAME) + .interval(interval) + .subAggregation( + bucketScript("nullField", new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "return null", Collections.emptyMap())) + ) + ).get(); assertNoFailures(response); @@ -533,24 +514,22 @@ public class BucketScriptIT extends ESIntegTestCase { ) ); - SearchResponse response = client().prepareSearch("idx") - .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.STORED, null, "my_script", Collections.emptyMap()), - "field2Sum", - "field3Sum", - "field4Sum" - ) + SearchResponse response = prepareSearch("idx").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.STORED, null, "my_script", Collections.emptyMap()), + "field2Sum", + "field3Sum", + "field4Sum" ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -583,24 +562,22 @@ public class BucketScriptIT extends ESIntegTestCase { } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch("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_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); @@ -823,29 +800,22 @@ public class BucketScriptIT extends ESIntegTestCase { public void testInlineScriptWithMultiValueAggregationIllegalBucketsPaths() { try { - client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(FIELD_1_NAME) - .interval(interval) - .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME).percentiles(10, 50, 90)) - .subAggregation(percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(10, 50, 90)) - .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(10, 50, 90)) - .subAggregation( - bucketScript( - "seriesArithmetic", - new Script( - ScriptType.INLINE, - CustomScriptPlugin.NAME, - "_value0 + _value1 + _value2", - Collections.emptyMap() - ), - "field2Percentile", - "field3Percentile", - "field4Percentile" - ) + prepareSearch("idx").addAggregation( + histogram("histo").field(FIELD_1_NAME) + .interval(interval) + .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME).percentiles(10, 50, 90)) + .subAggregation(percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(10, 50, 90)) + .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(10, 50, 90)) + .subAggregation( + bucketScript( + "seriesArithmetic", + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), + "field2Percentile", + "field3Percentile", + "field4Percentile" ) - ) - .get(); + ) + ).get(); fail("Illegal bucketsPaths was provided but no exception was thrown."); } catch (Exception e) { @@ -866,24 +836,22 @@ public class BucketScriptIT extends ESIntegTestCase { public void testInlineScriptWithMultiValueAggregation() { int percentile = 90; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(FIELD_1_NAME) - .interval(interval) - .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME).percentiles(percentile)) - .subAggregation(percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(percentile)) - .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(percentile)) - .subAggregation( - bucketScript( - "seriesArithmetic", - new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), - "field2Percentile", - "field3Percentile", - "field4Percentile" - ) + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(FIELD_1_NAME) + .interval(interval) + .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME).percentiles(percentile)) + .subAggregation(percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(percentile)) + .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(percentile)) + .subAggregation( + bucketScript( + "seriesArithmetic", + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), + "field2Percentile", + "field3Percentile", + "field4Percentile" ) - ) - .get(); + ) + ).get(); assertNoFailures(response); @@ -919,26 +887,22 @@ public class BucketScriptIT extends ESIntegTestCase { int percentile10 = 10; int percentile50 = 50; int percentile90 = 90; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - histogram("histo").field(FIELD_1_NAME) - .interval(interval) - .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME)) - .subAggregation( - percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(percentile10, percentile50, percentile90) + SearchResponse response = prepareSearch("idx").addAggregation( + histogram("histo").field(FIELD_1_NAME) + .interval(interval) + .subAggregation(percentiles("field2Percentile").field(FIELD_2_NAME)) + .subAggregation(percentiles("field3Percentile").field(FIELD_3_NAME).percentiles(percentile10, percentile50, percentile90)) + .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(percentile90)) + .subAggregation( + bucketScript( + "seriesArithmetic", + new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), + "field2Percentile.10", + "field3Percentile.50", + "field4Percentile" ) - .subAggregation(percentiles("field4Percentile").field(FIELD_4_NAME).percentiles(percentile90)) - .subAggregation( - bucketScript( - "seriesArithmetic", - new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "_value0 + _value1 + _value2", Collections.emptyMap()), - "field2Percentile.10", - "field3Percentile.50", - "field4Percentile" - ) - ) - ) - .get(); + ) + ).get(); assertNoFailures(response); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java index 87731e40b9a9..e5bece3c404a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java @@ -100,8 +100,7 @@ public class ExtendedStatsBucketIT extends BucketMetricsPipeLineAggregationTestC */ public void testGappyIndexWithSigma() { double sigma = randomDoubleBetween(1.0, 6.0, true); - SearchResponse response = client().prepareSearch("idx_gappy") - .addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(1L)) + SearchResponse response = prepareSearch("idx_gappy").addAggregation(histogram("histo").field(SINGLE_VALUED_FIELD_NAME).interval(1L)) .addAggregation(extendedStatsBucket("extended_stats_bucket", "histo>_count").sigma(sigma)) .get(); assertNoFailures(response); @@ -151,19 +150,17 @@ public class ExtendedStatsBucketIT extends BucketMetricsPipeLineAggregationTestC public void testBadSigmaAsSubAgg() throws Exception { Exception ex = expectThrows( Exception.class, - () -> client().prepareSearch("idx") - .addAggregation( - terms("terms").field("tag") - .order(BucketOrder.key(true)) - .subAggregation( - histogram("histo").field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .extendedBounds(minRandomValue, maxRandomValue) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .subAggregation(extendedStatsBucket("extended_stats_bucket", "histo>sum").sigma(-1.0)) - ) - .get() + () -> prepareSearch("idx").addAggregation( + terms("terms").field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram("histo").field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .extendedBounds(minRandomValue, maxRandomValue) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ) + .subAggregation(extendedStatsBucket("extended_stats_bucket", "histo>sum").sigma(-1.0)) + ).get() ); Throwable cause = ExceptionsHelper.unwrapCause(ex); if (cause == null) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java index ab9987f7d125..4b41d71ff6e6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/pipeline/PercentilesBucketIT.java @@ -68,10 +68,9 @@ public class PercentilesBucketIT extends BucketMetricsPipeLineAggregationTestCas } public void testMetricTopLevelDefaultPercents() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation(terms(termsName).field("tag").subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME))) - .addAggregation(percentilesBucket("percentiles_bucket", termsName + ">sum")) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag").subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).addAggregation(percentilesBucket("percentiles_bucket", termsName + ">sum")).get(); assertNoFailures(response); @@ -101,14 +100,11 @@ public class PercentilesBucketIT extends BucketMetricsPipeLineAggregationTestCas } public void testWrongPercents() throws Exception { - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms(termsName).field("tag") - .includeExclude(new IncludeExclude(null, "tag.*", null, null)) - .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) - ) - .addAggregation(percentilesBucket("percentiles_bucket", termsName + ">sum").setPercents(PERCENTS)) - .get(); + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .includeExclude(new IncludeExclude(null, "tag.*", null, null)) + .subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME)) + ).addAggregation(percentilesBucket("percentiles_bucket", termsName + ">sum").setPercents(PERCENTS)).get(); assertNoFailures(response); @@ -134,8 +130,7 @@ public class PercentilesBucketIT extends BucketMetricsPipeLineAggregationTestCas double[] badPercents = { -1.0, 110.0 }; try { - client().prepareSearch("idx") - .addAggregation(terms(termsName).field("tag").subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME))) + prepareSearch("idx").addAggregation(terms(termsName).field("tag").subAggregation(sum("sum").field(SINGLE_VALUED_FIELD_NAME))) .addAggregation(percentilesBucket("percentiles_bucket", termsName + ">sum").setPercents(badPercents)) .get(); @@ -161,18 +156,16 @@ public class PercentilesBucketIT extends BucketMetricsPipeLineAggregationTestCas double[] badPercents = { -1.0, 110.0 }; try { - client().prepareSearch("idx") - .addAggregation( - terms(termsName).field("tag") - .order(BucketOrder.key(true)) - .subAggregation( - histogram(histoName).field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .extendedBounds(minRandomValue, maxRandomValue) - ) - .subAggregation(percentilesBucket("percentiles_bucket", histoName + ">_count").setPercents(badPercents)) - ) - .get(); + prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME) + .interval(interval) + .extendedBounds(minRandomValue, maxRandomValue) + ) + .subAggregation(percentilesBucket("percentiles_bucket", histoName + ">_count").setPercents(badPercents)) + ).get(); fail("Illegal percent's were provided but no exception was thrown."); } catch (Exception e) { @@ -194,17 +187,14 @@ public class PercentilesBucketIT extends BucketMetricsPipeLineAggregationTestCas public void testNestedWithDecimal() throws Exception { double[] percent = { 99.9 }; - SearchResponse response = client().prepareSearch("idx") - .addAggregation( - terms(termsName).field("tag") - .order(BucketOrder.key(true)) - .subAggregation( - histogram(histoName).field(SINGLE_VALUED_FIELD_NAME) - .interval(interval) - .extendedBounds(minRandomValue, maxRandomValue) - ) - .subAggregation(percentilesBucket("percentile_histo_bucket", histoName + ">_count").setPercents(percent)) - ) + SearchResponse response = prepareSearch("idx").addAggregation( + terms(termsName).field("tag") + .order(BucketOrder.key(true)) + .subAggregation( + histogram(histoName).field(SINGLE_VALUED_FIELD_NAME).interval(interval).extendedBounds(minRandomValue, maxRandomValue) + ) + .subAggregation(percentilesBucket("percentile_histo_bucket", histoName + ">_count").setPercents(percent)) + ) .addAggregation(percentilesBucket("percentile_terms_bucket", termsName + ">percentile_histo_bucket[99.9]").setPercents(percent)) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java index 5f42ac690fdd..eb6dd2f0767f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java @@ -64,7 +64,7 @@ public class SearchWhileCreatingIndexIT extends ESIntegTestCase { ClusterHealthStatus status = clusterAdmin().prepareHealth("test").get().getStatus(); while (status != ClusterHealthStatus.GREEN) { // first, verify that search normal search works - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "test")), 1); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "test")), 1); Client client = client(); SearchResponse searchResponse = client.prepareSearch("test") .setPreference(preference + Integer.toString(counter++)) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java index 8ea750c62487..54cff6efe3d1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java @@ -116,8 +116,7 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { refresh(); int total = 0; - SearchResponse searchResponse = client().prepareSearch("test") - .setSearchType(DFS_QUERY_THEN_FETCH) + SearchResponse searchResponse = prepareSearch("test").setSearchType(DFS_QUERY_THEN_FETCH) .setQuery(termQuery("multi", "test")) .setSize(60) .setExplain(true) @@ -157,8 +156,7 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { prepareData(); int total = 0; - SearchResponse searchResponse = client().prepareSearch("test") - .setSearchType(DFS_QUERY_THEN_FETCH) + SearchResponse searchResponse = prepareSearch("test").setSearchType(DFS_QUERY_THEN_FETCH) .setQuery(termQuery("multi", "test")) .setSize(60) .setExplain(true) @@ -195,8 +193,7 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { prepareData(); int total = 0; - SearchResponse searchResponse = client().prepareSearch("test") - .setSearchType(QUERY_THEN_FETCH) + SearchResponse searchResponse = prepareSearch("test").setSearchType(QUERY_THEN_FETCH) .setQuery(termQuery("multi", "test")) .setSize(60) .setExplain(true) @@ -255,8 +252,7 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { prepareData(); int total = 0; - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(termQuery("multi", "test")) + SearchResponse searchResponse = prepareSearch("test").setQuery(termQuery("multi", "test")) .setSize(60) .setExplain(true) .addSort("age", SortOrder.ASC) @@ -357,9 +353,9 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { logger.info("Start Testing failed multi search with a wrong query"); MultiSearchResponse response = client().prepareMultiSearch() - .add(client().prepareSearch("test").setQuery(new MatchQueryBuilder("foo", "biz"))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test").setQuery(new MatchQueryBuilder("foo", "biz"))) + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2))) + .add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) .get(); assertThat(response.getResponses().length, equalTo(3)); assertThat(response.getResponses()[0].getFailureMessage(), notNullValue()); @@ -381,16 +377,15 @@ public class TransportTwoNodesSearchIT extends ESIntegTestCase { MultiSearchResponse response = client().prepareMultiSearch() // Add custom score query with bogus script .add( - client().prepareSearch("test") - .setQuery( - QueryBuilders.functionScoreQuery( - QueryBuilders.termQuery("nid", 1), - new ScriptScoreFunctionBuilder(new Script(ScriptType.INLINE, "bar", "foo", Collections.emptyMap())) - ) + prepareSearch("test").setQuery( + QueryBuilders.functionScoreQuery( + QueryBuilders.termQuery("nid", 1), + new ScriptScoreFunctionBuilder(new Script(ScriptType.INLINE, "bar", "foo", Collections.emptyMap())) ) + ) ) - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("nid", 2))) + .add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) .get(); assertThat(response.getResponses().length, equalTo(3)); assertThat(response.getResponses()[0].getFailureMessage(), notNullValue()); 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 2a3b8aeede73..626417d1cf77 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 @@ -142,11 +142,9 @@ public class InnerHitsIT extends ESIntegTestCase { ); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit(new InnerHitBuilder("comment")) - ) - .get(); + SearchResponse response = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit(new InnerHitBuilder("comment")) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("1")); @@ -161,11 +159,9 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(1).getNestedIdentity().getField().string(), equalTo("comments")); assertThat(innerHits.getAt(1).getNestedIdentity().getOffset(), equalTo(1)); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments", matchQuery("comments.message", "elephant"), ScoreMode.Avg).innerHit(new InnerHitBuilder("comment")) - ) - .get(); + response = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "elephant"), ScoreMode.Avg).innerHit(new InnerHitBuilder("comment")) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("2")); @@ -184,17 +180,15 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(2).getNestedIdentity().getField().string(), equalTo("comments")); assertThat(innerHits.getAt(2).getNestedIdentity().getOffset(), equalTo(2)); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setHighlightBuilder(new HighlightBuilder().field("comments.message")) - .setExplain(true) - .addFetchField("comments.mes*") - .addScriptField("script", new Script(ScriptType.INLINE, MockScriptEngine.NAME, "5", Collections.emptyMap())) - .setSize(1) - ) + response = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setHighlightBuilder(new HighlightBuilder().field("comments.message")) + .setExplain(true) + .addFetchField("comments.mes*") + .addScriptField("script", new Script(ScriptType.INLINE, MockScriptEngine.NAME, "5", Collections.emptyMap())) + .setSize(1) ) - .get(); + ).get(); assertNoFailures(response); innerHits = response.getHits().getAt(0).getInnerHits().get("comments"); assertThat(innerHits.getTotalHits().value, equalTo(2L)); @@ -210,13 +204,11 @@ public class InnerHitsIT extends ESIntegTestCase { ); assertThat(innerHits.getAt(0).getFields().get("script").getValue().toString(), equalTo("5")); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().addDocValueField("comments.mes*").setSize(1) - ) + response = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().addDocValueField("comments.mes*").setSize(1) ) - .get(); + ).get(); assertNoFailures(response); innerHits = response.getHits().getAt(0).getInnerHits().get("comments"); assertThat(innerHits.getHits().length, equalTo(1)); @@ -258,11 +250,7 @@ public class InnerHitsIT extends ESIntegTestCase { new InnerHitBuilder("b").addSort(new FieldSortBuilder("_doc").order(SortOrder.ASC)).setSize(size) ) ); - SearchResponse searchResponse = client().prepareSearch("idx") - .setQuery(boolQuery) - .setSize(numDocs) - .addSort("foo", SortOrder.ASC) - .get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(boolQuery).setSize(numDocs).addSort("foo", SortOrder.ASC).get(); assertNoFailures(searchResponse); assertHitCount(searchResponse, numDocs); @@ -371,17 +359,15 @@ public class InnerHitsIT extends ESIntegTestCase { indexRandom(true, requests); // Check we can load the first doubly-nested document. - SearchResponse response = client().prepareSearch("articles") - .setQuery( - nestedQuery( - "comments", - nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "good"), ScoreMode.Avg).innerHit( - new InnerHitBuilder("remark") - ), - ScoreMode.Avg - ).innerHit(new InnerHitBuilder()) - ) - .get(); + SearchResponse response = prepareSearch("articles").setQuery( + nestedQuery( + "comments", + nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "good"), ScoreMode.Avg).innerHit( + new InnerHitBuilder("remark") + ), + ScoreMode.Avg + ).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("1")); @@ -402,17 +388,15 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(0).getNestedIdentity().getChild().getOffset(), equalTo(0)); // Check we can load the second doubly-nested document. - response = client().prepareSearch("articles") - .setQuery( - nestedQuery( - "comments", - nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "neutral"), ScoreMode.Avg).innerHit( - new InnerHitBuilder("remark") - ), - ScoreMode.Avg - ).innerHit(new InnerHitBuilder()) - ) - .get(); + response = prepareSearch("articles").setQuery( + nestedQuery( + "comments", + nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "neutral"), ScoreMode.Avg).innerHit( + new InnerHitBuilder("remark") + ), + ScoreMode.Avg + ).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("1")); @@ -433,13 +417,9 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(0).getNestedIdentity().getChild().getOffset(), equalTo(0)); // Directly refer to the second level: - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "bad"), ScoreMode.Avg).innerHit( - new InnerHitBuilder() - ) - ) - .get(); + response = prepareSearch("articles").setQuery( + nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "bad"), ScoreMode.Avg).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("2")); @@ -453,17 +433,15 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(0).getNestedIdentity().getChild().getField().string(), equalTo("remarks")); assertThat(innerHits.getAt(0).getNestedIdentity().getChild().getOffset(), equalTo(0)); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery( - "comments", - nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "bad"), ScoreMode.Avg).innerHit( - new InnerHitBuilder("remark") - ), - ScoreMode.Avg - ).innerHit(new InnerHitBuilder()) - ) - .get(); + response = prepareSearch("articles").setQuery( + nestedQuery( + "comments", + nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "bad"), ScoreMode.Avg).innerHit( + new InnerHitBuilder("remark") + ), + ScoreMode.Avg + ).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertSearchHit(response, 1, hasId("2")); @@ -484,8 +462,7 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(innerHits.getAt(0).getNestedIdentity().getChild().getOffset(), equalTo(0)); // Check that inner hits contain _source even when it's disabled on the parent request. - response = client().prepareSearch("articles") - .setFetchSource(false) + response = prepareSearch("articles").setFetchSource(false) .setQuery( nestedQuery( "comments", @@ -502,17 +479,15 @@ public class InnerHitsIT extends ESIntegTestCase { assertNotNull(innerHits.getAt(0).getSourceAsMap()); assertFalse(innerHits.getAt(0).getSourceAsMap().isEmpty()); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery( - "comments", - nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "good"), ScoreMode.Avg).innerHit( - new InnerHitBuilder("remark") - ), - ScoreMode.Avg - ).innerHit(new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE)) - ) - .get(); + response = prepareSearch("articles").setQuery( + nestedQuery( + "comments", + nestedQuery("comments.remarks", matchQuery("comments.remarks.message", "good"), ScoreMode.Avg).innerHit( + new InnerHitBuilder("remark") + ), + ScoreMode.Avg + ).innerHit(new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE)) + ).get(); assertNoFailures(response); innerHits = response.getHits().getAt(0).getInnerHits().get("comments"); innerHits = innerHits.getAt(0).getInnerHits().get("remark"); @@ -539,9 +514,9 @@ public class InnerHitsIT extends ESIntegTestCase { ); indexRandom(true, requests); - SearchResponse response = client().prepareSearch("articles") - .setQuery(nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit(new InnerHitBuilder())) - .get(); + SearchResponse response = prepareSearch("articles").setQuery( + nestedQuery("comments", matchQuery("comments.message", "fox"), ScoreMode.Avg).innerHit(new InnerHitBuilder()) + ).get(); assertNoFailures(response); assertHitCount(response, 1); assertThat(response.getHits().getAt(0).getId(), equalTo("1")); @@ -608,13 +583,11 @@ public class InnerHitsIT extends ESIntegTestCase { ); indexRandom(true, requests); - SearchResponse resp1 = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.FETCH_SOURCE) - ) + SearchResponse resp1 = prepareSearch("articles").setQuery( + nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.FETCH_SOURCE) ) - .get(); + ).get(); assertNoFailures(resp1); assertHitCount(resp1, 1); SearchHit parent = resp1.getHits().getAt(0); @@ -624,13 +597,11 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(inner.getAt(0).getSourceAsString(), equalTo("{\"message\":\"no fox\"}")); assertThat(inner.getAt(1).getSourceAsString(), equalTo("{\"message\":\"fox eat quick\"}")); - SearchResponse response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) - ) + SearchResponse response = prepareSearch("articles").setQuery( + nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); SearchHit hit = response.getHits().getAt(0); @@ -646,13 +617,11 @@ public class InnerHitsIT extends ESIntegTestCase { assertThat(messages.getAt(1).getNestedIdentity().getOffset(), equalTo(0)); assertThat(messages.getAt(1).getNestedIdentity().getChild(), nullValue()); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments.messages", matchQuery("comments.messages.message", "bear"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) - ) + response = prepareSearch("articles").setQuery( + nestedQuery("comments.messages", matchQuery("comments.messages.message", "bear"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); hit = response.getHits().getAt(0); @@ -681,13 +650,11 @@ public class InnerHitsIT extends ESIntegTestCase { ) ); indexRandom(true, requests); - response = client().prepareSearch("articles") - .setQuery( - nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) - ) + response = prepareSearch("articles").setQuery( + nestedQuery("comments.messages", matchQuery("comments.messages.message", "fox"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFetchSourceContext(FetchSourceContext.DO_NOT_FETCH_SOURCE) ) - .get(); + ).get(); assertNoFailures(response); assertHitCount(response, 1); hit = response.getHits().getAt(0); @@ -793,11 +760,7 @@ public class InnerHitsIT extends ESIntegTestCase { query = nestedQuery("nested1", query, ScoreMode.Avg).innerHit( new InnerHitBuilder().addSort(new FieldSortBuilder("nested1.n_field1").order(SortOrder.ASC)) ); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(query) - .setSize(numDocs) - .addSort("field1", SortOrder.ASC) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(query).setSize(numDocs).addSort("field1", SortOrder.ASC).get(); assertNoFailures(searchResponse); assertAllSuccessful(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) numDocs)); @@ -953,7 +916,7 @@ public class InnerHitsIT extends ESIntegTestCase { QueryBuilder query = nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( new InnerHitBuilder().setSize(ArrayUtil.MAX_ARRAY_LENGTH - 1) ); - assertHitCountAndNoFailures(client().prepareSearch("index2").setQuery(query), 1); + assertHitCountAndNoFailures(prepareSearch("index2").setQuery(query), 1); } public void testTooHighResultWindow() throws Exception { @@ -966,24 +929,21 @@ public class InnerHitsIT extends ESIntegTestCase { .setRefreshPolicy(IMMEDIATE) .get(); assertHitCountAndNoFailures( - client().prepareSearch("index2") - .setQuery( - nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFrom(50).setSize(10).setName("_name") - ) - ), + prepareSearch("index2").setQuery( + nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFrom(50).setSize(10).setName("_name") + ) + ), 1 ); Exception e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("index2") - .setQuery( - nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFrom(100).setSize(10).setName("_name") - ) + () -> prepareSearch("index2").setQuery( + nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFrom(100).setSize(10).setName("_name") ) - .get() + ).get() ); assertThat( e.getCause().getMessage(), @@ -991,13 +951,11 @@ public class InnerHitsIT extends ESIntegTestCase { ); e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("index2") - .setQuery( - nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFrom(10).setSize(100).setName("_name") - ) + () -> prepareSearch("index2").setQuery( + nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFrom(10).setSize(100).setName("_name") ) - .get() + ).get() ); assertThat( e.getCause().getMessage(), @@ -1006,20 +964,18 @@ public class InnerHitsIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey(), 110), "index2"); assertNoFailures( - client().prepareSearch("index2") - .setQuery( - nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFrom(100).setSize(10).setName("_name") - ) + prepareSearch("index2").setQuery( + nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFrom(100).setSize(10).setName("_name") ) + ) ); assertNoFailures( - client().prepareSearch("index2") - .setQuery( - nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( - new InnerHitBuilder().setFrom(10).setSize(100).setName("_name") - ) + prepareSearch("index2").setQuery( + nestedQuery("nested", matchQuery("nested.field", "value1"), ScoreMode.Avg).innerHit( + new InnerHitBuilder().setFrom(10).setSize(100).setName("_name") ) + ) ); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java index 8d340b8401b6..6b790f9e6f09 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/CustomHighlighterSearchIT.java @@ -45,8 +45,7 @@ public class CustomHighlighterSearchIT extends ESIntegTestCase { } public void testThatCustomHighlightersAreSupported() throws IOException { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .highlighter(new HighlightBuilder().field("name").highlighterType("test-custom")) .get(); assertHighlight(searchResponse, 0, "name", 0, equalTo("standard response for name at position 1")); @@ -59,8 +58,7 @@ public class CustomHighlighterSearchIT extends ESIntegTestCase { options.put("myFieldOption", "someValue"); highlightConfig.options(options); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .highlighter(new HighlightBuilder().field(highlightConfig)) .get(); @@ -72,8 +70,7 @@ public class CustomHighlighterSearchIT extends ESIntegTestCase { Map options = new HashMap<>(); options.put("myGlobalOption", "someValue"); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .highlighter(new HighlightBuilder().field("name").highlighterType("test-custom").options(options)) .get(); @@ -82,8 +79,9 @@ public class CustomHighlighterSearchIT extends ESIntegTestCase { } public void testThatCustomHighlighterReceivesFieldsInOrder() throws Exception { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.boolQuery().must(QueryBuilders.matchAllQuery()).should(QueryBuilders.termQuery("name", "arbitrary"))) + SearchResponse searchResponse = prepareSearch("test").setQuery( + QueryBuilders.boolQuery().must(QueryBuilders.matchAllQuery()).should(QueryBuilders.termQuery("name", "arbitrary")) + ) .highlighter( new HighlightBuilder().highlighterType("test-custom") .field("name") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java index 642dfc2f6cf5..6564264bcd0f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java @@ -683,7 +683,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 2, equalTo("test")); assertHighlight(searchResponse, 0, "field1", 1, 2, equalTo("test")); @@ -745,7 +745,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { SearchSourceBuilder source = searchSource().query(termQuery("field1", "test")) .highlighter(highlight().highlighterType("plain").field("field1").order("score").preTags("").postTags("")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("this is a test")); } @@ -763,7 +763,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { SearchSourceBuilder source = searchSource().query(matchQuery("field1", "brown dog")) .highlighter(highlight().highlighterType("plain").field("field1").preTags("").postTags("").fragmentSize(25)); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 3, equalTo("The quick brown fox")); assertHighlight(searchResponse, 0, "field1", 1, 3, equalTo(" jumps over the lazy brown dog")); @@ -775,7 +775,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { highlight().highlighterType("plain").field("field1").order("none").preTags("").postTags("").fragmentSize(25) ); - searchResponse = client().prepareSearch("test").setSource(source).get(); + searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 3, equalTo("The quick brown fox")); assertHighlight(searchResponse, 0, "field1", 1, 3, equalTo(" jumps over the lazy brown dog")); @@ -788,7 +788,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { highlight().highlighterType("plain").order("score").field("field1").preTags("").postTags("").fragmentSize(25) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 3, equalTo(" jumps over the lazy brown dog")); assertHighlight(searchResponse, 0, "field1", 1, 3, equalTo("The quick brown fox")); @@ -809,7 +809,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { SearchSourceBuilder source = searchSource().query(termQuery("field1", "test")) .highlighter(highlight().field("field1", 100, 0).order("score").preTags("").postTags("")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("this is a test")); @@ -817,7 +817,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { source = searchSource().query(matchQuery("field2", "quick")) .highlighter(highlight().field("field2", 30, 1).boundaryChars(new char[] { ' ' })); - searchResponse = client().prepareSearch("test").setSource(source).get(); + searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over")); @@ -825,7 +825,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { source = searchSource().query(matchQuery("field2", "quick")) .highlighter(highlight().field(new Field("field2").fragmentSize(30).numOfFragments(1).boundaryChars(new char[] { ' ' }))); - searchResponse = client().prepareSearch("test").setSource(source).get(); + searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over")); } @@ -849,7 +849,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .postTags("") .boundaryScannerType(BoundaryScannerType.SENTENCE) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -892,7 +892,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .boundaryScannerLocale(Locale.ENGLISH.toLanguageTag()) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -931,7 +931,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .boundaryScannerType(BoundaryScannerType.WORD) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -961,7 +961,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .boundaryScannerLocale(Locale.ENGLISH.toLanguageTag()) ); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -1085,7 +1085,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .fragmentSize(25) .highlighterType("fvh") .requireFieldMatch(requireFieldMatch); - SearchRequestBuilder req = client().prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); + SearchRequestBuilder req = prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); // First check highlighting without any matched fields set SearchResponse resp = req.setQuery(queryStringQuery("running scissors").field("foo")).get(); @@ -1103,7 +1103,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .highlighterType("fvh") .requireFieldMatch(requireFieldMatch); fooField.matchedFields("foo", "foo.plain"); - req = client().prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); + req = prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); resp = req.setQuery(queryStringQuery("running scissors").field("foo")).get(); assertHighlight(resp, 0, "foo", 0, equalTo("running with scissors")); @@ -1118,7 +1118,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .highlighterType("fvh") .requireFieldMatch(requireFieldMatch); fooField.matchedFields("foo.plain"); - req = client().prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); + req = prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); resp = req.setQuery(queryStringQuery("foo.plain:running scissors").field("foo")).get(); assertHighlight(resp, 0, "foo", 0, equalTo("running with scissors")); @@ -1129,7 +1129,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .highlighterType("fvh") .requireFieldMatch(requireFieldMatch); fooField.matchedFields("foo", "foo.plain"); - req = client().prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); + req = prepareSearch("test").highlighter(new HighlightBuilder().field(fooField)); resp = req.setQuery(queryStringQuery("foo.plain:running^5 scissors").field("foo")).get(); assertHighlight(resp, 0, "foo", 0, equalTo("running with scissors")); @@ -1635,8 +1635,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .get(); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("tags", "tag")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchQuery("tags", "tag")) .highlighter(new HighlightBuilder().field("tags", -1, 0).highlighterType("fvh")) .get(); @@ -1662,7 +1661,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { boostingQuery(termQuery("field2", "brown"), termQuery("field2", "foobar")).negativeBoost(0.5f) ).highlighter(highlight().field("field2").order("score").preTags("").postTags("")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog")); } @@ -1678,7 +1677,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { boostingQuery(termQuery("field2", "brown"), termQuery("field2", "foobar")).negativeBoost(0.5f) ).highlighter(highlight().field("field2").order("score").preTags("").postTags("")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("The quick brown fox jumps over the lazy dog")); } @@ -1700,8 +1699,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .get(); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) .highlighter( new HighlightBuilder().field( new HighlightBuilder.Field("tags").highlighterType("plain").fragmentSize(-1).numOfFragments(2).fragmenter("simple") @@ -1719,8 +1717,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { equalTo("here is another one that is very long tag and has the tag token near the end") ); - response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) + response = prepareSearch("test").setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) .highlighter( new HighlightBuilder().field( new Field("tags").highlighterType("plain").fragmentSize(-1).numOfFragments(2).fragmenter("span") @@ -1739,8 +1736,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); assertFailures( - client().prepareSearch("test") - .setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) + prepareSearch("test").setQuery(QueryBuilders.matchPhraseQuery("tags", "long tag")) .highlighter( new HighlightBuilder().field( new Field("tags").highlighterType("plain").fragmentSize(-1).numOfFragments(2).fragmenter("invalid") @@ -1758,8 +1754,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { indexDoc("test", "1", "field1", "The quick brown fox", "field2", "The slow brown fox"); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("field1", "fox")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchQuery("field1", "fox")) .highlighter( new HighlightBuilder().field(new HighlightBuilder.Field("field1").preTags("<1>").postTags("").requireFieldMatch(true)) .field(new HighlightBuilder.Field("field2").preTags("<2>").postTags("").requireFieldMatch(false)) @@ -1783,8 +1778,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { indexDoc("test", "1", "field1", "The quick brown fox", "field2", "The slow brown fox"); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("field1", "fox")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchQuery("field1", "fox")) .highlighter( new HighlightBuilder().field(new HighlightBuilder.Field("field1").preTags("<1>").postTags("").requireFieldMatch(true)) .field(new HighlightBuilder.Field("field2").preTags("<2>").postTags("").requireFieldMatch(false)) @@ -1801,8 +1795,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { refresh(); // This query used to fail when the field to highlight was absent - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("field", "highlight")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "highlight")) .highlighter( new HighlightBuilder().field( new HighlightBuilder.Field("highlight_field").fragmentSize(-1).numOfFragments(1).fragmenter("simple") @@ -1843,8 +1836,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { // Highlighting of numeric fields is not supported, but it should not raise errors // (this behavior is consistent with version 0.20) assertHitCount( - client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("text", "test")) + prepareSearch("test").setQuery(QueryBuilders.matchQuery("text", "test")) .highlighter( new HighlightBuilder().field("text") .field("byte") @@ -1871,9 +1863,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { // Mock tokenizer will throw an exception if it is resetted twice assertHitCount( - client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("text", "test")) - .highlighter(new HighlightBuilder().field("text")), + prepareSearch("test").setQuery(QueryBuilders.matchQuery("text", "test")).highlighter(new HighlightBuilder().field("text")), 1L ); } @@ -1893,8 +1883,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { for (String type : ALL_TYPES) { HighlightBuilder.Field field = new HighlightBuilder.Field("text"); HighlightBuilder highlightBuilder = new HighlightBuilder().field(field).highlighterType(type); - SearchRequestBuilder search = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("text", "testing")) + SearchRequestBuilder search = prepareSearch("test").setQuery(QueryBuilders.matchQuery("text", "testing")) .highlighter(highlightBuilder); Matcher searchQueryMatcher = equalTo("Testing the highlight query feature"); @@ -1905,7 +1894,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { Matcher hlQueryMatcher = equalTo("Testing the highlight query feature"); field.highlightQuery(matchQuery("text", "query")); highlightBuilder = new HighlightBuilder().field(field); - search = client().prepareSearch("test").setQuery(QueryBuilders.matchQuery("text", "testing")).highlighter(highlightBuilder); + search = prepareSearch("test").setQuery(QueryBuilders.matchQuery("text", "testing")).highlighter(highlightBuilder); response = search.get(); assertHighlight(response, 0, "text", 0, hlQueryMatcher); @@ -1939,98 +1928,98 @@ public class HighlighterSearchIT extends ESIntegTestCase { // When you don't set noMatchSize you don't get any results if there isn't anything to highlight. HighlightBuilder.Field field = new HighlightBuilder.Field("text").fragmentSize(21).numOfFragments(1).highlighterType("plain"); - SearchResponse response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + SearchResponse response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); // When noMatchSize is set to 0 you also shouldn't get any field.highlighterType("plain").noMatchSize(0); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); // When noMatchSize is between 0 and the size of the string field.highlighterType("plain").noMatchSize(21); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so")); // The FVH also works but the fragment is longer than the plain highlighter because of boundary_max_scan field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); // Unified hl also works but the fragment is longer than the plain highlighter because of the boundary is the word field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); // We can also ask for a fragment longer than the input string and get the whole string for (String type : new String[] { "plain", "unified" }) { field.highlighterType(type).noMatchSize(text.length() * 2).numOfFragments(0); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); } field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); // We can also ask for a fragment exactly the size of the input field and get the whole field field.highlighterType("plain").noMatchSize(text.length()); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); // unified hl returns the first sentence as the noMatchSize does not cross sentence boundary. field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo(text)); // You can set noMatchSize globally in the highlighter as well field.highlighterType("plain").noMatchSize(null); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so")); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field).noMatchSize(21)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); // We don't break if noMatchSize is less than zero though field.highlighterType("plain").noMatchSize(randomIntBetween(Integer.MIN_VALUE, -1)); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); } @@ -2053,15 +2042,15 @@ public class HighlighterSearchIT extends ESIntegTestCase { .numOfFragments(1) .highlighterType("plain") .noMatchSize(21); - SearchResponse response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + SearchResponse response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so")); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am pretty long so some")); // And noMatchSize returns nothing when the first entry is empty string! @@ -2070,16 +2059,16 @@ public class HighlighterSearchIT extends ESIntegTestCase { IdsQueryBuilder idsQueryBuilder = QueryBuilders.idsQuery().addIds("2"); field.highlighterType("plain"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); // except for the unified highlighter which starts from the first string with actual content field.highlighterType("unified"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("I am short")); // But if the field was actually empty then you should get no highlighting field @@ -2087,15 +2076,15 @@ public class HighlighterSearchIT extends ESIntegTestCase { refresh(); idsQueryBuilder = QueryBuilders.idsQuery().addIds("3"); field.highlighterType("plain"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); // Same for if the field doesn't even exist on the document @@ -2104,28 +2093,28 @@ public class HighlighterSearchIT extends ESIntegTestCase { idsQueryBuilder = QueryBuilders.idsQuery().addIds("4"); field.highlighterType("plain"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(idsQueryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "postings"); // Again same if the field isn't mapped field = new HighlightBuilder.Field("unmapped").highlighterType("plain").noMatchSize(21); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertNotHighlighted(response, 0, "text"); } @@ -2149,31 +2138,31 @@ public class HighlighterSearchIT extends ESIntegTestCase { .numOfFragments(0) .highlighterType("plain") .noMatchSize(20); - SearchResponse response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + SearchResponse response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first")); field.highlighterType("fvh"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first sentence")); field.highlighterType("unified"); - response = client().prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 1, equalTo("This is the first sentence")); // if there's a match we only return the values with matches (whole value as number_of_fragments == 0) MatchQueryBuilder queryBuilder = QueryBuilders.matchQuery("text", "third fifth"); field.highlighterType("plain"); - response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); field.highlighterType("fvh"); - response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); field.highlighterType("unified"); - response = client().prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); + response = prepareSearch("test").setQuery(queryBuilder).highlighter(new HighlightBuilder().field(field)).get(); assertHighlight(response, 0, "text", 0, 2, equalTo("This is the third sentence. This is the fourth sentence.")); assertHighlight(response, 0, "text", 1, 2, equalTo("This is the fifth sentence")); } @@ -2256,8 +2245,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); refresh(); - SearchResponse response = client().prepareSearch("test") - .setQuery(QueryBuilders.matchQuery("field1", "fox")) + SearchResponse response = prepareSearch("test").setQuery(QueryBuilders.matchQuery("field1", "fox")) .highlighter(new HighlightBuilder().field(new Field("field1").preTags("<1>").postTags("").requireFieldMatch(true))) .get(); assertHighlight(response, 0, "field1", 0, 1, equalTo("The quick brown <1>fox. Second sentence.")); @@ -2705,7 +2693,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(prefixQuery("field2", "qui")).highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, 0, @@ -2727,7 +2715,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(fuzzyQuery("field2", "quck")).highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -2750,7 +2738,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(regexpQuery("field2", "qu[a-l]+k")).highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -2773,7 +2761,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(wildcardQuery("field2", "qui*")).highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, @@ -2785,7 +2773,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); source = searchSource().query(wildcardQuery("field2", "qu*k")).highlighter(highlight().field("field2")); - searchResponse = client().prepareSearch("test").setSource(source).get(); + searchResponse = prepareSearch("test").setSource(source).get(); assertHitCount(searchResponse, 1L); assertHighlight( @@ -2808,7 +2796,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(rangeQuery("field2").gte("aaaa").lt("zzzz")) .highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field2", 0, 1, equalTo("aaab")); } @@ -2825,7 +2813,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field2"); SearchSourceBuilder source = searchSource().query(queryStringQuery("qui*").defaultField("field2")) .highlighter(highlight().field("field2")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight( searchResponse, 0, @@ -2846,7 +2834,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { logger.info("--> highlighting and searching on field1"); SearchSourceBuilder source = searchSource().query(constantScoreQuery(regexpQuery("field1", "pho[a-z]+"))) .highlighter(highlight().field("field1")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("The photography word will get highlighted")); } @@ -2863,7 +2851,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .should(matchQuery("field1", "test")) .should(constantScoreQuery(queryStringQuery("field1:photo*"))) ).highlighter(highlight().field("field1")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("The photography word will get highlighted")); } @@ -2878,7 +2866,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { SearchSourceBuilder source = searchSource().query( boolQuery().must(prefixQuery("field1", "photo")).should(matchQuery("field1", "test").minimumShouldMatch("0")) ).highlighter(highlight().field("field1")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("The photography word will get highlighted")); } @@ -2893,7 +2881,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { SearchSourceBuilder source = searchSource().query( boolQuery().must(queryStringQuery("field1:photo*")).mustNot(existsQuery("field_null")) ).highlighter(highlight().field("field1")); - SearchResponse searchResponse = client().prepareSearch("test").setSource(source).get(); + SearchResponse searchResponse = prepareSearch("test").setSource(source).get(); assertHighlight(searchResponse, 0, "field1", 0, 1, equalTo("The photography word will get highlighted")); } @@ -2950,8 +2938,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { indexRandom(true, client().prepareIndex("test").setSource("foo", "test typename")); for (String highlighter : ALL_TYPES) { - SearchResponse response = client().prepareSearch("test") - .setQuery(matchQuery("foo", "test")) + SearchResponse response = prepareSearch("test").setQuery(matchQuery("foo", "test")) .highlighter(new HighlightBuilder().field("foo").highlighterType(highlighter).requireFieldMatch(false)) .get(); assertHighlight(response, 0, "foo", 0, 1, equalTo("test typename")); @@ -2978,8 +2965,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { indexRandom(true, client().prepareIndex("test").setSource("foo", "test japanese")); for (String highlighter : ALL_TYPES) { - SearchResponse response = client().prepareSearch("filtered_alias") - .setQuery(matchQuery("foo", "test")) + SearchResponse response = prepareSearch("filtered_alias").setQuery(matchQuery("foo", "test")) .highlighter(new HighlightBuilder().field("foo").highlighterType(highlighter).requireFieldMatch(false)) .get(); assertHighlight(response, 0, "foo", 0, 1, equalTo("test japanese")); @@ -3059,10 +3045,9 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) { Matcher highlightedMatcher = Matchers.either(containsString("highlight words together")) .or(containsString("highlight words together")); - SearchRequestBuilder search = client().prepareSearch("test") - .highlighter( - new HighlightBuilder().field("field1", 100, 1).order("score").highlighterType(highlighterType).requireFieldMatch(true) - ); + SearchRequestBuilder search = prepareSearch("test").highlighter( + new HighlightBuilder().field("field1", 100, 1).order("score").highlighterType(highlighterType).requireFieldMatch(true) + ); // Try with a bool query phrase.boost(boost); @@ -3337,8 +3322,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureSearchable("index-1"); for (int i = 0; i < 5; i++) { - final SearchResponse r1 = client().prepareSearch("index-1") - .addSort("d", SortOrder.DESC) + final SearchResponse r1 = prepareSearch("index-1").addSort("d", SortOrder.DESC) .setTrackScores(true) .highlighter(highlight().field("field").preTags("").postTags("")) .setQuery( 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 41917a672206..dc1b14cd5bfd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java @@ -685,7 +685,7 @@ public class SearchFieldsIT extends ESIntegTestCase { .setRefreshPolicy(IMMEDIATE) .get(); - SearchResponse searchResponse = client().prepareSearch("my-index").addStoredField("field1").addStoredField("_routing").get(); + SearchResponse searchResponse = prepareSearch("my-index").addStoredField("field1").addStoredField("_routing").get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).field("field1"), nullValue()); @@ -753,7 +753,7 @@ public class SearchFieldsIT extends ESIntegTestCase { String field = "field1.field2.field3.field4"; - SearchResponse searchResponse = client().prepareSearch("my-index").addStoredField(field).get(); + SearchResponse searchResponse = prepareSearch("my-index").addStoredField(field).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); assertThat(searchResponse.getHits().getAt(0).field(field).getValues().size(), equalTo(2)); assertThat(searchResponse.getHits().getAt(0).field(field).getValues().get(0).toString(), equalTo("value1")); @@ -765,9 +765,9 @@ public class SearchFieldsIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setMapping("test_field", "type=keyword").get()); indexRandom(true, client().prepareIndex("test").setId("1").setSource("test_field", "foobar")); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setSource(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()).docValueField("test_field")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setSource( + new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()).docValueField("test_field") + ).get(); assertHitCount(searchResponse, 1); Map fields = searchResponse.getHits().getHits()[0].getFields(); assertThat(fields.get("test_field").getValue(), equalTo("foobar")); @@ -1024,7 +1024,7 @@ public class SearchFieldsIT extends ESIntegTestCase { } indexRandom(true, reqs); ensureSearchable(); - SearchRequestBuilder req = client().prepareSearch("index"); + SearchRequestBuilder req = prepareSearch("index"); for (String field : Arrays.asList("s", "ms", "l", "ml", "d", "md")) { req.addScriptField( field, @@ -1269,7 +1269,7 @@ public class SearchFieldsIT extends ESIntegTestCase { .setSource(jsonBuilder().startObject().field("field1", "value").endObject()) ); - SearchResponse response = client().prepareSearch("test").addStoredField("field1").get(); + SearchResponse response = prepareSearch("test").addStoredField("field1").get(); assertNoFailures(response); assertHitCount(response, 1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java index 7d006c2fa754..3484559e6b04 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java @@ -54,8 +54,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // document 2 scores higher because 17 > 5 assertOrderedSearchHits( - client().prepareSearch("test") - .setExplain(randomBoolean()) + prepareSearch("test").setExplain(randomBoolean()) .setQuery(functionScoreQuery(simpleQueryStringQuery("foo"), fieldValueFactorFunction("test"))), "2", "1" @@ -63,8 +62,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // try again, but this time explicitly use the do-nothing modifier assertOrderedSearchHits( - client().prepareSearch("test") - .setExplain(randomBoolean()) + prepareSearch("test").setExplain(randomBoolean()) .setQuery( functionScoreQuery( simpleQueryStringQuery("foo"), @@ -77,8 +75,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // document 1 scores higher because 1/5 > 1/17 assertOrderedSearchHits( - client().prepareSearch("test") - .setExplain(randomBoolean()) + prepareSearch("test").setExplain(randomBoolean()) .setQuery( functionScoreQuery( simpleQueryStringQuery("foo"), @@ -91,8 +88,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // doc 3 doesn't have a "test" field, so an exception will be thrown try { - SearchResponse response = client().prepareSearch("test") - .setExplain(randomBoolean()) + SearchResponse response = prepareSearch("test").setExplain(randomBoolean()) .setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("test"))) .get(); assertFailures(response); @@ -102,8 +98,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // doc 3 doesn't have a "test" field but we're defaulting it to 100 so it should be last assertOrderedSearchHits( - client().prepareSearch("test") - .setExplain(randomBoolean()) + prepareSearch("test").setExplain(randomBoolean()) .setQuery( functionScoreQuery( matchAllQuery(), @@ -116,8 +111,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { ); // field is not mapped but we're defaulting it to 100 so all documents should have the same score - SearchResponse response = client().prepareSearch("test") - .setExplain(randomBoolean()) + SearchResponse response = prepareSearch("test").setExplain(randomBoolean()) .setQuery( functionScoreQuery( matchAllQuery(), @@ -132,8 +126,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { // -1 divided by 0 is infinity, which should provoke an exception. try { - response = client().prepareSearch("test") - .setExplain(randomBoolean()) + response = prepareSearch("test").setExplain(randomBoolean()) .setQuery( functionScoreQuery( simpleQueryStringQuery("foo"), 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 ff1db506e73d..a9ab85bf7917 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java @@ -166,80 +166,70 @@ public class RandomScoreFunctionIT extends ESIntegTestCase { // Test for accessing _score Script script = new Script(ScriptType.INLINE, NAME, "log(doc['index'].value + (factor * _score))", params); - SearchResponse resp = client().prepareSearch("test") - .setQuery( - functionScoreQuery( - matchQuery("body", "foo"), - new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { - new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), - new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } - ) + SearchResponse resp = prepareSearch("test").setQuery( + functionScoreQuery( + matchQuery("body", "foo"), + new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { + new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), + new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } ) - .get(); + ).get(); assertNoFailures(resp); SearchHit firstHit = resp.getHits().getAt(0); assertThat(firstHit.getScore(), greaterThan(1f)); // Test for accessing _score.intValue() script = new Script(ScriptType.INLINE, NAME, "log(doc['index'].value + (factor * _score.intValue()))", params); - resp = client().prepareSearch("test") - .setQuery( - functionScoreQuery( - matchQuery("body", "foo"), - new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { - new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), - new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } - ) + resp = prepareSearch("test").setQuery( + functionScoreQuery( + matchQuery("body", "foo"), + new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { + new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), + new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } ) - .get(); + ).get(); assertNoFailures(resp); firstHit = resp.getHits().getAt(0); assertThat(firstHit.getScore(), greaterThan(1f)); // Test for accessing _score.longValue() script = new Script(ScriptType.INLINE, NAME, "log(doc['index'].value + (factor * _score.longValue()))", params); - resp = client().prepareSearch("test") - .setQuery( - functionScoreQuery( - matchQuery("body", "foo"), - new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { - new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), - new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } - ) + resp = prepareSearch("test").setQuery( + functionScoreQuery( + matchQuery("body", "foo"), + new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { + new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), + new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } ) - .get(); + ).get(); assertNoFailures(resp); firstHit = resp.getHits().getAt(0); assertThat(firstHit.getScore(), greaterThan(1f)); // Test for accessing _score.floatValue() script = new Script(ScriptType.INLINE, NAME, "log(doc['index'].value + (factor * _score.floatValue()))", params); - resp = client().prepareSearch("test") - .setQuery( - functionScoreQuery( - matchQuery("body", "foo"), - new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { - new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), - new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } - ) + resp = prepareSearch("test").setQuery( + functionScoreQuery( + matchQuery("body", "foo"), + new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { + new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), + new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } ) - .get(); + ).get(); assertNoFailures(resp); firstHit = resp.getHits().getAt(0); assertThat(firstHit.getScore(), greaterThan(1f)); // Test for accessing _score.doubleValue() script = new Script(ScriptType.INLINE, NAME, "log(doc['index'].value + (factor * _score.doubleValue()))", params); - resp = client().prepareSearch("test") - .setQuery( - functionScoreQuery( - matchQuery("body", "foo"), - new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { - new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), - new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } - ) + resp = prepareSearch("test").setQuery( + functionScoreQuery( + matchQuery("body", "foo"), + new FunctionScoreQueryBuilder.FilterFunctionBuilder[] { + new FunctionScoreQueryBuilder.FilterFunctionBuilder(fieldValueFactorFunction("index").factor(2)), + new FunctionScoreQueryBuilder.FilterFunctionBuilder(scriptFunction(script)) } ) - .get(); + ).get(); assertNoFailures(resp); firstHit = resp.getHits().getAt(0); assertThat(firstHit.getScore(), greaterThan(1f)); @@ -254,10 +244,9 @@ public class RandomScoreFunctionIT extends ESIntegTestCase { int seed = 12345678; - SearchResponse resp = client().prepareSearch("test") - .setQuery(functionScoreQuery(matchAllQuery(), randomFunction().seed(seed).setField(SeqNoFieldMapper.NAME))) - .setExplain(true) - .get(); + SearchResponse resp = prepareSearch("test").setQuery( + functionScoreQuery(matchAllQuery(), randomFunction().seed(seed).setField(SeqNoFieldMapper.NAME)) + ).setExplain(true).get(); assertNoFailures(resp); assertEquals(1, resp.getHits().getTotalHits().value); SearchHit firstHit = resp.getHits().getAt(0); @@ -268,13 +257,13 @@ public class RandomScoreFunctionIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - SearchResponse resp = client().prepareSearch("test") - .setQuery(functionScoreQuery(matchAllQuery(), randomFunction().seed(1234).setField(SeqNoFieldMapper.NAME))) - .get(); + SearchResponse resp = prepareSearch("test").setQuery( + functionScoreQuery(matchAllQuery(), randomFunction().seed(1234).setField(SeqNoFieldMapper.NAME)) + ).get(); assertNoFailures(resp); assertEquals(0, resp.getHits().getTotalHits().value); - resp = client().prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), randomFunction())).get(); + resp = prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), randomFunction())).get(); assertNoFailures(resp); assertEquals(0, resp.getHits().getTotalHits().value); } 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 2ae9824ab638..7d3e8c7be03c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java @@ -194,7 +194,7 @@ public class GeoDistanceIT extends ESIntegTestCase { refresh(); - SearchRequestBuilder search = client().prepareSearch("test"); + SearchRequestBuilder search = prepareSearch("test"); String name = "TestPosition"; search.setQuery(QueryBuilders.matchAllQuery()) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java index 814365595705..1f46b6603482 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java @@ -142,7 +142,7 @@ public class GeoPolygonIT extends ESIntegTestCase { points.add(new GeoPoint(40.8, -74.1)); points.add(new GeoPoint(40.8, -74.0)); points.add(new GeoPoint(40.7, -74.0)); - SearchResponse searchResponse = client().prepareSearch("test") // from NY + SearchResponse searchResponse = prepareSearch("test") // from NY .setQuery(boolQuery().must(geoPolygonQuery("location", points))) .get(); assertHitCount(searchResponse, 4); @@ -158,7 +158,7 @@ public class GeoPolygonIT extends ESIntegTestCase { points.add(new GeoPoint(40.7, -74.1)); points.add(new GeoPoint(40.8, -74.1)); points.add(new GeoPoint(40.8, -74.0)); - SearchResponse searchResponse = client().prepareSearch("test") // from NY + SearchResponse searchResponse = prepareSearch("test") // from NY .setQuery(boolQuery().must(geoPolygonQuery("location", points))) .get(); assertHitCount(searchResponse, 4); @@ -176,7 +176,7 @@ public class GeoPolygonIT extends ESIntegTestCase { points.add(new GeoPoint(40.8, -74.0)); points.add(new GeoPoint(40.7, -74.0)); assertHitCount( - client().prepareSearch("test") // from NY + prepareSearch("test") // from NY .setQuery(boolQuery().must(geoPolygonQuery("alias", points))), 4 ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java index 659f6af68d61..32d00a4a925a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java @@ -229,16 +229,16 @@ public class MoreLikeThisIT extends ESIntegTestCase { ); logger.info("Running moreLikeThis on beta shard"); - SearchResponse response = client().prepareSearch("beta") - .setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item("test", "1") }).minTermFreq(1).minDocFreq(1)) - .get(); + SearchResponse response = prepareSearch("beta").setQuery( + new MoreLikeThisQueryBuilder(null, new Item[] { new Item("test", "1") }).minTermFreq(1).minDocFreq(1) + ).get(); assertHitCount(response, 1L); assertThat(response.getHits().getAt(0).getId(), equalTo("3")); logger.info("Running moreLikeThis on release shard"); - response = client().prepareSearch("release") - .setQuery(new MoreLikeThisQueryBuilder(null, new Item[] { new Item("test", "1") }).minTermFreq(1).minDocFreq(1)) - .get(); + response = prepareSearch("release").setQuery( + new MoreLikeThisQueryBuilder(null, new Item[] { new Item("test", "1") }).minTermFreq(1).minDocFreq(1) + ).get(); assertHitCount(response, 1L); assertThat(response.getHits().getAt(0).getId(), equalTo("2")); @@ -607,7 +607,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(1) .maxQueryTerms(max_query_terms) .minimumShouldMatch("0%"); - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, max_query_terms); } @@ -640,7 +640,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(1) .minimumShouldMatch(minimumShouldMatch); logger.info("Testing with minimum_should_match = {}", minimumShouldMatch); - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); if (minimumShouldMatch.equals("0%")) { assertHitCount(response, 10); @@ -670,7 +670,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(0) .maxQueryTerms(100) .minimumShouldMatch("100%"); // strict all terms must match! - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 1); } @@ -696,14 +696,14 @@ public class MoreLikeThisIT extends ESIntegTestCase { MoreLikeThisQueryBuilder mltQuery = moreLikeThisQuery(new Item[] { new Item("test", malformedFieldDoc) }).minTermFreq(0) .minDocFreq(0) .minimumShouldMatch("0%"); - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 0); logger.info("Checking with an empty document ..."); XContentBuilder emptyDoc = jsonBuilder().startObject().endObject(); mltQuery = moreLikeThisQuery(null, new Item[] { new Item("test", emptyDoc) }).minTermFreq(0).minDocFreq(0).minimumShouldMatch("0%"); - response = client().prepareSearch("test").setQuery(mltQuery).get(); + response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 0); @@ -715,7 +715,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { mltQuery = moreLikeThisQuery(null, new Item[] { new Item("test", normalDoc) }).minTermFreq(0) .minDocFreq(0) .minimumShouldMatch("100%"); // strict all terms must match but date is ignored - response = client().prepareSearch("test").setQuery(mltQuery).get(); + response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 1); } @@ -744,7 +744,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(0) .maxQueryTerms(100) .minimumShouldMatch("0%"); - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, numFields); @@ -759,7 +759,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .include(true) .minimumShouldMatch("0%"); - response = client().prepareSearch("test").setQuery(mltQuery).get(); + response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, numFields - (i + 1)); } @@ -783,7 +783,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(0) .include(true) .minimumShouldMatch("1%"); - SearchResponse response = client().prepareSearch("test").setQuery(mltQuery).get(); + SearchResponse response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -791,7 +791,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { .minDocFreq(0) .include(true) .minimumShouldMatch("1%"); - response = client().prepareSearch("test").setQuery(mltQuery).get(); + response = prepareSearch("test").setQuery(mltQuery).get(); assertNoFailures(response); assertHitCount(response, 1); } @@ -810,7 +810,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { ); moreLikeThisQueryBuilder.minTermFreq(1); moreLikeThisQueryBuilder.minDocFreq(1); - SearchResponse searchResponse = client().prepareSearch("index").setQuery(moreLikeThisQueryBuilder).get(); + SearchResponse searchResponse = prepareSearch("index").setQuery(moreLikeThisQueryBuilder).get(); assertEquals(2, searchResponse.getHits().getTotalHits().value); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java index 6b3193c4b383..aa418288b8eb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java @@ -43,9 +43,9 @@ public class MultiSearchIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("field", "yyy").get(); refresh(); MultiSearchResponse response = client().prepareMultiSearch() - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "yyy"))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "yyy"))) + .add(prepareSearch("test").setQuery(QueryBuilders.matchAllQuery())) .get(); for (MultiSearchResponse.Item item : response) { @@ -73,7 +73,7 @@ public class MultiSearchIT extends ESIntegTestCase { request.maxConcurrentSearchRequests(randomIntBetween(1, numSearchRequests)); } for (int i = 0; i < numSearchRequests; i++) { - request.add(client().prepareSearch("test")); + request.add(prepareSearch("test")); } MultiSearchResponse response = client().multiSearch(request).actionGet(); @@ -96,9 +96,9 @@ public class MultiSearchIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("field", "yyy").get(); refresh(); MultiSearchResponse response = client().prepareMultiSearch() - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) - .add(client().prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "yyy"))) - .add(client().prepareSearch("test").setQuery(new DummyQueryBuilder() { + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) + .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "yyy"))) + .add(prepareSearch("test").setQuery(new DummyQueryBuilder() { @Override public TransportVersion getMinimalSupportedVersion() { return transportVersion; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java index ce1b4bf30d49..e238a254b784 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java @@ -111,6 +111,6 @@ public class NestedWithMinScoreIT extends ESIntegTestCase { if (randomBoolean()) { source.trackTotalHitsUpTo(randomBoolean() ? Integer.MAX_VALUE : randomIntBetween(1, 1000)); } - ElasticsearchAssertions.assertSearchHits(client().prepareSearch("test").setSource(source), "d1"); + ElasticsearchAssertions.assertSearchHits(prepareSearch("test").setSource(source), "d1"); } } 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 598c65b8c999..2deedccec419 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java @@ -51,9 +51,9 @@ public class SimpleNestedIT extends ESIntegTestCase { ensureGreen(); // check on no data, see it works - SearchResponse searchResponse = client().prepareSearch("test").get(); + SearchResponse searchResponse = prepareSearch("test").get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); - searchResponse = client().prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); client().prepareIndex("test") @@ -83,24 +83,22 @@ public class SimpleNestedIT extends ESIntegTestCase { // check the numDocs assertDocumentCount("test", 3); - searchResponse = client().prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); // search for something that matches the nested doc, and see that we don't find the nested doc - searchResponse = client().prepareSearch("test").setQuery(matchAllQuery()).get(); + searchResponse = prepareSearch("test").setQuery(matchAllQuery()).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); // now, do a nested query - searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) + searchResponse = prepareSearch("test").setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) .get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) + searchResponse = prepareSearch("test").setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .get(); assertNoFailures(searchResponse); @@ -130,44 +128,38 @@ public class SimpleNestedIT extends ESIntegTestCase { refresh(); assertDocumentCount("test", 6); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); // filter - searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(matchAllQuery()) - .mustNot( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()) + .mustNot( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), + ScoreMode.Avg ) - ) - .get(); + ) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); // check with type prefix - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.n_field1", "n_value1_1")).must(termQuery("nested1.n_field2", "n_value2_1")), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); @@ -178,8 +170,7 @@ public class SimpleNestedIT extends ESIntegTestCase { refresh(); assertDocumentCount("test", 3); - searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) + searchResponse = prepareSearch("test").setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1_1"), ScoreMode.Avg)) .get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); @@ -247,93 +238,81 @@ public class SimpleNestedIT extends ESIntegTestCase { assertDocumentCount("test", 7); // do some multi nested queries - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1", termQuery("nested1.field1", "1"), ScoreMode.Avg)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + nestedQuery("nested1", termQuery("nested1.field1", "1"), ScoreMode.Avg) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)) - .get(); + searchResponse = prepareSearch("test").setQuery( + nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "1")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "1")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "1")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "3"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "1")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "3"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "1")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "4"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "1")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "4"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "1")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "5"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "1")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "5"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "4")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "5"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "4")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "5"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); - searchResponse = client().prepareSearch("test") - .setQuery( - nestedQuery( - "nested1", - boolQuery().must(termQuery("nested1.field1", "4")) - .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)), - ScoreMode.Avg - ) + searchResponse = prepareSearch("test").setQuery( + nestedQuery( + "nested1", + boolQuery().must(termQuery("nested1.field1", "4")) + .must(nestedQuery("nested1.nested2", termQuery("nested1.nested2.field2", "2"), ScoreMode.Avg)), + ScoreMode.Avg ) - .get(); + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(0L)); } @@ -442,10 +421,9 @@ public class SimpleNestedIT extends ESIntegTestCase { .setRefreshPolicy(IMMEDIATE) .get(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1"), ScoreMode.Total)) - .setExplain(true) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1"), ScoreMode.Total) + ).setExplain(true).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); Explanation explanation = searchResponse.getHits().getHits()[0].getExplanation(); @@ -526,7 +504,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") + SearchResponse searchResponse = prepareSearch("test") .setQuery(QueryBuilders.matchAllQuery()) .addSort(SortBuilders.fieldSort("nested1.field1").order(SortOrder.ASC).setNestedSort(new NestedSortBuilder("nested1"))) @@ -540,7 +518,7 @@ public class SimpleNestedIT extends ESIntegTestCase { assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("1")); assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("4")); - searchResponse = client().prepareSearch("test") + searchResponse = prepareSearch("test") .setQuery(QueryBuilders.matchAllQuery()) .addSort(SortBuilders.fieldSort("nested1.field1").order(SortOrder.DESC).setNestedSort(new NestedSortBuilder("nested1"))) @@ -638,8 +616,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); refresh(); - SearchRequestBuilder searchRequestBuilder = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + SearchRequestBuilder searchRequestBuilder = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .addSort( SortBuilders.fieldSort("nested1.field1") .setNestedSort(new NestedSortBuilder("nested1").setFilter(termQuery("nested1.field2", true))) @@ -661,8 +638,7 @@ public class SimpleNestedIT extends ESIntegTestCase { assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("3")); assertThat(searchResponse.getHits().getHits()[2].getSortValues()[0].toString(), equalTo("10")); - searchRequestBuilder = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + searchRequestBuilder = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .addSort( SortBuilders.fieldSort("nested1.field1") .setNestedSort(new NestedSortBuilder("nested1").setFilter(termQuery("nested1.field2", true))) @@ -1523,8 +1499,9 @@ public class SimpleNestedIT extends ESIntegTestCase { assertTrue(indexResponse2.getShardInfo().getSuccessful() > 0); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("users.first").setNestedSort(new NestedSortBuilder("users")).order(SortOrder.ASC)) + SearchResponse searchResponse = prepareSearch("test").addSort( + SortBuilders.fieldSort("users.first").setNestedSort(new NestedSortBuilder("users")).order(SortOrder.ASC) + ) .addSort( SortBuilders.fieldSort("users.first") .order(SortOrder.ASC) @@ -1586,9 +1563,9 @@ public class SimpleNestedIT extends ESIntegTestCase { assertThat(clusterStatsResponse.getIndicesStats().getSegments().getBitsetMemoryInBytes(), equalTo(0L)); // only when querying with nested the fixed bitsets are loaded - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(nestedQuery("array1", termQuery("array1.field1", "value1"), ScoreMode.Avg)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + nestedQuery("array1", termQuery("array1.field1", "value1"), ScoreMode.Avg) + ).get(); assertNoFailures(searchResponse); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(5L)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java index 015dc9628de2..9219641f1d3b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java @@ -66,10 +66,9 @@ public class VectorNestedIT extends ESIntegTestCase { assertThat(getResponse.getSourceAsBytes(), notNullValue()); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setKnnSearch(List.of(new KnnSearchBuilder("nested.vector", new float[] { 1, 1, 1 }, 1, 1, null))) - .setAllowPartialSearchResults(false) - .get(); + SearchResponse searchResponse = prepareSearch("test").setKnnSearch( + List.of(new KnnSearchBuilder("nested.vector", new float[] { 1, 1, 1 }, 1, 1, null)) + ).setAllowPartialSearchResults(false).get(); assertThat(searchResponse.getHits().getHits().length, greaterThan(0)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java index e981c1fd5c0c..2a1bfa36ad25 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java @@ -123,8 +123,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testSimpleProfile() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(true) + SearchResponse response = prepareSearch("idx").setProfile(true) .addAggregation(histogram("histo").field(NUMBER_FIELD).interval(1L)) .get(); assertNoFailures(response); @@ -159,8 +158,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testMultiLevelProfile() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(true) + SearchResponse response = prepareSearch("idx").setProfile(true) .addAggregation( histogram("histo").field(NUMBER_FIELD) .interval(1L) @@ -246,8 +244,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testMultiLevelProfileBreadthFirst() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(true) + SearchResponse response = prepareSearch("idx").setProfile(true) .addAggregation( histogram("histo").field(NUMBER_FIELD) .interval(1L) @@ -320,8 +317,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testDiversifiedAggProfile() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(true) + SearchResponse response = prepareSearch("idx").setProfile(true) .addAggregation( diversifiedSampler("diversify").shardSize(10) .field(STRING_FIELD) @@ -376,8 +372,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testComplexProfile() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(true) + SearchResponse response = prepareSearch("idx").setProfile(true) .addAggregation( histogram("histo").field(NUMBER_FIELD) .interval(1L) @@ -593,8 +588,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } public void testNoProfile() { - SearchResponse response = client().prepareSearch("idx") - .setProfile(false) + SearchResponse response = prepareSearch("idx").setProfile(false) .addAggregation( histogram("histo").field(NUMBER_FIELD) .interval(1L) @@ -642,8 +636,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } indexRandom(true, false, builders); - SearchResponse response = client().prepareSearch("dateidx") - .setProfile(true) + SearchResponse response = prepareSearch("dateidx").setProfile(true) .addAggregation( new DateHistogramAggregationBuilder("histo").field("date") .calendarInterval(DateHistogramInterval.MONTH) @@ -720,8 +713,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { } indexRandom(true, false, builders); - SearchResponse response = client().prepareSearch("date_filter_by_filter_disabled") - .setProfile(true) + SearchResponse response = prepareSearch("date_filter_by_filter_disabled").setProfile(true) .addAggregation(new DateHistogramAggregationBuilder("histo").field("date").calendarInterval(DateHistogramInterval.MONTH)) .get(); assertNoFailures(response); 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 b3fb2cb93713..32334deb268b 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 @@ -115,15 +115,13 @@ public class QueryProfilerIT extends ESIntegTestCase { QueryBuilder q = randomQueryBuilder(stringFields, numericFields, numDocs, 3); logger.debug("Query: {}", q); - SearchRequestBuilder vanilla = client().prepareSearch("test") - .setQuery(q) + SearchRequestBuilder vanilla = prepareSearch("test").setQuery(q) .setProfile(false) .addSort("id.keyword", SortOrder.ASC) .setSearchType(SearchType.QUERY_THEN_FETCH) .setRequestCache(false); - SearchRequestBuilder profile = client().prepareSearch("test") - .setQuery(q) + SearchRequestBuilder profile = prepareSearch("test").setQuery(q) .setProfile(true) .addSort("id.keyword", SortOrder.ASC) .setSearchType(SearchType.QUERY_THEN_FETCH) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java index 45f8b47efd87..099100a7a67e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java @@ -37,8 +37,8 @@ public class ExistsIT extends ESIntegTestCase { // TODO: move this to a unit test somewhere... public void testEmptyIndex() throws Exception { createIndex("test"); - assertNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.existsQuery("foo"))); - assertNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("foo")))); + assertNoFailures(prepareSearch("test").setQuery(QueryBuilders.existsQuery("foo"))); + assertNoFailures(prepareSearch("test").setQuery(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("foo")))); } public void testExists() throws Exception { @@ -113,14 +113,14 @@ public class ExistsIT extends ESIntegTestCase { expected.put("vec", 2); final long numDocs = sources.length; - SearchResponse allDocs = client().prepareSearch("idx").setSize(sources.length).get(); + SearchResponse allDocs = prepareSearch("idx").setSize(sources.length).get(); assertNoFailures(allDocs); assertHitCount(allDocs, numDocs); for (Map.Entry entry : expected.entrySet()) { final String fieldName = entry.getKey(); final int count = entry.getValue(); // exists - SearchResponse resp = client().prepareSearch("idx").setQuery(QueryBuilders.existsQuery(fieldName)).get(); + SearchResponse resp = prepareSearch("idx").setQuery(QueryBuilders.existsQuery(fieldName)).get(); assertNoFailures(resp); try { assertEquals( @@ -199,7 +199,7 @@ public class ExistsIT extends ESIntegTestCase { String fieldName = entry.getKey(); int expectedCount = entry.getValue(); - SearchResponse response = client().prepareSearch("idx").setQuery(QueryBuilders.existsQuery(fieldName)).get(); + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.existsQuery(fieldName)).get(); assertNoFailures(response); assertHitCount(response, expectedCount); } @@ -231,7 +231,7 @@ public class ExistsIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("idx").setSource("foo", 43)); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("idx").setQuery(QueryBuilders.existsQuery("foo-alias")).get(); + SearchResponse response = prepareSearch("idx").setQuery(QueryBuilders.existsQuery("foo-alias")).get(); assertNoFailures(response); assertHitCount(response, 2); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java index c2ccfe4ee969..1e18c0ca3c59 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java @@ -56,11 +56,9 @@ public class IntervalQueriesIT extends ESIntegTestCase { client().prepareIndex("nested").setId("3").setSource("text", "quick") ); - SearchResponse resp = client().prepareSearch("nested") - .setQuery( - new IntervalQueryBuilder("empty_text", new IntervalsSourceProvider.Match("an empty query", 0, true, null, null, null)) - ) - .get(); + SearchResponse resp = prepareSearch("nested").setQuery( + new IntervalQueryBuilder("empty_text", new IntervalsSourceProvider.Match("an empty query", 0, true, null, null, null)) + ).get(); assertEquals(0, resp.getFailedShards()); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java index 3af7502cefea..f251ab5cb626 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java @@ -267,13 +267,11 @@ public class MultiMatchQueryIT extends ESIntegTestCase { public void testDefaults() throws ExecutionException, InterruptedException { MatchQueryParser.Type type = MatchQueryParser.Type.BOOLEAN; - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").operator(Operator.OR) - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").operator(Operator.OR) ) - .get(); + ).get(); Set topNIds = Sets.newHashSet("theone", "theother"); for (int i = 0; i < searchResponse.getHits().getHits().length; i++) { topNIds.remove(searchResponse.getHits().getAt(i).getId()); @@ -283,92 +281,78 @@ public class MultiMatchQueryIT extends ESIntegTestCase { assertThat(topNIds, empty()); assertThat(searchResponse.getHits().getHits()[0].getScore(), greaterThan(searchResponse.getHits().getHits()[1].getScore())); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").operator(Operator.OR) - .type(type) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").operator(Operator.OR) + .type(type) ) - .get(); + ).get(); assertFirstHit(searchResponse, anyOf(hasId("theone"), hasId("theother"))); assertThat(searchResponse.getHits().getHits()[0].getScore(), greaterThan(searchResponse.getHits().getHits()[1].getScore())); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("marvel hero", "full_name", "first_name", "last_name", "category").operator(Operator.OR).type(type) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("marvel hero", "full_name", "first_name", "last_name", "category").operator(Operator.OR).type(type) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theother")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").operator(Operator.AND).type(type) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").operator(Operator.AND).type(type) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").operator(Operator.AND).type(type) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").operator(Operator.AND).type(type) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); } public void testPhraseType() { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("Man the Ultimate", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase") - .operator(Operator.OR) - .type(MatchQueryParser.Type.PHRASE) - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("Man the Ultimate", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase") + .operator(Operator.OR) + .type(MatchQueryParser.Type.PHRASE) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("ultimate2")); assertHitCount(searchResponse, 1L); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("Captain", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase").operator( - Operator.OR - ).type(MatchQueryParser.Type.PHRASE) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("Captain", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase").operator( + Operator.OR + ).type(MatchQueryParser.Type.PHRASE) ) - .get(); + ).get(); assertThat(searchResponse.getHits().getTotalHits().value, greaterThan(1L)); assertSearchHitsWithoutFailures( - client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("the Ul", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase").operator( - Operator.OR - ).type(MatchQueryParser.Type.PHRASE_PREFIX) - ) - ), + prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("the Ul", "full_name_phrase", "first_name_phrase", "last_name_phrase", "category_phrase").operator( + Operator.OR + ).type(MatchQueryParser.Type.PHRASE_PREFIX) + ) + ), "ultimate2", "ultimate1" ); } public void testSingleField() throws NoSuchFieldException, IllegalAccessException { - SearchResponse searchResponse = client().prepareSearch("test").setQuery(randomizeType(multiMatchQuery("15", "skill"))).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(randomizeType(multiMatchQuery("15", "skill"))).get(); assertNoFailures(searchResponse); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("15", "skill", "int-field")).analyzer("category")) + searchResponse = prepareSearch("test").setQuery(randomizeType(multiMatchQuery("15", "skill", "int-field")).analyzer("category")) .get(); assertNoFailures(searchResponse); assertFirstHit(searchResponse, hasId("theone")); @@ -409,7 +393,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { builder.append(RandomPicks.randomFrom(random(), query)).append(" "); } MultiMatchQueryBuilder multiMatchQueryBuilder = randomizeType(multiMatchQuery(builder.toString(), field)); - SearchResponse multiMatchResp = client().prepareSearch("test") + SearchResponse multiMatchResp = prepareSearch("test") // id sort field is a tie, in case hits have the same score, // the hits will be sorted the same consistently .addSort("_score", SortOrder.DESC) @@ -418,7 +402,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { .get(); MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(field, builder.toString()); - SearchResponse matchResp = client().prepareSearch("test") + SearchResponse matchResp = prepareSearch("test") // id tie sort .addSort("_score", SortOrder.DESC) .addSort("id", SortOrder.ASC) @@ -443,7 +427,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { public void testEquivalence() { - final int numDocs = (int) client().prepareSearch("test").setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value; + final int numDocs = (int) prepareSearch("test").setSize(0).setQuery(matchAllQuery()).get().getHits().getTotalHits().value; int numIters = scaledRandomIntBetween(5, 10); for (int i = 0; i < numIters; i++) { { @@ -451,15 +435,13 @@ public class MultiMatchQueryIT extends ESIntegTestCase { MultiMatchQueryBuilder multiMatchQueryBuilder = randomBoolean() ? multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category") : multiMatchQuery("marvel hero captain america", "*_name", randomBoolean() ? "category" : "categ*"); - SearchResponse left = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse left = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery(randomizeType(multiMatchQueryBuilder.operator(Operator.OR).type(type))) .get(); - SearchResponse right = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse right = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -479,8 +461,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { MultiMatchQueryBuilder multiMatchQueryBuilder = randomBoolean() ? multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category") : multiMatchQuery("captain america", "*_name", randomBoolean() ? "category" : "categ*"); - SearchResponse left = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse left = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -488,8 +469,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) .get(); - SearchResponse right = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse right = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -509,8 +489,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { { String minShouldMatch = randomBoolean() ? null : "" + between(0, 1); - SearchResponse left = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse left = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -522,8 +501,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) .get(); - SearchResponse right = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse right = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -540,8 +518,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { String minShouldMatch = randomBoolean() ? null : "" + between(0, 1); SearchResponse left; if (randomBoolean()) { - left = client().prepareSearch("test") - .setSize(numDocs) + left = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -553,8 +530,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) .get(); } else { - left = client().prepareSearch("test") - .setSize(numDocs) + left = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -566,8 +542,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) .get(); } - SearchResponse right = client().prepareSearch("test") - .setSize(numDocs) + SearchResponse right = prepareSearch("test").setSize(numDocs) .addSort(SortBuilders.scoreSort()) .addSort(SortBuilders.fieldSort("id")) .setQuery( @@ -584,208 +559,175 @@ public class MultiMatchQueryIT extends ESIntegTestCase { } public void testCrossFieldMode() throws ExecutionException, InterruptedException { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america", "full_name", "first_name", "last_name").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).operator(Operator.OR) - ) + SearchResponse searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america", "full_name", "first_name", "last_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .operator(Operator.OR) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).operator(Operator.OR) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("marvel hero captain america", "full_name", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).operator(Operator.OR) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theother")); assertSecondHit(searchResponse, hasId("theone")); assertThat(searchResponse.getHits().getHits()[0].getScore(), greaterThan(searchResponse.getHits().getHits()[1].getScore())); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("marvel hero", "full_name", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).operator(Operator.OR) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("marvel hero", "full_name", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).operator(Operator.OR) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theother")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america", "full_name", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america 15", "full_name", "first_name", "last_name", "category", "skill").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).analyzer("category").lenient(true).operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america 15", "full_name", "first_name", "last_name", "category", "skill").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).analyzer("category").lenient(true).operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america 15", "full_name", "first_name", "last_name", "category", "skill", "int-field").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).analyzer("category").lenient(true).operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america 15", "full_name", "first_name", "last_name", "category", "skill", "int-field").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).analyzer("category").lenient(true).operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america 15", "skill", "full_name", "first_name", "last_name", "category", "int-field").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).analyzer("category").lenient(true).operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america 15", "skill", "full_name", "first_name", "last_name", "category", "int-field").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).analyzer("category").lenient(true).operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america 15", "first_name", "last_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .lenient(true) - .analyzer("category") - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america 15", "first_name", "last_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .lenient(true) + .analyzer("category") ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category"))) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category")) + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("25 15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category"))) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("25 15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category")) + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("25 15", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category") - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("25 15", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).analyzer("category") ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("25 15", "first_name", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .analyzer("category") - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("25 15", "first_name", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .analyzer("category") ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("25 15", "int-field", "skill", "first_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .analyzer("category") - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("25 15", "int-field", "skill", "first_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .analyzer("category") ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("25 15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .analyzer("category") - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("25 15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .analyzer("category") ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).analyzer("category").operator(Operator.OR) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).analyzer("category").operator(Operator.OR) ) - .get(); + ).get(); assertFirstHit(searchResponse, hasId("theone")); // test group based on analyzer -- all fields are grouped into a cross field search - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).analyzer("category").operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).analyzer("category").operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); // counter example assertHitCount( - client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( - randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE - ).operator(Operator.AND) - ) - ), + prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( + randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE + ).operator(Operator.AND) + ) + ), 0L ); // counter example assertHitCount( - client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( - randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE - ).operator(Operator.AND) - ) - ), + prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("captain america marvel hero", "first_name", "last_name", "category").type( + randomBoolean() ? MultiMatchQueryBuilder.Type.CROSS_FIELDS : MultiMatchQueryBuilder.DEFAULT_TYPE + ).operator(Operator.AND) + ) + ), 0L ); // test if boosts work - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("the ultimate", "full_name", "first_name", "category").field("last_name", 10) - .type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("the ultimate", "full_name", "first_name", "category").field("last_name", 10) + .type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) + .operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasId("ultimate1")); // has ultimate in the last_name and that is boosted assertSecondHit(searchResponse, hasId("ultimate2")); @@ -793,55 +735,47 @@ public class MultiMatchQueryIT extends ESIntegTestCase { // since we try to treat the matching fields as one field scores are very similar but we have a small bias towards the // more frequent field that acts as a tie-breaker internally - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("the ultimate", "full_name", "first_name", "last_name", "category").type( - MultiMatchQueryBuilder.Type.CROSS_FIELDS - ).operator(Operator.AND) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("the ultimate", "full_name", "first_name", "last_name", "category").type( + MultiMatchQueryBuilder.Type.CROSS_FIELDS + ).operator(Operator.AND) ) - .get(); + ).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasId("ultimate2")); assertSecondHit(searchResponse, hasId("ultimate1")); assertThat(searchResponse.getHits().getHits()[0].getScore(), greaterThan(searchResponse.getHits().getHits()[1].getScore())); // Test group based on numeric fields - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS))) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("15", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("15", "skill", "first_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS))) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("15", "skill", "first_name").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); // Two numeric fields together caused trouble at one point! - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("15", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS))) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("15", "int-field", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType(multiMatchQuery("15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) - ) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)) + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("theone")); - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("alpha 15", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).lenient(true) - ) - ) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("alpha 15", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).lenient(true)) + ).get(); /* * Doesn't find the one because "alpha 15" isn't a number and we don't * break on spaces. @@ -850,21 +784,18 @@ public class MultiMatchQueryIT extends ESIntegTestCase { assertFirstHit(searchResponse, hasId("ultimate1")); // Lenient wasn't always properly lenient with two numeric fields - searchResponse = client().prepareSearch("test") - .setQuery( - randomizeType( - multiMatchQuery("alpha 15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS) - .lenient(true) - ) + searchResponse = prepareSearch("test").setQuery( + randomizeType( + multiMatchQuery("alpha 15", "int-field", "first_name", "skill").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS).lenient(true) ) - .get(); + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("ultimate1")); // Check that cross fields works with date fields - searchResponse = client().prepareSearch("test") - .setQuery(randomizeType(multiMatchQuery("now", "f*", "date").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)).lenient(true)) - .get(); + searchResponse = prepareSearch("test").setQuery( + randomizeType(multiMatchQuery("now", "f*", "date").type(MultiMatchQueryBuilder.Type.CROSS_FIELDS)).lenient(true) + ).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("nowHero")); } @@ -888,8 +819,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { builders.add(client().prepareIndex(idx).setId("2").setSource("title", "bar", "body", "foo")); indexRandom(true, false, builders); - SearchResponse searchResponse = client().prepareSearch(idx) - .setExplain(true) + SearchResponse searchResponse = prepareSearch(idx).setExplain(true) .setQuery(multiMatchQuery("foo").field("title", 100).field("body").fuzziness(Fuzziness.ZERO)) .get(); SearchHit[] hits = searchResponse.getHits().getHits(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java index 8b83c9d18a85..882e18eb593a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java @@ -49,15 +49,15 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(queryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(queryStringQuery("foo")).get(); assertHitCount(resp, 2L); assertHits(resp.getHits(), "1", "3"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("bar")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("bar")).get(); assertHitCount(resp, 2L); assertHits(resp.getHits(), "1", "3"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("Bar")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("Bar")).get(); assertHitCount(resp, 3L); assertHits(resp.getHits(), "1", "2", "3"); } @@ -68,19 +68,19 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(queryStringQuery("foo bar")).get(); + SearchResponse resp = prepareSearch("test").setQuery(queryStringQuery("foo bar")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")).get(); assertHits(resp.getHits(), "1"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("bar \"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("bar \"2015/09/02\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\" \"2015/09/01\"")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\" \"2015/09/01\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); } @@ -95,19 +95,19 @@ public class QueryStringIT extends ESIntegTestCase { ); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(queryStringQuery("foo bar")).get(); + SearchResponse resp = prepareSearch("test").setQuery(queryStringQuery("foo bar")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")).get(); assertHits(resp.getHits(), "1"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("127.0.0.2 \"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("127.0.0.2 \"2015/09/02\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("127.0.0.1 OR 1.8")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("127.0.0.1 OR 1.8")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); } @@ -118,31 +118,31 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(queryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(queryStringQuery("foo")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("Bar")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("Bar")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("Baz")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("Baz")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("19")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("19")).get(); assertHits(resp.getHits(), "1"); // nested doesn't match because it's hidden - resp = client().prepareSearch("test").setQuery(queryStringQuery("1476383971")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("1476383971")).get(); assertHits(resp.getHits(), "1"); // bool doesn't match - resp = client().prepareSearch("test").setQuery(queryStringQuery("7")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("7")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("23")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("23")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("1293")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("1293")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("42")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("42")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("1.7")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("1.7")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("1.5")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("1.5")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(queryStringQuery("127.0.0.1")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("127.0.0.1")).get(); assertHits(resp.getHits(), "1"); // binary doesn't match // suggest doesn't match @@ -156,15 +156,15 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("3").setSource("f1", "foo bar")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(queryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(queryStringQuery("foo")).get(); assertHits(resp.getHits(), "3"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("bar")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("bar")).get(); assertHits(resp.getHits(), "2", "3"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(queryStringQuery("Foo Bar")).get(); + resp = prepareSearch("test").setQuery(queryStringQuery("Foo Bar")).get(); assertHits(resp.getHits(), "1", "2", "3"); assertHitCount(resp, 3L); } @@ -180,11 +180,9 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test_1").setId("1").setSource("f1", "foo", "f2", "eggplant")); indexRandom(true, false, reqs); - assertHitCount(client().prepareSearch("test_1").setQuery(queryStringQuery("foo eggplant").defaultOperator(Operator.AND)), 0L); + assertHitCount(prepareSearch("test_1").setQuery(queryStringQuery("foo eggplant").defaultOperator(Operator.AND)), 0L); - SearchResponse resp = client().prepareSearch("test_1") - .setQuery(queryStringQuery("foo eggplant").defaultOperator(Operator.OR)) - .get(); + SearchResponse resp = prepareSearch("test_1").setQuery(queryStringQuery("foo eggplant").defaultOperator(Operator.OR)).get(); assertHits(resp.getHits(), "1"); assertHitCount(resp, 1L); } @@ -195,11 +193,11 @@ public class QueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "foo bar", "f4", "chicken parmesan")); indexRandom(true, false, reqs); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("\"eggplant parmesan\"").lenient(true)), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("\"eggplant parmesan\"").lenient(true)), 0L); Exception exc = expectThrows( Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("f4:\"eggplant parmesan\"").lenient(false)).get() + () -> prepareSearch("test").setQuery(queryStringQuery("f4:\"eggplant parmesan\"").lenient(false)).get() ); IllegalStateException ise = (IllegalStateException) ExceptionsHelper.unwrap(exc, IllegalStateException.class); assertNotNull(ise); @@ -207,10 +205,7 @@ public class QueryStringIT extends ESIntegTestCase { } public void testBooleanStrictQuery() throws Exception { - Exception e = expectThrows( - Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("foo").field("f_bool")).get() - ); + Exception e = expectThrows(Exception.class, () -> prepareSearch("test").setQuery(queryStringQuery("foo").field("f_bool")).get()); assertThat( ExceptionsHelper.unwrap(e, IllegalArgumentException.class).getMessage(), containsString("Can't parse boolean value [foo], expected [true] or [false]") @@ -220,7 +215,7 @@ public class QueryStringIT extends ESIntegTestCase { public void testAllFieldsWithSpecifiedLeniency() throws IOException { Exception e = expectThrows( Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("f_date:[now-2D TO now]").lenient(false)).get() + () -> prepareSearch("test").setQuery(queryStringQuery("f_date:[now-2D TO now]").lenient(false)).get() ); assertThat(e.getCause().getMessage(), containsString("unit [D] not supported for date math [-2D]")); } @@ -232,7 +227,7 @@ public class QueryStringIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("test").setQuery(queryStringQuery("value").field("f3_alias")).get(); + SearchResponse response = prepareSearch("test").setQuery(queryStringQuery("value").field("f3_alias")).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -246,7 +241,7 @@ public class QueryStringIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("test").setQuery(queryStringQuery("f3_alias:value AND f2:three")).get(); + SearchResponse response = prepareSearch("test").setQuery(queryStringQuery("f3_alias:value AND f2:three")).get(); assertNoFailures(response); assertHitCount(response, 1); @@ -260,7 +255,7 @@ public class QueryStringIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("test").setQuery(queryStringQuery("value").field("f3_*")).get(); + SearchResponse response = prepareSearch("test").setQuery(queryStringQuery("value").field("f3_*")).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -274,7 +269,7 @@ public class QueryStringIT extends ESIntegTestCase { // The wildcard field matches aliases for both a text and geo_point field. // By default, the geo_point field should be ignored when building the query. - SearchResponse response = client().prepareSearch("test").setQuery(queryStringQuery("text").field("f*_alias")).get(); + SearchResponse response = prepareSearch("test").setQuery(queryStringQuery("text").field("f*_alias")).get(); assertNoFailures(response); assertHitCount(response, 1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java index 40b8000b30b7..c9c7c2a56eea 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java @@ -73,7 +73,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { Map params = new HashMap<>(); params.put("param1", 0.1); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['field2'].value * param1", params); - SearchResponse resp = client().prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script)).get(); + SearchResponse resp = prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script)).get(); assertNoFailures(resp); assertOrderedSearchHits(resp, "10", "8", "6", "4", "2"); assertFirstHit(resp, hasScore(1.0f)); @@ -81,9 +81,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { assertThirdHit(resp, hasScore(0.6f)); // applying min score - resp = client().prepareSearch("test-index") - .setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script).setMinScore(0.6f)) - .get(); + resp = prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script).setMinScore(0.6f)).get(); assertNoFailures(resp); assertOrderedSearchHits(resp, "10", "8", "6"); } @@ -100,7 +98,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { params.put("param1", 0.1); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['field2'].value * param1", params); QueryBuilder boolQuery = boolQuery().should(matchQuery("field1", "text1")).should(matchQuery("field1", "text10")); - SearchResponse resp = client().prepareSearch("test-index").setQuery(scriptScoreQuery(boolQuery, script)).get(); + SearchResponse resp = prepareSearch("test-index").setQuery(scriptScoreQuery(boolQuery, script)).get(); assertNoFailures(resp); assertOrderedSearchHits(resp, "10", "1"); assertFirstHit(resp, hasScore(1.0f)); @@ -120,7 +118,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { RangeQueryBuilder rangeQB = new RangeQueryBuilder("field1").from("2019-01-01"); // the query should be rewritten to from:null Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['field2'].value * param1", Map.of("param1", 0.1)); - SearchResponse resp = client().prepareSearch("test-index2").setQuery(scriptScoreQuery(rangeQB, script)).get(); + SearchResponse resp = prepareSearch("test-index2").setQuery(scriptScoreQuery(rangeQB, script)).get(); assertNoFailures(resp); assertOrderedSearchHits(resp, "3", "2", "1"); } @@ -136,14 +134,14 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { // Execute with search.allow_expensive_queries = null => default value = true => success Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['field2'].value * param1", Map.of("param1", 0.1)); - assertNoFailures(client().prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script))); + assertNoFailures(prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script))); // Set search.allow_expensive_queries to "false" => assert failure updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", false)); ElasticsearchException e = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script)).get() + () -> prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script)).get() ); assertEquals( "[script score] queries cannot be executed when 'search.allow_expensive_queries' is set to false.", @@ -152,7 +150,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { // Set search.allow_expensive_queries to "true" => success updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", true)); - assertNoFailures(client().prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script))); + assertNoFailures(prepareSearch("test-index").setQuery(scriptScoreQuery(matchQuery("field1", "text0"), script))); } finally { updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", (String) null)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java index c35bfee6e73d..199f730b65ae 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -219,30 +219,24 @@ public class SearchQueryIT extends ESIntegTestCase { assertThat(searchHit, hasScore(1.0f)); } - searchResponse = client().prepareSearch("test") - .setQuery( - boolQuery().must(matchAllQuery()).must(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat())) - ) - .get(); + searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).must(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat())) + ).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasScore(searchResponse.getHits().getAt(1).getScore())); - client().prepareSearch("test").setQuery(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat())).get(); + prepareSearch("test").setQuery(constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + random().nextFloat())).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasScore(searchResponse.getHits().getAt(1).getScore())); - searchResponse = client().prepareSearch("test") - .setQuery( - constantScoreQuery( - boolQuery().must(matchAllQuery()) - .must( - constantScoreQuery(matchQuery("field1", "quick")).boost( - 1.0f + (random.nextBoolean() ? 0.0f : random.nextFloat()) - ) - ) - ) + searchResponse = prepareSearch("test").setQuery( + constantScoreQuery( + boolQuery().must(matchAllQuery()) + .must( + constantScoreQuery(matchQuery("field1", "quick")).boost(1.0f + (random.nextBoolean() ? 0.0f : random.nextFloat())) + ) ) - .get(); + ).get(); assertHitCount(searchResponse, 2L); assertFirstHit(searchResponse, hasScore(searchResponse.getHits().getAt(1).getScore())); for (SearchHit searchHit : searchResponse.getHits().getHits()) { @@ -260,19 +254,16 @@ public class SearchQueryIT extends ESIntegTestCase { int queryRounds = scaledRandomIntBetween(10, 20); for (int i = 0; i < queryRounds; i++) { MatchQueryBuilder matchQuery = matchQuery("f", English.intToEnglish(between(0, num))); - searchResponse = client().prepareSearch("test_1").setQuery(constantScoreQuery(matchQuery)).setSize(num).get(); + searchResponse = prepareSearch("test_1").setQuery(constantScoreQuery(matchQuery)).setSize(num).get(); long totalHits = searchResponse.getHits().getTotalHits().value; SearchHits hits = searchResponse.getHits(); for (SearchHit searchHit : hits) { assertThat(searchHit, hasScore(1.0f)); } - searchResponse = client().prepareSearch("test_1") - .setQuery( - boolQuery().must(matchAllQuery()) - .must(constantScoreQuery(matchQuery).boost(1.0f + (random.nextBoolean() ? 0.0f : random.nextFloat()))) - ) - .setSize(num) - .get(); + searchResponse = prepareSearch("test_1").setQuery( + boolQuery().must(matchAllQuery()) + .must(constantScoreQuery(matchQuery).boost(1.0f + (random.nextBoolean() ? 0.0f : random.nextFloat()))) + ).setSize(num).get(); hits = searchResponse.getHits(); assertThat(hits.getTotalHits().value, equalTo(totalHits)); if (totalHits > 1) { @@ -295,11 +286,11 @@ public class SearchQueryIT extends ESIntegTestCase { int iters = scaledRandomIntBetween(100, 200); for (int i = 0; i < iters; i++) { - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("*:*^10.0").boost(10.0f)), 2L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("*:*^10.0").boost(10.0f)), 2L); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().must(matchAllQuery()).must(constantScoreQuery(matchAllQuery()))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + boolQuery().must(matchAllQuery()).must(constantScoreQuery(matchAllQuery())) + ).get(); assertHitCount(searchResponse, 2L); assertThat((double) searchResponse.getHits().getAt(0).getScore(), closeTo(2.0, 0.1)); assertThat((double) searchResponse.getHits().getAt(1).getScore(), closeTo(2.0, 0.1)); @@ -542,10 +533,10 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); refresh(); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); } public void testMatchQueryNumeric() throws Exception { @@ -845,8 +836,8 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("3").setSource("term", "3"), client().prepareIndex("test").setId("4").setSource("term", "4") ); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("term", new String[0]))), 0L); - assertHitCount(client().prepareSearch("test").setQuery(idsQuery()), 0L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("term", new String[0]))), 0L); + assertHitCount(prepareSearch("test").setQuery(idsQuery()), 0L); } public void testTermsQuery() throws Exception { @@ -859,41 +850,35 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("3").setSource("str", "3", "lng", 3L, "dbl", 3.0d), client().prepareIndex("test").setId("4").setSource("str", "4", "lng", 4L, "dbl", 4.0d) ); - assertSearchHitsWithoutFailures(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "1", "4"))), "1", "4"); + assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "1", "4"))), "1", "4"); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 2, 3 }))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 2, 3 }))), "2", "3" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 2, 3 }))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 2, 3 }))), "2", "3" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new int[] { 1, 3 }))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new int[] { 1, 3 }))), "1", "3" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new float[] { 2, 4 }))), + prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new float[] { 2, 4 }))), "2", "4" ); // test partial matching - assertSearchHitsWithoutFailures(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "2", "5"))), "2"); - assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 2, 5 }))), - "2" - ); - assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 2, 5 }))), - "2" - ); + assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "2", "5"))), "2"); + assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 2, 5 }))), "2"); + assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 2, 5 }))), "2"); // test valid type, but no matching terms - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "5", "6"))), 0L); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 5, 6 }))), 0L); - assertHitCount(client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 5, 6 }))), 0L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "5", "6"))), 0L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("dbl", new double[] { 5, 6 }))), 0L); + assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("lng", new long[] { 5, 6 }))), 0L); } public void testTermsLookupFilter() throws Exception { @@ -973,68 +958,62 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("term", "4") ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "1", "terms"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "1", "terms"))), "1", "3" ); // same as above, just on the _id... assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("_id", new TermsLookup("lookup", "1", "terms"))), + prepareSearch("test").setQuery(termsLookupQuery("_id", new TermsLookup("lookup", "1", "terms"))), "1", "3" ); // another search with same parameters... assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "1", "terms"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "1", "terms"))), "1", "3" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "2", "terms"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "2", "terms"))), "2" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "3", "terms"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "3", "terms"))), "2", "4" ); - assertHitCount(client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "4", "terms"))), 0L); + assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "4", "terms"))), 0L); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "1", "arr.term"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "1", "arr.term"))), "1", "3" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "2", "arr.term"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "2", "arr.term"))), "2" ); assertSearchHitsWithoutFailures( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "3", "arr.term"))), + prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup2", "3", "arr.term"))), "2", "4" ); - assertHitCount( - client().prepareSearch("test").setQuery(termsLookupQuery("not_exists", new TermsLookup("lookup2", "3", "arr.term"))), - 0L - ); + assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("not_exists", new TermsLookup("lookup2", "3", "arr.term"))), 0L); // index "lookup" id "missing" document does not exist: ignore the lookup terms - assertHitCount( - client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "missing", "terms"))), - 0L - ); + assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "missing", "terms"))), 0L); // index "lookup3" has the source disabled: ignore the lookup terms - assertHitCount(client().prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup3", "1", "terms"))), 0L); + assertHitCount(prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup3", "1", "terms"))), 0L); } public void testBasicQueryById() throws Exception { @@ -1102,82 +1081,82 @@ public class SearchQueryIT extends ESIntegTestCase { SearchResponse searchResponse; logger.info("--> term query on 1"); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_byte", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_byte", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_short", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_short", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_integer", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_integer", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_long", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_long", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_float", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_float", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termQuery("num_double", 1)).get(); + searchResponse = prepareSearch("test").setQuery(termQuery("num_double", 1)).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); logger.info("--> terms query on 1"); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_byte", new int[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_byte", new int[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_short", new int[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_short", new int[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_integer", new int[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_integer", new int[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_long", new int[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_long", new int[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_float", new double[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_float", new double[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(termsQuery("num_double", new double[] { 1 })).get(); + searchResponse = prepareSearch("test").setQuery(termsQuery("num_double", new double[] { 1 })).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); logger.info("--> term filter on 1"); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_byte", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_byte", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_short", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_short", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_integer", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_integer", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_long", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_long", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_float", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_float", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_double", 1))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termQuery("num_double", 1))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); logger.info("--> terms filter on 1"); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_byte", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_byte", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_short", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_short", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_integer", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_integer", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_long", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_long", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_float", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_float", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); - searchResponse = client().prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_double", new int[] { 1 }))).get(); + searchResponse = prepareSearch("test").setQuery(constantScoreQuery(termsQuery("num_double", new int[] { 1 }))).get(); assertHitCount(searchResponse, 1L); assertFirstHit(searchResponse, hasId("1")); } @@ -1206,25 +1185,23 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("field1", "test2", "num_long", 4).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setPostFilter(boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setPostFilter( + boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4)) + ).get(); assertHitCount(searchResponse, 4L); // This made 2826 fail! (only with bit based filters) - searchResponse = client().prepareSearch("test") - .setPostFilter(boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4))) - .get(); + searchResponse = prepareSearch("test").setPostFilter( + boolQuery().should(rangeQuery("num_long").from(1).to(2)).should(rangeQuery("num_long").from(3).to(4)) + ).get(); assertHitCount(searchResponse, 4L); // This made #2979 fail! - searchResponse = client().prepareSearch("test") - .setPostFilter( - boolQuery().must(termQuery("field1", "test1")) - .should(rangeQuery("num_long").from(1).to(2)) - .should(rangeQuery("num_long").from(3).to(4)) - ) - .get(); + searchResponse = prepareSearch("test").setPostFilter( + boolQuery().must(termQuery("field1", "test1")) + .should(rangeQuery("num_long").from(1).to(2)) + .should(rangeQuery("num_long").from(3).to(4)) + ).get(); assertHitCount(searchResponse, 2L); } @@ -1244,14 +1221,12 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("description", "foo") ); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .get(); assertHitCount(searchResponse, 4L); - searchResponse = client().prepareSearch("test") - .setQuery(boolQuery().mustNot(matchQuery("description", "anything"))) + searchResponse = prepareSearch("test").setQuery(boolQuery().mustNot(matchQuery("description", "anything"))) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .get(); assertHitCount(searchResponse, 2L); @@ -1288,7 +1263,7 @@ public class SearchQueryIT extends ESIntegTestCase { } } }"""; - SearchResponse response = client().prepareSearch("test").setQuery(wrapperQuery(json)).get(); + SearchResponse response = prepareSearch("test").setQuery(wrapperQuery(json)).get(); assertHitCount(response, 1L); } @@ -1304,10 +1279,11 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("description", "foo") ); - assertHitCount(client().prepareSearch("test").setQuery(spanOrQuery(spanTermQuery("description", "bar"))), 1L); + assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanTermQuery("description", "bar"))), 1L); assertHitCount( - client().prepareSearch("test") - .setQuery(spanNearQuery(spanTermQuery("description", "foo"), 3).addClause(spanTermQuery("description", "other"))), + prepareSearch("test").setQuery( + spanNearQuery(spanTermQuery("description", "foo"), 3).addClause(spanTermQuery("description", "other")) + ), 3L ); } @@ -1321,27 +1297,16 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("description", "fop", "count", 4).get(); refresh(); + assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(fuzzyQuery("description", "fop")))), 4); + assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(prefixQuery("description", "fo")))), 4); + assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(wildcardQuery("description", "oth*")))), 3); assertHitCount( - client().prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(fuzzyQuery("description", "fop")))), - 4 - ); - assertHitCount( - client().prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(prefixQuery("description", "fo")))), - 4 - ); - assertHitCount( - client().prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(wildcardQuery("description", "oth*")))), - 3 - ); - assertHitCount( - client().prepareSearch("test") - .setQuery(spanOrQuery(spanMultiTermQueryBuilder(QueryBuilders.rangeQuery("description").from("ffa").to("foo")))), - 3 - ); - assertHitCount( - client().prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(regexpQuery("description", "fo{2}")))), + prepareSearch("test").setQuery( + spanOrQuery(spanMultiTermQueryBuilder(QueryBuilders.rangeQuery("description").from("ffa").to("foo"))) + ), 3 ); + assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(regexpQuery("description", "fo{2}")))), 3); } public void testSpanNot() throws IOException, ExecutionException, InterruptedException { @@ -1352,39 +1317,36 @@ public class SearchQueryIT extends ESIntegTestCase { refresh(); assertHitCount( - client().prepareSearch("test") - .setQuery( - spanNotQuery( - spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( - QueryBuilders.spanTermQuery("description", "fox") - ), - spanTermQuery("description", "brown") - ) - ), + prepareSearch("test").setQuery( + spanNotQuery( + spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( + QueryBuilders.spanTermQuery("description", "fox") + ), + spanTermQuery("description", "brown") + ) + ), 1L ); assertHitCount( - client().prepareSearch("test") - .setQuery( - spanNotQuery( - spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( - QueryBuilders.spanTermQuery("description", "fox") - ), - spanTermQuery("description", "sleeping") - ).dist(5) - ), + prepareSearch("test").setQuery( + spanNotQuery( + spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( + QueryBuilders.spanTermQuery("description", "fox") + ), + spanTermQuery("description", "sleeping") + ).dist(5) + ), 1L ); assertHitCount( - client().prepareSearch("test") - .setQuery( - spanNotQuery( - spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( - QueryBuilders.spanTermQuery("description", "fox") - ), - spanTermQuery("description", "jumped") - ).pre(1).post(1) - ), + prepareSearch("test").setQuery( + spanNotQuery( + spanNearQuery(QueryBuilders.spanTermQuery("description", "quick"), 1).addClause( + QueryBuilders.spanTermQuery("description", "fox") + ), + spanTermQuery("description", "jumped") + ).pre(1).post(1) + ), 1L ); } @@ -1438,8 +1400,7 @@ public class SearchQueryIT extends ESIntegTestCase { refresh(); assertNoFailures( - client().prepareSearch("test") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery( boolQuery().must(termQuery("online", true)) .must( @@ -1464,20 +1425,20 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); logger.info("regular"); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("value1").field("field1").field("field2")), 1); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("field\\*:value1")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("value1").field("field1").field("field2")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("field\\*:value1")), 1); logger.info("prefix"); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("value*").field("field1").field("field2")), 1); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("field\\*:value*")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("value*").field("field1").field("field2")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("field\\*:value*")), 1); logger.info("wildcard"); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("v?lue*").field("field1").field("field2")), 1); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("field\\*:v?lue*")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("v?lue*").field("field1").field("field2")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("field\\*:v?lue*")), 1); logger.info("fuzzy"); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("value~").field("field1").field("field2")), 1); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("field\\*:value~")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("value~").field("field1").field("field2")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("field\\*:value~")), 1); logger.info("regexp"); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("/value[01]/").field("field1").field("field2")), 1); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("field\\*:/value[01]/")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("/value[01]/").field("field1").field("field2")), 1); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("field\\*:/value[01]/")), 1); } // see #3797 @@ -1487,9 +1448,9 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field1", 123, "field2", "value2").get(); refresh(); - assertHitCount(client().prepareSearch("test").setQuery(multiMatchQuery("value2", "field2").field("field1", 2).lenient(true)), 1L); - assertHitCount(client().prepareSearch("test").setQuery(multiMatchQuery("value2", "field2").field("field1", 2).lenient(true)), 1L); - assertHitCount(client().prepareSearch("test").setQuery(multiMatchQuery("value2").field("field2", 2).lenient(true)), 1L); + assertHitCount(prepareSearch("test").setQuery(multiMatchQuery("value2", "field2").field("field1", 2).lenient(true)), 1L); + assertHitCount(prepareSearch("test").setQuery(multiMatchQuery("value2", "field2").field("field1", 2).lenient(true)), 1L); + assertHitCount(prepareSearch("test").setQuery(multiMatchQuery("value2").field("field2", 2).lenient(true)), 1L); } public void testMinScore() throws ExecutionException, InterruptedException { @@ -1501,9 +1462,9 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("4").setSource("score", 0.5).get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(functionScoreQuery(ScoreFunctionBuilders.fieldValueFactorFunction("score").missing(1.0)).setMinScore(1.5f)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + functionScoreQuery(ScoreFunctionBuilders.fieldValueFactorFunction("score").missing(1.0)).setMinScore(1.5f) + ).get(); assertHitCount(searchResponse, 2); assertFirstHit(searchResponse, hasId("3")); assertSecondHit(searchResponse, hasId("1")); @@ -1516,28 +1477,24 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("desc", "one two three", "type", "product").get(); refresh(); - assertHitCount(client().prepareSearch("test").setQuery(QueryBuilders.queryStringQuery("\"one two\"").defaultField("desc")), 2); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.queryStringQuery("\"one two\"").defaultField("desc")), 2); assertHitCount( - client().prepareSearch("test") - .setPostFilter(QueryBuilders.termQuery("type", "customer")) + prepareSearch("test").setPostFilter(QueryBuilders.termQuery("type", "customer")) .setQuery(QueryBuilders.queryStringQuery("\"one two\"").field("desc")), 1 ); assertHitCount( - client().prepareSearch("test") - .setPostFilter(QueryBuilders.termQuery("type", "product")) + prepareSearch("test").setPostFilter(QueryBuilders.termQuery("type", "product")) .setQuery(QueryBuilders.queryStringQuery("\"one three\"~5").field("desc")), 1 ); assertHitCount( - client().prepareSearch("test") - .setPostFilter(QueryBuilders.termQuery("type", "customer")) + prepareSearch("test").setPostFilter(QueryBuilders.termQuery("type", "customer")) .setQuery(QueryBuilders.queryStringQuery("\"one two\"").defaultField("desc")), 1 ); assertHitCount( - client().prepareSearch("test") - .setPostFilter(QueryBuilders.termQuery("type", "customer")) + prepareSearch("test").setPostFilter(QueryBuilders.termQuery("type", "customer")) .setQuery(QueryBuilders.queryStringQuery("\"one two\"").defaultField("desc")), 1 ); @@ -1556,8 +1513,8 @@ public class SearchQueryIT extends ESIntegTestCase { client().prepareIndex("test").setId("6").setSource("field", 999999999999L) ); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(rangeQuery("field").gte(1000000000000L)), 4); - assertHitCount(client().prepareSearch("test").setSize(0).setQuery(rangeQuery("field").gte(999999999999L)), 6); + assertHitCount(prepareSearch("test").setSize(0).setQuery(rangeQuery("field").gte(1000000000000L)), 4); + assertHitCount(prepareSearch("test").setSize(0).setQuery(rangeQuery("field").gte(999999999999L)), 6); } public void testRangeQueryWithTimeZone() throws Exception { @@ -1574,65 +1531,63 @@ public class SearchQueryIT extends ESIntegTestCase { .setSource("date", Instant.now().atZone(ZoneOffset.ofHours(1)).toInstant().toEpochMilli(), "num", 4) ); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T00:00:00").to("2014-01-01T00:59:00")) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T00:00:00").to("2014-01-01T00:59:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("1")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2013-12-31T23:00:00").to("2013-12-31T23:59:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2013-12-31T23:00:00").to("2013-12-31T23:59:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("2")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T01:00:00").to("2014-01-01T01:59:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T01:00:00").to("2014-01-01T01:59:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("3")); // We explicitly define a time zone in the from/to dates so whatever the time zone is, it won't be used - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T00:00:00Z").to("2014-01-01T00:59:00Z").timeZone("+10:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T00:00:00Z").to("2014-01-01T00:59:00Z").timeZone("+10:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("1")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2013-12-31T23:00:00Z").to("2013-12-31T23:59:00Z").timeZone("+10:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2013-12-31T23:00:00Z").to("2013-12-31T23:59:00Z").timeZone("+10:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("2")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T01:00:00Z").to("2014-01-01T01:59:00Z").timeZone("+10:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T01:00:00Z").to("2014-01-01T01:59:00Z").timeZone("+10:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("3")); // We define a time zone to be applied to the filter and from/to have no time zone - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T03:00:00").to("2014-01-01T03:59:00").timeZone("+03:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T03:00:00").to("2014-01-01T03:59:00").timeZone("+03:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("1")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T02:00:00").to("2014-01-01T02:59:00").timeZone("+03:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T02:00:00").to("2014-01-01T02:59:00").timeZone("+03:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("2")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01T04:00:00").to("2014-01-01T04:59:00").timeZone("+03:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01T04:00:00").to("2014-01-01T04:59:00").timeZone("+03:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("3")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("2014-01-01").to("2014-01-01T00:59:00").timeZone("-01:00")) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date").from("2014-01-01").to("2014-01-01T00:59:00").timeZone("-01:00") + ).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("3")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("date").from("now/d-1d").timeZone("+01:00")) - .get(); + searchResponse = prepareSearch("test").setQuery(QueryBuilders.rangeQuery("date").from("now/d-1d").timeZone("+01:00")).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), is("4")); } @@ -1670,17 +1625,15 @@ public class SearchQueryIT extends ESIntegTestCase { ); assertHitCount( - client().prepareSearch("test") - .setQuery( - QueryBuilders.rangeQuery("date_field").gte("Di, 05 Dez 2000 02:55:00 -0800").lte("Do, 07 Dez 2000 00:00:00 -0800") - ), + prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date_field").gte("Di, 05 Dez 2000 02:55:00 -0800").lte("Do, 07 Dez 2000 00:00:00 -0800") + ), 1L ); assertHitCount( - client().prepareSearch("test") - .setQuery( - QueryBuilders.rangeQuery("date_field").gte("Di, 05 Dez 2000 02:55:00 -0800").lte("Fr, 08 Dez 2000 00:00:00 -0800") - ), + prepareSearch("test").setQuery( + QueryBuilders.rangeQuery("date_field").gte("Di, 05 Dez 2000 02:55:00 -0800").lte("Fr, 08 Dez 2000 00:00:00 -0800") + ), 2L ); } @@ -1712,8 +1665,7 @@ public class SearchQueryIT extends ESIntegTestCase { createIndex("test"); indexRandom(true, false, client().prepareIndex("test").setId("1").setSource("nameTokens", "xyz")); - SearchResponse response = client().prepareSearch("test") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(QueryBuilders.queryStringQuery("xyz").boost(100)) .get(); assertThat(response.getHits().getTotalHits().value, equalTo(1L)); @@ -1721,8 +1673,7 @@ public class SearchQueryIT extends ESIntegTestCase { float first = response.getHits().getAt(0).getScore(); for (int i = 0; i < 100; i++) { - response = client().prepareSearch("test") - .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + response = prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setQuery(QueryBuilders.queryStringQuery("xyz").boost(100)) .get(); @@ -1743,7 +1694,7 @@ public class SearchQueryIT extends ESIntegTestCase { refresh(); RangeQueryBuilder range = new RangeQueryBuilder("int_range").relation("intersects").from(Integer.MIN_VALUE).to(Integer.MAX_VALUE); - SearchResponse searchResponse = client().prepareSearch("test").setQuery(range).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(range).get(); assertHitCount(searchResponse, 1); } @@ -1784,7 +1735,7 @@ public class SearchQueryIT extends ESIntegTestCase { QueryBuilders.termQuery("section.route_length_miles", 42), ScoreMode.Max ); - assertHitCount(client().prepareSearch("index").setQuery(nestedQuery), 1); + assertHitCount(prepareSearch("index").setQuery(nestedQuery), 1); } public void testFieldAliasesForMetaFields() throws Exception { @@ -1957,7 +1908,7 @@ public class SearchQueryIT extends ESIntegTestCase { refresh(); BoolQueryBuilder query = boolQuery().filter(spanMultiTermQueryBuilder(fuzzyQuery("field", "foobarbiz").rewrite("constant_score"))); - assertHitCount(client().prepareSearch("test").setQuery(query), 1); + assertHitCount(prepareSearch("test").setQuery(query), 1); } public void testFetchIdFieldQuery() { @@ -1969,7 +1920,7 @@ public class SearchQueryIT extends ESIntegTestCase { ensureGreen(); refresh(); - SearchResponse response = client().prepareSearch("test").addFetchField("_id").setSize(docCount).get(); + SearchResponse response = prepareSearch("test").addFetchField("_id").setSize(docCount).get(); SearchHit[] hits = response.getHits().getHits(); assertEquals(docCount, hits.length); for (SearchHit hit : hits) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java index 80c3e73e76bd..c41aa2067b9c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java @@ -324,7 +324,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { BoolQueryBuilder q = boolQuery().should(simpleQueryStringQuery("bar").field("num").field("body").lenient(true)); // the bug is that this would be parsed into basically a match_all // query and this would match both documents - assertSearchHitsWithoutFailures(client().prepareSearch("test").setQuery(q), "1"); + assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(q), "1"); } public void testSimpleQueryStringAnalyzeWildcard() throws ExecutionException, InterruptedException, IOException { @@ -395,15 +395,15 @@ public class SimpleQueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); assertHitCount(resp, 2L); assertHits(resp.getHits(), "1", "3"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("bar")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("bar")).get(); assertHitCount(resp, 2L); assertHits(resp.getHits(), "1", "3"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("Bar")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("Bar")).get(); assertHitCount(resp, 3L); assertHits(resp.getHits(), "1", "2", "3"); } @@ -418,19 +418,19 @@ public class SimpleQueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")).get(); + SearchResponse resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\"")).get(); assertHits(resp.getHits(), "1"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("bar \"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("bar \"2015/09/02\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\" \"2015/09/01\"")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\" \"2015/09/01\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); } @@ -449,19 +449,19 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")).get(); + SearchResponse resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("\"2015/09/02\"")).get(); assertHits(resp.getHits(), "1"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.2 \"2015/09/02\"")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.2 \"2015/09/02\"")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.1 1.8")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.1 1.8")).get(); assertHits(resp.getHits(), "1", "2"); assertHitCount(resp, 2L); } @@ -476,38 +476,38 @@ public class SimpleQueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("Bar")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("Bar")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("Baz")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("Baz")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("19")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("19")).get(); assertHits(resp.getHits(), "1"); // nested doesn't match because it's hidden - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("1476383971")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("1476383971")).get(); assertHits(resp.getHits(), "1"); // bool doesn't match - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("7")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("7")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("23")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("23")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("1293")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("1293")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("42")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("42")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("1.7")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("1.7")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("1.5")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("1.5")).get(); assertHits(resp.getHits(), "1"); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.1")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("127.0.0.1")).get(); assertHits(resp.getHits(), "1"); // binary doesn't match // suggest doesn't match // geo_point doesn't match // geo_shape doesn't match - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo Bar 19 127.0.0.1").defaultOperator(Operator.AND)).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo Bar 19 127.0.0.1").defaultOperator(Operator.AND)).get(); assertHits(resp.getHits(), "1"); } @@ -522,11 +522,11 @@ public class SimpleQueryStringIT extends ESIntegTestCase { reqs.add(client().prepareIndex("test").setId("3").setSource("f1", "foo bar")); indexRandom(true, false, reqs); - SearchResponse resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); + SearchResponse resp = prepareSearch("test").setQuery(simpleQueryStringQuery("foo")).get(); assertHits(resp.getHits(), "3"); assertHitCount(resp, 1L); - resp = client().prepareSearch("test").setQuery(simpleQueryStringQuery("bar")).get(); + resp = prepareSearch("test").setQuery(simpleQueryStringQuery("bar")).get(); assertHits(resp.getHits(), "2", "3"); assertHitCount(resp, 2L); } @@ -542,7 +542,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test").setQuery(simpleQueryStringQuery("foo123").lenient(false)).get() + () -> prepareSearch("test").setQuery(simpleQueryStringQuery("foo123").lenient(false)).get() ); assertThat(e.getDetailedMessage(), containsString("NumberFormatException: For input string: \"foo123\"")); } @@ -558,7 +558,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_alias")).get(); + SearchResponse response = prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_alias")).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -576,7 +576,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); - SearchResponse response = client().prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_*")).get(); + SearchResponse response = prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_*")).get(); assertNoFailures(response); assertHitCount(response, 2); @@ -594,7 +594,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { // The wildcard field matches aliases for both a text and boolean field. // By default, the boolean field should be ignored when building the query. - SearchResponse response = client().prepareSearch("test").setQuery(queryStringQuery("text").field("f*_alias")).get(); + SearchResponse response = prepareSearch("test").setQuery(queryStringQuery("text").field("f*_alias")).get(); assertNoFailures(response); assertHitCount(response, 1); 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 cf2a7f130bd9..3b19d55efef7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java @@ -217,8 +217,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { final String customPreference = randomAlphaOfLength(10); - final String nodeId = client().prepareSearch("test") - .setQuery(matchAllQuery()) + final String nodeId = prepareSearch("test").setQuery(matchAllQuery()) .setPreference(customPreference) .get() .getHits() @@ -260,7 +259,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { } private static void assertSearchesSpecificNode(String index, String customPreference, String nodeId) { - final SearchResponse searchResponse = client().prepareSearch(index).setQuery(matchAllQuery()).setPreference(customPreference).get(); + final SearchResponse searchResponse = prepareSearch(index).setQuery(matchAllQuery()).setPreference(customPreference).get(); assertThat(searchResponse.getHits().getHits().length, equalTo(1)); assertThat(searchResponse.getHits().getAt(0).getShard().getNodeId(), equalTo(nodeId)); } 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 499aba8fd57d..294768a319b0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java @@ -224,14 +224,14 @@ public class ScriptQuerySearchIT extends ESIntegTestCase { // Execute with search.allow_expensive_queries = null => default value = false => success Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['num1'].value > 1", Collections.emptyMap()); - assertNoFailures(client().prepareSearch("test-index").setQuery(scriptQuery(script))); + assertNoFailures(prepareSearch("test-index").setQuery(scriptQuery(script))); updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", false)); // Set search.allow_expensive_queries to "false" => assert failure ElasticsearchException e = expectThrows( ElasticsearchException.class, - () -> client().prepareSearch("test-index").setQuery(scriptQuery(script)).get() + () -> prepareSearch("test-index").setQuery(scriptQuery(script)).get() ); assertEquals( "[script] queries cannot be executed when 'search.allow_expensive_queries' is set to false.", @@ -240,7 +240,7 @@ public class ScriptQuerySearchIT extends ESIntegTestCase { // Set search.allow_expensive_queries to "true" => success updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", true)); - assertNoFailures(client().prepareSearch("test-index").setQuery(scriptQuery(script))); + assertNoFailures(prepareSearch("test-index").setQuery(scriptQuery(script))); } finally { updateClusterSettings(Settings.builder().put("search.allow_expensive_queries", (String) null)); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java index 53bbe47149d3..c63aa19beb42 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java @@ -37,8 +37,7 @@ public class DuelScrollIT extends ESIntegTestCase { public void testDuelQueryThenFetch() throws Exception { TestContext context = create(SearchType.DFS_QUERY_THEN_FETCH, SearchType.QUERY_THEN_FETCH); - SearchResponse control = client().prepareSearch("index") - .setSearchType(context.searchType) + SearchResponse control = prepareSearch("index").setSearchType(context.searchType) .addSort(context.sort) .setSize(context.numDocs) .get(); @@ -47,8 +46,7 @@ public class DuelScrollIT extends ESIntegTestCase { assertThat(sh.getTotalHits().value, equalTo((long) context.numDocs)); assertThat(sh.getHits().length, equalTo(context.numDocs)); - SearchResponse searchScrollResponse = client().prepareSearch("index") - .setSearchType(context.searchType) + SearchResponse searchScrollResponse = prepareSearch("index").setSearchType(context.searchType) .addSort(context.sort) .setSize(context.scrollRequestSize) .setScroll("10m") @@ -215,8 +213,7 @@ public class DuelScrollIT extends ESIntegTestCase { private void testDuelIndexOrder(SearchType searchType, boolean trackScores, int numDocs) throws Exception { final int size = scaledRandomIntBetween(5, numDocs + 5); - final SearchResponse control = client().prepareSearch("test") - .setSearchType(searchType) + final SearchResponse control = prepareSearch("test").setSearchType(searchType) .setSize(numDocs) .setQuery(QueryBuilders.matchQuery("foo", "true")) .addSort(SortBuilders.fieldSort("_doc")) @@ -224,8 +221,7 @@ public class DuelScrollIT extends ESIntegTestCase { .get(); assertNoFailures(control); - SearchResponse scroll = client().prepareSearch("test") - .setSearchType(searchType) + SearchResponse scroll = prepareSearch("test").setSearchType(searchType) .setSize(size) .setQuery(QueryBuilders.matchQuery("foo", "true")) .addSort(SortBuilders.fieldSort("_doc")) 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 6b6192ddcce9..6fb19890a183 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java @@ -469,8 +469,7 @@ public class SearchScrollIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), Integer.MAX_VALUE), "index"); for (SearchType searchType : SearchType.values()) { - SearchRequestBuilder builder = client().prepareSearch("index") - .setSearchType(searchType) + SearchRequestBuilder builder = prepareSearch("index").setSearchType(searchType) .setQuery(QueryBuilders.matchAllQuery()) .setSize(Integer.MAX_VALUE) .setScroll("1m"); @@ -491,7 +490,7 @@ public class SearchScrollIT extends ESIntegTestCase { client().prepareIndex("index").setId("1").setSource("field", "value").execute().get(); refresh(); - SearchResponse searchResponse = client().prepareSearch("index").setSize(1).setScroll("1m").get(); + SearchResponse searchResponse = prepareSearch("index").setSize(1).setScroll("1m").get(); assertThat(searchResponse.getScrollId(), is(notNullValue())); ClearScrollResponse clearScrollResponse = client().prepareClearScroll().addScrollId(searchResponse.getScrollId()).get(); @@ -507,7 +506,7 @@ public class SearchScrollIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("some_field", "test").get(); refresh(); - SearchResponse response = client().prepareSearch("test") + SearchResponse response = prepareSearch("test") .addSort(new FieldSortBuilder("no_field").order(SortOrder.ASC).missing("_last")) .setScroll("1m") @@ -520,7 +519,7 @@ public class SearchScrollIT extends ESIntegTestCase { assertHitCount(response, 1); assertNoSearchHits(response); - response = client().prepareSearch("test") + response = prepareSearch("test") .addSort(new FieldSortBuilder("no_field").order(SortOrder.ASC).missing("_first")) .setScroll("1m") @@ -650,8 +649,7 @@ public class SearchScrollIT extends ESIntegTestCase { SearchResponse resp = null; try { int totalHits = 0; - resp = client().prepareSearch("test") - .setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) + resp = prepareSearch("test").setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) .setMaxConcurrentShardRequests(randomIntBetween(1, 3)) // sometimes fan out shard requests one by one .setSize(randomIntBetween(1, 2)) .setScroll(TimeValue.timeValueMinutes(1)) @@ -680,16 +678,14 @@ public class SearchScrollIT extends ESIntegTestCase { index("prod", "prod-" + i, Map.of()); } indicesAdmin().prepareRefresh().get(); - SearchResponse respFromDemoIndex = client().prepareSearch("demo") - .setSize(randomIntBetween(1, 10)) + SearchResponse respFromDemoIndex = prepareSearch("demo").setSize(randomIntBetween(1, 10)) .setQuery(new MatchAllQueryBuilder()) .setScroll(TimeValue.timeValueMinutes(5)) .get(); internalCluster().restartNode(dataNode, new InternalTestCluster.RestartCallback()); ensureGreen("demo", "prod"); - SearchResponse respFromProdIndex = client().prepareSearch("prod") - .setSize(randomIntBetween(1, 10)) + SearchResponse respFromProdIndex = prepareSearch("prod").setSize(randomIntBetween(1, 10)) .setQuery(new MatchAllQueryBuilder()) .setScroll(TimeValue.timeValueMinutes(5)) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java index 87a500691aab..3ac8b103ce91 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java @@ -67,8 +67,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .addSort("field1", SortOrder.ASC) + () -> prepareSearch("test").addSort("field1", SortOrder.ASC) .setQuery(matchAllQuery()) .searchAfter(new Object[] { 0 }) .setScroll("1m") @@ -83,8 +82,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .addSort("field1", SortOrder.ASC) + () -> prepareSearch("test").addSort("field1", SortOrder.ASC) .setQuery(matchAllQuery()) .searchAfter(new Object[] { 0 }) .setFrom(10) @@ -99,7 +97,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test").setQuery(matchAllQuery()).searchAfter(new Object[] { 0.75f }).get() + () -> prepareSearch("test").setQuery(matchAllQuery()).searchAfter(new Object[] { 0.75f }).get() ); assertTrue(e.shardFailures().length > 0); for (ShardSearchFailure failure : e.shardFailures()) { @@ -110,8 +108,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .addSort("field2", SortOrder.DESC) + () -> prepareSearch("test").addSort("field2", SortOrder.DESC) .addSort("field1", SortOrder.ASC) .setQuery(matchAllQuery()) .searchAfter(new Object[] { 1 }) @@ -126,8 +123,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .setQuery(matchAllQuery()) + () -> prepareSearch("test").setQuery(matchAllQuery()) .addSort("field1", SortOrder.ASC) .searchAfter(new Object[] { 1, 2 }) .get() @@ -141,8 +137,7 @@ public class SearchAfterIT extends ESIntegTestCase { { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .setQuery(matchAllQuery()) + () -> prepareSearch("test").setQuery(matchAllQuery()) .addSort("field1", SortOrder.ASC) .searchAfter(new Object[] { "toto" }) .get() @@ -162,8 +157,7 @@ public class SearchAfterIT extends ESIntegTestCase { client().prepareIndex("test").setId("0").setSource("field1", 0), client().prepareIndex("test").setId("1").setSource("field1", 100, "field2", "toto") ); - SearchResponse searchResponse = client().prepareSearch("test") - .addSort("field1", SortOrder.ASC) + SearchResponse searchResponse = prepareSearch("test").addSort("field1", SortOrder.ASC) .addSort("field2", SortOrder.ASC) .setQuery(matchAllQuery()) .searchAfter(new Object[] { 0, null }) @@ -235,8 +229,7 @@ public class SearchAfterIT extends ESIntegTestCase { .add(new IndexRequest("test").id("5").source("start_date", "2017-01-20", "end_date", "2025-05-28")) .get(); - SearchResponse resp = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) + SearchResponse resp = prepareSearch("test").addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) .addSort(SortBuilders.fieldSort("end_date").setFormat("yyyy-MM-dd")) .setSize(2) .get(); @@ -244,8 +237,7 @@ public class SearchAfterIT extends ESIntegTestCase { assertThat(resp.getHits().getHits()[0].getSortValues(), arrayContaining("22/01/2015", "2022-07-23")); assertThat(resp.getHits().getHits()[1].getSortValues(), arrayContaining("21/02/2016", "2024-03-24")); - resp = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) + resp = prepareSearch("test").addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) .addSort(SortBuilders.fieldSort("end_date").setFormat("yyyy-MM-dd")) .searchAfter(new String[] { "21/02/2016", "2024-03-24" }) .setSize(2) @@ -254,8 +246,7 @@ public class SearchAfterIT extends ESIntegTestCase { assertThat(resp.getHits().getHits()[0].getSortValues(), arrayContaining("20/01/2017", "2025-05-28")); assertThat(resp.getHits().getHits()[1].getSortValues(), arrayContaining("23/04/2018", "2021-02-22")); - resp = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) + resp = prepareSearch("test").addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) .addSort(SortBuilders.fieldSort("end_date")) // it's okay because end_date has the format "yyyy-MM-dd" .searchAfter(new String[] { "21/02/2016", "2024-03-24" }) .setSize(2) @@ -264,15 +255,13 @@ public class SearchAfterIT extends ESIntegTestCase { assertThat(resp.getHits().getHits()[0].getSortValues(), arrayContaining("20/01/2017", 1748390400000L)); assertThat(resp.getHits().getHits()[1].getSortValues(), arrayContaining("23/04/2018", 1613952000000L)); - SearchRequestBuilder searchRequest = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) + SearchRequestBuilder searchRequest = prepareSearch("test").addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) .addSort(SortBuilders.fieldSort("end_date").setFormat("epoch_millis")) .searchAfter(new Object[] { "21/02/2016", 1748390400000L }) .setSize(2); assertNoFailures(searchRequest); - searchRequest = client().prepareSearch("test") - .addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) + searchRequest = prepareSearch("test").addSort(SortBuilders.fieldSort("start_date").setFormat("dd/MM/yyyy")) .addSort(SortBuilders.fieldSort("end_date").setFormat("epoch_millis")) // wrong format .searchAfter(new Object[] { "21/02/2016", "23/04/2018" }) .setSize(2); @@ -334,7 +323,7 @@ public class SearchAfterIT extends ESIntegTestCase { int offset = 0; Object[] sortValues = null; while (offset < documents.size()) { - SearchRequestBuilder req = client().prepareSearch(indexName); + SearchRequestBuilder req = prepareSearch(indexName); for (int i = 0; i < documents.get(0).size(); i++) { req.addSort("field" + Integer.toString(i), SortOrder.ASC); } @@ -441,8 +430,7 @@ public class SearchAfterIT extends ESIntegTestCase { Collections.sort(timestamps); // scroll with big index { - SearchResponse resp = client().prepareSearch("test") - .setSize(randomIntBetween(50, 100)) + SearchResponse resp = prepareSearch("test").setSize(randomIntBetween(50, 100)) .setQuery(new MatchAllQueryBuilder()) .addSort(new FieldSortBuilder("timestamp")) .setScroll(TimeValue.timeValueMinutes(5)) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java index 61bdeb0f6ade..45a64491de69 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java @@ -63,14 +63,11 @@ public class SimpleSearchIT extends ESIntegTestCase { } public void testSearchNullIndex() { - expectThrows( - NullPointerException.class, - () -> client().prepareSearch((String) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).get() - ); + expectThrows(NullPointerException.class, () -> prepareSearch((String) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).get()); expectThrows( NullPointerException.class, - () -> client().prepareSearch((String[]) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).get() + () -> prepareSearch((String[]) null).setQuery(QueryBuilders.termQuery("_id", "XXX1")).get() ); } @@ -192,35 +189,32 @@ public class SimpleSearchIT extends ESIntegTestCase { ensureGreen(); refresh(); assertHitCountAndNoFailures( - client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-03||+2d").lte("2010-01-04||+2d/d")), + prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-03||+2d").lte("2010-01-04||+2d/d")), 2L ); assertHitCountAndNoFailures( - client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-05T02:00").lte("2010-01-06T02:00")), + prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-05T02:00").lte("2010-01-06T02:00")), 2L ); assertHitCountAndNoFailures( - client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-05T02:00").lt("2010-01-06T02:00")), + prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("2010-01-05T02:00").lt("2010-01-06T02:00")), 1L ); assertHitCountAndNoFailures( - client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("2010-01-05T02:00").lt("2010-01-06T02:00")), + prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("2010-01-05T02:00").lt("2010-01-06T02:00")), 0L ); - assertHitCount( - client().prepareSearch("test").setQuery(QueryBuilders.queryStringQuery("field:[2010-01-03||+2d TO 2010-01-04||+2d/d]")), - 2L - ); + assertHitCount(prepareSearch("test").setQuery(QueryBuilders.queryStringQuery("field:[2010-01-03||+2d TO 2010-01-04||+2d/d]")), 2L); // a string value of "1000" should be parsed as the year 1000 and return all three docs - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("1000")), 3L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("1000")), 3L); // a numeric value of 1000 should be parsed as 1000 millis since epoch and return only docs after 1970 - SearchResponse searchResponse = client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt(1000)).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt(1000)).get(); assertNoFailures(searchResponse); assertHitCount(searchResponse, 2L); String[] expectedIds = new String[] { "1", "2" }; @@ -240,14 +234,14 @@ public class SimpleSearchIT extends ESIntegTestCase { ensureGreen(); refresh(); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("A").lte("B")), 2L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("A").lte("B")), 1L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("A").lt("B")), 1L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte(null).lt("C")), 3L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("B").lt(null)), 2L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt(null).lt(null)), 4L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("").lt(null)), 4L); - assertHitCountAndNoFailures(client().prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("").lt(null)), 3L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("A").lte("B")), 2L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("A").lte("B")), 1L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("A").lt("B")), 1L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte(null).lt("C")), 3L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("B").lt(null)), 2L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt(null).lt(null)), 4L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte("").lt(null)), 4L); + assertHitCountAndNoFailures(prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gt("").lt(null)), 3L); } public void testSimpleTerminateAfterCount() throws Exception { @@ -267,18 +261,12 @@ public class SimpleSearchIT extends ESIntegTestCase { SearchResponse searchResponse; for (int i = 1; i < max; i++) { - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("field").gte(1).lte(max)) - .setTerminateAfter(i) - .get(); + searchResponse = prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte(1).lte(max)).setTerminateAfter(i).get(); assertHitCount(searchResponse, i); assertTrue(searchResponse.isTerminatedEarly()); } - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.rangeQuery("field").gte(1).lte(max)) - .setTerminateAfter(2 * max) - .get(); + searchResponse = prepareSearch("test").setQuery(QueryBuilders.rangeQuery("field").gte(1).lte(max)).setTerminateAfter(2 * max).get(); assertHitCount(searchResponse, max); assertFalse(searchResponse.isTerminatedEarly()); @@ -301,8 +289,7 @@ public class SimpleSearchIT extends ESIntegTestCase { SearchResponse searchResponse; for (int i = 1; i < max; i++) { - searchResponse = client().prepareSearch("test") - .addDocValueField("rank") + searchResponse = prepareSearch("test").addDocValueField("rank") .setTrackTotalHits(false) .addSort("rank", SortOrder.ASC) .setSize(i) @@ -318,19 +305,18 @@ public class SimpleSearchIT extends ESIntegTestCase { createIndex("idx"); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertWindowFails(client().prepareSearch("idx").setFrom(Integer.MAX_VALUE)); - assertWindowFails(client().prepareSearch("idx").setSize(Integer.MAX_VALUE)); + assertWindowFails(prepareSearch("idx").setFrom(Integer.MAX_VALUE)); + assertWindowFails(prepareSearch("idx").setSize(Integer.MAX_VALUE)); } public void testTooLargeFromAndSize() throws Exception { createIndex("idx"); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertWindowFails(client().prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))); - assertWindowFails(client().prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1)); + assertWindowFails(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY))); + assertWindowFails(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1)); assertWindowFails( - client().prepareSearch("idx") - .setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) + prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) .setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) ); } @@ -339,11 +325,10 @@ public class SimpleSearchIT extends ESIntegTestCase { createIndex("idx"); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount(client().prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) - 10), 1); - assertHitCount(client().prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); + assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) - 10), 1); + assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); assertHitCount( - client().prepareSearch("idx") - .setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2) + prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2) .setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) / 2 - 1), 1 ); @@ -356,11 +341,10 @@ public class SimpleSearchIT extends ESIntegTestCase { ).get(); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount(client().prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); - assertHitCount(client().prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1); + assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); + assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1); assertHitCount( - client().prepareSearch("idx") - .setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) + prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) .setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1 ); @@ -375,11 +359,10 @@ public class SimpleSearchIT extends ESIntegTestCase { ); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount(client().prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); - assertHitCount(client().prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1); + assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1); + assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) + 1), 1); assertHitCount( - client().prepareSearch("idx") - .setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) + prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)) .setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY)), 1 ); @@ -389,11 +372,10 @@ public class SimpleSearchIT extends ESIntegTestCase { prepareCreate("idx").setSettings(Settings.builder().put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), Integer.MAX_VALUE)).get(); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount(client().prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1); - assertHitCount(client().prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1); + assertHitCount(prepareSearch("idx").setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1); + assertHitCount(prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1); assertHitCount( - client().prepareSearch("idx") - .setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10) + prepareSearch("idx").setSize(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10) .setFrom(IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 10), 1 ); @@ -413,10 +395,7 @@ public class SimpleSearchIT extends ESIntegTestCase { .get(); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount( - client().prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), - 1 - ); + assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } public void testTooLargeRescoreOkByResultWindowSetting() throws Exception { @@ -430,10 +409,7 @@ public class SimpleSearchIT extends ESIntegTestCase { ).get(); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount( - client().prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), - 1 - ); + assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } public void testTooLargeRescoreOkByDynamicSetting() throws Exception { @@ -442,10 +418,7 @@ public class SimpleSearchIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndexSettings.MAX_RESCORE_WINDOW_SETTING.getKey(), defaultMaxWindow * 2), "idx"); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount( - client().prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), - 1 - ); + assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } public void testTooLargeRescoreOkByDynamicResultWindowSetting() throws Exception { @@ -458,10 +431,7 @@ public class SimpleSearchIT extends ESIntegTestCase { ); indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); - assertHitCount( - client().prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), - 1 - ); + assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } public void testQueryNumericFieldWithRegex() throws Exception { @@ -469,7 +439,7 @@ public class SimpleSearchIT extends ESIntegTestCase { ensureGreen("idx"); try { - client().prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", "34")).get(); + prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", "34")).get(); fail("SearchPhaseExecutionException should have been thrown"); } catch (SearchPhaseExecutionException ex) { assertThat(ex.getRootCause().getMessage(), containsString("Can only use regexp queries on keyword and text fields")); @@ -490,7 +460,7 @@ public class SimpleSearchIT extends ESIntegTestCase { XContentParser parser = createParser(JsonXContent.jsonXContent, queryJson); parser.nextToken(); TermQueryBuilder query = TermQueryBuilder.fromXContent(parser); - SearchResponse searchResponse = client().prepareSearch("idx").setQuery(query).get(); + SearchResponse searchResponse = prepareSearch("idx").setQuery(query).get(); assertEquals(1, searchResponse.getHits().getTotalHits().value); } @@ -505,7 +475,7 @@ public class SimpleSearchIT extends ESIntegTestCase { } SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", regexp.toString())).get() + () -> prepareSearch("idx").setQuery(QueryBuilders.regexpQuery("num", regexp.toString())).get() ); assertThat( e.getRootCause().getMessage(), @@ -536,8 +506,7 @@ public class SimpleSearchIT extends ESIntegTestCase { } private void assertRescoreWindowFails(int windowSize) { - SearchRequestBuilder search = client().prepareSearch("idx") - .addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(windowSize)); + SearchRequestBuilder search = prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(windowSize)); SearchPhaseExecutionException e = expectThrows(SearchPhaseExecutionException.class, () -> search.get()); assertThat( e.toString(), 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 e32bc4e9b35a..a1e860ba848b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java @@ -92,16 +92,14 @@ public class SearchSliceIT extends ESIntegTestCase { for (String field : new String[] { "_id", "random_int", "static_int" }) { int fetchSize = randomIntBetween(10, 100); // test _doc sort - SearchRequestBuilder request = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchRequestBuilder request = prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .setSize(fetchSize) .addSort(SortBuilders.fieldSort("_doc")); assertSearchSlicesWithScroll(request, field, max, numDocs); // test numeric sort - request = client().prepareSearch("test") - .setQuery(matchAllQuery()) + request = prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .addSort(SortBuilders.fieldSort("random_int")) .setSize(fetchSize); @@ -114,12 +112,11 @@ public class SearchSliceIT extends ESIntegTestCase { int totalDocs = randomIntBetween(100, 1000); setupIndex(totalDocs, numShards); { - SearchResponse sr = client().prepareSearch("test").setQuery(matchAllQuery()).setPreference("_shards:1,4").setSize(0).get(); + SearchResponse sr = prepareSearch("test").setQuery(matchAllQuery()).setPreference("_shards:1,4").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("test") - .setQuery(matchAllQuery()) + SearchRequestBuilder request = prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .setSize(fetchSize) .setPreference("_shards:1,4") @@ -127,12 +124,11 @@ public class SearchSliceIT extends ESIntegTestCase { assertSearchSlicesWithScroll(request, "_id", max, numDocs); } { - SearchResponse sr = client().prepareSearch("test").setQuery(matchAllQuery()).setRouting("foo", "bar").setSize(0).get(); + SearchResponse sr = prepareSearch("test").setQuery(matchAllQuery()).setRouting("foo", "bar").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("test") - .setQuery(matchAllQuery()) + SearchRequestBuilder request = prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .setSize(fetchSize) .setRouting("foo", "bar") @@ -222,8 +218,7 @@ public class SearchSliceIT extends ESIntegTestCase { for (int id = 0; id < numSlice; id++) { int numSliceResults = 0; - SearchRequestBuilder request = client().prepareSearch("test") - .slice(new SliceBuilder(sliceField, id, numSlice)) + SearchRequestBuilder request = prepareSearch("test").slice(new SliceBuilder(sliceField, id, numSlice)) .setPointInTime(new PointInTimeBuilder(pointInTimeId)) .addSort(SortBuilders.fieldSort(sortField)) .setSize(randomIntBetween(10, 100)); @@ -257,8 +252,7 @@ public class SearchSliceIT extends ESIntegTestCase { setupIndex(0, 1); SearchPhaseExecutionException exc = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .setQuery(matchAllQuery()) + () -> prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .slice(new SliceBuilder("invalid_random_int", 0, 10)) .get() @@ -269,8 +263,7 @@ public class SearchSliceIT extends ESIntegTestCase { exc = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test") - .setQuery(matchAllQuery()) + () -> prepareSearch("test").setQuery(matchAllQuery()) .setScroll(new Scroll(TimeValue.timeValueSeconds(10))) .slice(new SliceBuilder("invalid_random_kw", 0, 10)) .get() 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 2adadc5e34fb..2d3af1f555d4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java @@ -280,8 +280,7 @@ public class FieldSortIT extends ESIntegTestCase { indexRandom(true, builders); { int size = between(1, denseBytes.size()); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .setSize(size) .addSort("dense_bytes", SortOrder.ASC) .get(); @@ -327,8 +326,7 @@ public class FieldSortIT extends ESIntegTestCase { client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", Integer.toString(i)).get(); } refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)) .get(); assertThat(searchResponse.getHits().getAt(0).getSortValues()[0].toString(), equalTo("1")); @@ -339,8 +337,7 @@ public class FieldSortIT extends ESIntegTestCase { client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); refresh(); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)) .get(); assertThat(searchResponse.getHits().getAt(0).getSortValues()[0].toString(), equalTo("1")); @@ -350,8 +347,7 @@ public class FieldSortIT extends ESIntegTestCase { // reindex - no refresh client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)) .get(); assertThat(searchResponse.getHits().getAt(0).getSortValues()[0].toString(), equalTo("1")); @@ -363,8 +359,7 @@ public class FieldSortIT extends ESIntegTestCase { refresh(); client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)) .get(); assertThat(searchResponse.getHits().getAt(0).getSortValues()[0].toString(), equalTo("1")); @@ -372,8 +367,7 @@ public class FieldSortIT extends ESIntegTestCase { assertThat(searchResponse.getHits().getAt(2).getSortValues()[0].toString(), equalTo("100")); refresh(); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)) .get(); assertThat(searchResponse.getHits().getAt(0).getSortValues()[0].toString(), equalTo("1")); @@ -391,29 +385,27 @@ public class FieldSortIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field"))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field")) + ).get(); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); assertThat(searchResponse.getHits().getAt(1).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(0).getScore())); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2")); assertThat(searchResponse.getHits().getAt(2).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(1).getScore())); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field"))) - .addSort("_score", SortOrder.DESC) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field")) + ).addSort("_score", SortOrder.DESC).get(); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); assertThat(searchResponse.getHits().getAt(1).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(0).getScore())); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2")); assertThat(searchResponse.getHits().getAt(2).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(1).getScore())); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); - searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field"))) - .addSort("_score", SortOrder.DESC) - .get(); + searchResponse = prepareSearch("test").setQuery( + QueryBuilders.functionScoreQuery(matchAllQuery(), ScoreFunctionBuilders.fieldValueFactorFunction("field")) + ).addSort("_score", SortOrder.DESC).get(); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2")); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); @@ -429,17 +421,16 @@ public class FieldSortIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field"))) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery( + functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field")) + ).get(); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); assertThat(searchResponse.getHits().getAt(1).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(0).getScore())); assertThat(searchResponse.getHits().getAt(1).getId(), equalTo("2")); assertThat(searchResponse.getHits().getAt(2).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(1).getScore())); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); - searchResponse = client().prepareSearch("test") - .setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field"))) + searchResponse = prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field"))) .addSort("_score", SortOrder.DESC) .get(); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("1")); @@ -448,8 +439,7 @@ public class FieldSortIT extends ESIntegTestCase { assertThat(searchResponse.getHits().getAt(2).getScore(), Matchers.lessThan(searchResponse.getHits().getAt(1).getScore())); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); - searchResponse = client().prepareSearch("test") - .setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field"))) + searchResponse = prepareSearch("test").setQuery(functionScoreQuery(matchAllQuery(), fieldValueFactorFunction("field"))) .addSort("_score", SortOrder.DESC) .get(); assertThat(searchResponse.getHits().getAt(2).getId(), equalTo("3")); @@ -464,11 +454,7 @@ public class FieldSortIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("{\"field1\":\"value2\"}", XContentType.JSON).get(); client().prepareIndex("test").setId("3").setSource("{\"field1\":\"value3\"}", XContentType.JSON).get(); refresh(); - SearchResponse result = client().prepareSearch("test") - .setQuery(matchAllQuery()) - .setTrackScores(true) - .addSort("field1", SortOrder.ASC) - .get(); + SearchResponse result = prepareSearch("test").setQuery(matchAllQuery()).setTrackScores(true).addSort("field1", SortOrder.ASC).get(); for (SearchHit hit : result.getHits()) { assertFalse(Float.isNaN(hit.getScore())); @@ -496,8 +482,7 @@ public class FieldSortIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("tag", "beta").get(); refresh(); - SearchResponse resp = client().prepareSearch("test") - .setSize(2) + SearchResponse resp = prepareSearch("test").setSize(2) .setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("tag").order(SortOrder.ASC)) .get(); @@ -506,8 +491,7 @@ public class FieldSortIT extends ESIntegTestCase { assertFirstHit(resp, hasId("1")); assertSecondHit(resp, hasId("2")); - resp = client().prepareSearch("test") - .setSize(2) + resp = prepareSearch("test").setSize(2) .setQuery(matchAllQuery()) .addSort(SortBuilders.fieldSort("tag").order(SortOrder.DESC)) .get(); @@ -949,24 +933,23 @@ public class FieldSortIT extends ESIntegTestCase { format = type.equals("date") ? "strict_date_optional_time" : "strict_date_optional_time_nanos"; } - SearchResponse searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.ASC).setFormat(format)) - .get(); + SearchResponse searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.ASC).setFormat(format) + ).get(); assertHitsInOrder(searchResponse, new String[] { "1", "2", "3" }); - searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.ASC).missing("_first").setFormat(format)) - .get(); + searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.ASC).missing("_first").setFormat(format) + ).get(); assertHitsInOrder(searchResponse, new String[] { "3", "1", "2" }); - searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.DESC).setFormat(format)) + searchResponse = prepareSearch(index).addSort(SortBuilders.fieldSort("mydate").order(SortOrder.DESC).setFormat(format)) .get(); assertHitsInOrder(searchResponse, new String[] { "2", "1", "3" }); - searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.DESC).missing("_first").setFormat(format)) - .get(); + searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.DESC).missing("_first").setFormat(format) + ).get(); assertHitsInOrder(searchResponse, new String[] { "3", "2", "1" }); } } @@ -1011,32 +994,24 @@ public class FieldSortIT extends ESIntegTestCase { } String index = "test*"; - SearchResponse searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.ASC).setFormat(format).setNumericType("date_nanos")) - .addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)) - .get(); + SearchResponse searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.ASC).setFormat(format).setNumericType("date_nanos") + ).addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)).get(); assertHitsInOrder(searchResponse, new String[] { "1", "2", "4", "5", "3", "6" }); - searchResponse = client().prepareSearch(index) - .addSort( - SortBuilders.fieldSort("mydate").order(SortOrder.ASC).missing("_first").setFormat(format).setNumericType("date_nanos") - ) - .addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)) - .get(); + searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.ASC).missing("_first").setFormat(format).setNumericType("date_nanos") + ).addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)).get(); assertHitsInOrder(searchResponse, new String[] { "3", "6", "1", "2", "4", "5" }); - searchResponse = client().prepareSearch(index) - .addSort(SortBuilders.fieldSort("mydate").order(SortOrder.DESC).setFormat(format).setNumericType("date_nanos")) - .addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)) - .get(); + searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.DESC).setFormat(format).setNumericType("date_nanos") + ).addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)).get(); assertHitsInOrder(searchResponse, new String[] { "5", "4", "2", "1", "3", "6" }); - searchResponse = client().prepareSearch(index) - .addSort( - SortBuilders.fieldSort("mydate").order(SortOrder.DESC).missing("_first").setFormat(format).setNumericType("date_nanos") - ) - .addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)) - .get(); + searchResponse = prepareSearch(index).addSort( + SortBuilders.fieldSort("mydate").order(SortOrder.DESC).missing("_first").setFormat(format).setNumericType("date_nanos") + ).addSort(SortBuilders.fieldSort("other_field").order(SortOrder.ASC)).get(); assertHitsInOrder(searchResponse, new String[] { "3", "6", "5", "4", "2", "1" }); } } @@ -1736,9 +1711,9 @@ public class FieldSortIT extends ESIntegTestCase { SortOrder order = randomBoolean() ? SortOrder.ASC : SortOrder.DESC; int from = between(0, 256); int size = between(0, 256); - SearchResponse multiShardResponse = client().prepareSearch("test1").setFrom(from).setSize(size).addSort(sortField, order).get(); + SearchResponse multiShardResponse = prepareSearch("test1").setFrom(from).setSize(size).addSort(sortField, order).get(); assertNoFailures(multiShardResponse); - SearchResponse singleShardResponse = client().prepareSearch("test2").setFrom(from).setSize(size).addSort(sortField, order).get(); + SearchResponse singleShardResponse = prepareSearch("test2").setFrom(from).setSize(size).addSort(sortField, order).get(); assertNoFailures(singleShardResponse); assertThat(multiShardResponse.getHits().getTotalHits().value, equalTo(singleShardResponse.getHits().getTotalHits().value)); @@ -1763,13 +1738,13 @@ public class FieldSortIT extends ESIntegTestCase { client().prepareIndex("test").setId("2").setSource("ip", "2001:db8::ff00:42:8329") ); - SearchResponse response = client().prepareSearch("test").addSort(SortBuilders.fieldSort("ip")).get(); + SearchResponse response = prepareSearch("test").addSort(SortBuilders.fieldSort("ip")).get(); assertNoFailures(response); assertEquals(2, response.getHits().getTotalHits().value); assertArrayEquals(new String[] { "192.168.1.7" }, response.getHits().getAt(0).getSortValues()); assertArrayEquals(new String[] { "2001:db8::ff00:42:8329" }, response.getHits().getAt(1).getSortValues()); - response = client().prepareSearch("test").addSort(SortBuilders.fieldSort("ip")).searchAfter(new Object[] { "192.168.1.7" }).get(); + response = prepareSearch("test").addSort(SortBuilders.fieldSort("ip")).searchAfter(new Object[] { "192.168.1.7" }).get(); assertNoFailures(response); assertEquals(2, response.getHits().getTotalHits().value); assertEquals(1, response.getHits().getHits().length); 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 49d5bebfdf4a..051852548638 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java @@ -148,8 +148,7 @@ public class GeoDistanceIT extends ESIntegTestCase { indicesAdmin().prepareRefresh().get(); // Order: Asc - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.ASC)) .get(); @@ -162,8 +161,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(2029.0d, 10d)); // Order: Asc, Mode: max - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.ASC).sortMode(SortMode.MAX)) .get(); @@ -176,8 +174,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(8572.0d, 10d)); // Order: Desc - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.DESC)) .get(); @@ -190,8 +187,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); // Order: Desc, Mode: min - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.DESC).sortMode(SortMode.MIN)) .get(); @@ -203,8 +199,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(421.2d, 10d)); assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).sortMode(SortMode.AVG).order(SortOrder.ASC)) .get(); @@ -216,8 +211,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(2874d, 10d)); assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(5301d, 10d)); - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).sortMode(SortMode.AVG).order(SortOrder.DESC)) .get(); @@ -230,8 +224,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(4).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); try { - client().prepareSearch("test") - .setQuery(matchAllQuery()) + prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).sortMode(SortMode.SUM)); fail("sum should not be supported for sorting by geo distance"); } catch (IllegalArgumentException e) { @@ -283,8 +276,7 @@ public class GeoDistanceIT extends ESIntegTestCase { refresh(); // Order: Asc - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.ASC)) .get(); @@ -294,8 +286,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(1).getSortValues()[0]).doubleValue(), equalTo(Double.POSITIVE_INFINITY)); // Order: Desc - searchResponse = client().prepareSearch("test") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("test").setQuery(matchAllQuery()) .addSort(SortBuilders.geoDistanceSort("locations", 40.7143528, -74.0059731).order(SortOrder.DESC)) .get(); @@ -425,8 +416,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ); // Order: Asc - SearchResponse searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .order(SortOrder.ASC) @@ -442,8 +432,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(2029.0d, 10d)); // Order: Asc, Mode: max - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .order(SortOrder.ASC) @@ -460,8 +449,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(8572.0d, 10d)); // Order: Desc - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .order(SortOrder.DESC) @@ -477,8 +465,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); // Order: Desc, Mode: min - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .order(SortOrder.DESC) @@ -494,8 +481,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).doubleValue(), closeTo(462.1d, 10d)); assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .sortMode(SortMode.AVG) @@ -511,8 +497,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).doubleValue(), closeTo(2874.0d, 10d)); assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(5301.0d, 10d)); - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .setNestedSort(new NestedSortBuilder("branches")) @@ -528,8 +513,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(2).getSortValues()[0]).doubleValue(), closeTo(1157.0d, 10d)); assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), closeTo(0d, 10d)); - searchResponse = client().prepareSearch("companies") - .setQuery(matchAllQuery()) + searchResponse = prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .setNestedSort(new NestedSortBuilder("branches").setFilter(termQuery("branches.name", "brooklyn"))) @@ -546,8 +530,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertThat(((Number) searchResponse.getHits().getAt(3).getSortValues()[0]).doubleValue(), equalTo(Double.POSITIVE_INFINITY)); try { - client().prepareSearch("companies") - .setQuery(matchAllQuery()) + prepareSearch("companies").setQuery(matchAllQuery()) .addSort( SortBuilders.geoDistanceSort("branches.location", 40.7143528, -74.0059731) .sortMode(SortMode.SUM) @@ -584,8 +567,7 @@ public class GeoDistanceIT extends ESIntegTestCase { client().prepareGet("locations", "1").get(); assertHitCount( - client().prepareSearch("locations") - .setQuery(QueryBuilders.matchAllQuery()) + prepareSearch("locations").setQuery(QueryBuilders.matchAllQuery()) .setPostFilter(QueryBuilders.geoDistanceQuery("pin").geoDistance(GeoDistance.ARC).point(lat, lon).distance("1m")), 1 ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java index 710905cf3302..1860082c833a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java @@ -34,12 +34,12 @@ public class MetadataFetchingIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field", "value").get(); refresh(); - SearchResponse response = client().prepareSearch("test").storedFields("_none_").setFetchSource(false).setVersion(true).get(); + SearchResponse response = prepareSearch("test").storedFields("_none_").setFetchSource(false).setVersion(true).get(); assertThat(response.getHits().getAt(0).getId(), nullValue()); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); assertThat(response.getHits().getAt(0).getVersion(), notNullValue()); - response = client().prepareSearch("test").storedFields("_none_").get(); + response = prepareSearch("test").storedFields("_none_").get(); assertThat(response.getHits().getAt(0).getId(), nullValue()); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); } @@ -50,8 +50,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field", "value", "nested", Collections.singletonMap("title", "foo")).get(); refresh(); - SearchResponse response = client().prepareSearch("test") - .storedFields("_none_") + SearchResponse response = prepareSearch("test").storedFields("_none_") .setFetchSource(false) .setQuery( new NestedQueryBuilder("nested", new TermQueryBuilder("nested.title", "foo"), ScoreMode.Total).innerHit( @@ -77,12 +76,12 @@ public class MetadataFetchingIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field", "value").setRouting("toto").get(); refresh(); - SearchResponse response = client().prepareSearch("test").storedFields("_none_").setFetchSource(false).get(); + SearchResponse response = prepareSearch("test").storedFields("_none_").setFetchSource(false).get(); assertThat(response.getHits().getAt(0).getId(), nullValue()); assertThat(response.getHits().getAt(0).field("_routing"), nullValue()); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); - response = client().prepareSearch("test").storedFields("_none_").get(); + response = prepareSearch("test").storedFields("_none_").get(); assertThat(response.getHits().getAt(0).getId(), nullValue()); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); } @@ -97,7 +96,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { { SearchPhaseExecutionException exc = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test").setFetchSource(true).storedFields("_none_").get() + () -> prepareSearch("test").setFetchSource(true).storedFields("_none_").get() ); Throwable rootCause = ExceptionsHelper.unwrap(exc, SearchException.class); assertNotNull(rootCause); @@ -107,7 +106,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { { SearchPhaseExecutionException exc = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch("test").storedFields("_none_").addFetchField("field").get() + () -> prepareSearch("test").storedFields("_none_").addFetchField("field").get() ); Throwable rootCause = ExceptionsHelper.unwrap(exc, SearchException.class); assertNotNull(rootCause); @@ -117,14 +116,14 @@ public class MetadataFetchingIT extends ESIntegTestCase { { IllegalArgumentException exc = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("test").storedFields("_none_", "field1").setVersion(true).get() + () -> prepareSearch("test").storedFields("_none_", "field1").setVersion(true).get() ); assertThat(exc.getMessage(), equalTo("cannot combine _none_ with other fields")); } { IllegalArgumentException exc = expectThrows( IllegalArgumentException.class, - () -> client().prepareSearch("test").storedFields("_none_").storedFields("field1").setVersion(true).get() + () -> prepareSearch("test").storedFields("_none_").storedFields("field1").setVersion(true).get() ); assertThat(exc.getMessage(), equalTo("cannot combine _none_ with other fields")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java index ac6c1a7c2d55..3fcbc5cf4add 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java @@ -23,13 +23,13 @@ public class SourceFetchingIT extends ESIntegTestCase { indexDoc("test", "1", "field", "value"); refresh(); - SearchResponse response = client().prepareSearch("test").get(); + SearchResponse response = prepareSearch("test").get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); - response = client().prepareSearch("test").addStoredField("bla").get(); + response = prepareSearch("test").addStoredField("bla").get(); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); - response = client().prepareSearch("test").addStoredField("_source").get(); + response = prepareSearch("test").addStoredField("_source").get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); } @@ -41,22 +41,22 @@ public class SourceFetchingIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field1", "value", "field2", "value2").get(); refresh(); - SearchResponse response = client().prepareSearch("test").setFetchSource(false).get(); + SearchResponse response = prepareSearch("test").setFetchSource(false).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), nullValue()); - response = client().prepareSearch("test").setFetchSource(true).get(); + response = prepareSearch("test").setFetchSource(true).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); - response = client().prepareSearch("test").setFetchSource("field1", null).get(); + response = prepareSearch("test").setFetchSource("field1", null).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat((String) response.getHits().getAt(0).getSourceAsMap().get("field1"), equalTo("value")); - response = client().prepareSearch("test").setFetchSource("hello", null).get(); + response = prepareSearch("test").setFetchSource("hello", null).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(0)); - response = client().prepareSearch("test").setFetchSource(new String[] { "*" }, new String[] { "field2" }).get(); + response = prepareSearch("test").setFetchSource(new String[] { "*" }, new String[] { "field2" }).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat((String) response.getHits().getAt(0).getSourceAsMap().get("field1"), equalTo("value")); @@ -74,12 +74,12 @@ public class SourceFetchingIT extends ESIntegTestCase { client().prepareIndex("test").setId("1").setSource("field", "value").get(); refresh(); - SearchResponse response = client().prepareSearch("test").setFetchSource(new String[] { "*.notexisting", "field" }, null).get(); + SearchResponse response = prepareSearch("test").setFetchSource(new String[] { "*.notexisting", "field" }, null).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat((String) response.getHits().getAt(0).getSourceAsMap().get("field"), equalTo("value")); - response = client().prepareSearch("test").setFetchSource(new String[] { "field.notexisting.*", "field" }, null).get(); + response = prepareSearch("test").setFetchSource(new String[] { "field.notexisting.*", "field" }, null).get(); assertThat(response.getHits().getAt(0).getSourceAsString(), notNullValue()); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat((String) response.getHits().getAt(0).getSourceAsMap().get("field"), equalTo("value")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java index 93a2000cda7a..c782b01742a6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java @@ -159,19 +159,17 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder noText = SuggestBuilders.completionSuggestion(FIELD); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", noText).setGlobalText("sugg")) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", noText).setGlobalText("sugg") + ).get(); assertSuggestions(searchResponse, "foo", "suggestion10", "suggestion9", "suggestion8", "suggestion7", "suggestion6"); CompletionSuggestionBuilder withText = SuggestBuilders.completionSuggestion(FIELD).text("sugg"); - searchResponse = client().prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", withText)).get(); + searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", withText)).get(); assertSuggestions(searchResponse, "foo", "suggestion10", "suggestion9", "suggestion8", "suggestion7", "suggestion6"); // test that suggestion text takes precedence over global text - searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", withText).setGlobalText("bogus")) - .get(); + searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", withText).setGlobalText("bogus")).get(); assertSuggestions(searchResponse, "foo", "suggestion10", "suggestion9", "suggestion8", "suggestion7", "suggestion6"); } @@ -280,7 +278,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg").size(numDocs); - SearchResponse searchResponse = client().prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", prefix)).get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", prefix)).get(); CompletionSuggestion completionSuggestion = searchResponse.getSuggest().getSuggestion("foo"); CompletionSuggestion.Entry options = completionSuggestion.getEntries().get(0); assertThat(options.getOptions().size(), equalTo(numDocs)); @@ -316,8 +314,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg").size(numDocs); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", prefix)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", prefix)) .setFetchSource(false) .get(); CompletionSuggestion completionSuggestion = searchResponse.getSuggest().getSuggestion("foo"); @@ -357,8 +354,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg").size(numDocs); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", prefix)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", prefix)) .setFetchSource("a", "b") .get(); CompletionSuggestion completionSuggestion = searchResponse.getSuggest().getSuggestion("foo"); @@ -385,8 +381,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { createIndexAndMapping(mapping); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("v"); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", prefix)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", prefix)) .setFetchSource("a", "b") .get(); Suggest suggest = searchResponse.getSuggest(); @@ -466,9 +461,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("testSuggestions", new CompletionSuggestionBuilder(FIELD).text("test").size(10))) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("testSuggestions", new CompletionSuggestionBuilder(FIELD).text("test").size(10)) + ).get(); assertSuggestions(searchResponse, "testSuggestions", "testing"); Suggest.Suggestion.Entry.Option option = searchResponse.getSuggest() @@ -696,11 +691,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .get(); assertThat(putMappingResponse.isAcknowledged(), is(true)); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion("suggs", SuggestBuilders.completionSuggestion(FIELD + ".suggest").text("f").size(10)) - ) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("suggs", SuggestBuilders.completionSuggestion(FIELD + ".suggest").text("f").size(10)) + ).get(); assertSuggestions(searchResponse, "suggs"); client().prepareIndex(INDEX) @@ -710,11 +703,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .get(); ensureGreen(INDEX); - SearchResponse afterReindexingResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion("suggs", SuggestBuilders.completionSuggestion(FIELD + ".suggest").text("f").size(10)) - ) - .get(); + SearchResponse afterReindexingResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("suggs", SuggestBuilders.completionSuggestion(FIELD + ".suggest").text("f").size(10)) + ).get(); assertSuggestions(afterReindexingResponse, "suggs", "Foo Fighters"); } @@ -730,19 +721,14 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Nirv").size(10))) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Nirv").size(10)) + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); - searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD).prefix("Nirw", Fuzziness.ONE).size(10) - ) - ) - .get(); + searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Nirw", Fuzziness.ONE).size(10)) + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); } @@ -759,25 +745,15 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); // edit distance 1 - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD).prefix("Norw", Fuzziness.ONE).size(10) - ) - ) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Norw", Fuzziness.ONE).size(10)) + ).get(); assertSuggestions(searchResponse, false, "foo"); // edit distance 2 - searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD).prefix("Norw", Fuzziness.TWO).size(10) - ) - ) - .get(); + searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Norw", Fuzziness.TWO).size(10)) + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); } @@ -793,26 +769,17 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD) - .prefix("Nriv", FuzzyOptions.builder().setTranspositions(false).build()) - .size(10) - ) + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion( + "foo", + SuggestBuilders.completionSuggestion(FIELD).prefix("Nriv", FuzzyOptions.builder().setTranspositions(false).build()).size(10) ) - .get(); + ).get(); assertSuggestions(searchResponse, false, "foo"); - searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD).prefix("Nriv", Fuzziness.ONE).size(10) - ) - ) - .get(); + searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("Nriv", Fuzziness.ONE).size(10)) + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); } @@ -828,28 +795,20 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD) - .prefix("Nriva", FuzzyOptions.builder().setFuzzyMinLength(6).build()) - .size(10) - ) + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion( + "foo", + SuggestBuilders.completionSuggestion(FIELD).prefix("Nriva", FuzzyOptions.builder().setFuzzyMinLength(6).build()).size(10) ) - .get(); + ).get(); assertSuggestions(searchResponse, false, "foo"); - searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD) - .prefix("Nrivan", FuzzyOptions.builder().setFuzzyMinLength(6).build()) - .size(10) - ) + searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion( + "foo", + SuggestBuilders.completionSuggestion(FIELD).prefix("Nrivan", FuzzyOptions.builder().setFuzzyMinLength(6).build()).size(10) ) - .get(); + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); } @@ -865,28 +824,20 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD) - .prefix("Nirw", FuzzyOptions.builder().setFuzzyPrefixLength(4).build()) - .size(10) - ) + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion( + "foo", + SuggestBuilders.completionSuggestion(FIELD).prefix("Nirw", FuzzyOptions.builder().setFuzzyPrefixLength(4).build()).size(10) ) - .get(); + ).get(); assertSuggestions(searchResponse, false, "foo"); - searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion( - "foo", - SuggestBuilders.completionSuggestion(FIELD) - .prefix("Nirvo", FuzzyOptions.builder().setFuzzyPrefixLength(4).build()) - .size(10) - ) + searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion( + "foo", + SuggestBuilders.completionSuggestion(FIELD).prefix("Nirvo", FuzzyOptions.builder().setFuzzyPrefixLength(4).build()).size(10) ) - .get(); + ).get(); assertSuggestions(searchResponse, false, "foo", "Nirvana"); } @@ -906,8 +857,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .prefix("öööи", FuzzyOptions.builder().setUnicodeAware(true).build()) .size(10); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)) .get(); assertSuggestions(searchResponse, false, "foo", "ööööö"); @@ -915,18 +865,14 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { completionSuggestionBuilder = SuggestBuilders.completionSuggestion(FIELD) .prefix("öööи", FuzzyOptions.builder().setUnicodeAware(false).build()) .size(10); - searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)) - .get(); + searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)).get(); assertSuggestions(searchResponse, false, "foo"); // increasing edit distance instead of unicode awareness works again, as this is only a single character completionSuggestionBuilder = SuggestBuilders.completionSuggestion(FIELD) .prefix("öööи", FuzzyOptions.builder().setUnicodeAware(false).setFuzziness(Fuzziness.TWO).build()) .size(10); - searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)) - .get(); + searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", completionSuggestionBuilder)).get(); assertSuggestions(searchResponse, false, "foo", "ööööö"); } @@ -967,12 +913,11 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); ensureGreen(); // load the fst index into ram - client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("f"))) - .get(); - client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(otherField).prefix("f"))) + prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(FIELD).prefix("f"))) .get(); + prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("foo", SuggestBuilders.completionSuggestion(otherField).prefix("f")) + ).get(); // Get all stats IndicesStatsResponse indicesStatsResponse = indicesAdmin().prepareStats(INDEX).setIndices(INDEX).setCompletion(true).get(); @@ -1020,7 +965,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch(INDEX).addSort(new FieldSortBuilder(FIELD)).get() + () -> prepareSearch(INDEX).addSort(new FieldSortBuilder(FIELD)).get() ); assertThat(e.status().getStatus(), is(400)); assertThat(e.toString(), containsString("Fielddata is not supported on field [" + FIELD + "] of type [completion]")); @@ -1143,15 +1088,14 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .skipDuplicates(true) .size(numUnique); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion("suggestions", completionSuggestionBuilder)) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion("suggestions", completionSuggestionBuilder) + ).get(); assertSuggestions(searchResponse, true, "suggestions", expected); } public void assertSuggestions(String suggestionName, SuggestionBuilder suggestBuilder, String... suggestions) { - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion(suggestionName, suggestBuilder)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion(suggestionName, suggestBuilder)) .get(); assertSuggestions(searchResponse, suggestionName, suggestions); } @@ -1164,11 +1108,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void assertSuggestionsNotInOrder(String suggestString, String... suggestions) { String suggestionName = RandomStrings.randomAsciiLettersOfLength(random(), 10); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest( - new SuggestBuilder().addSuggestion(suggestionName, SuggestBuilders.completionSuggestion(FIELD).text(suggestString).size(10)) - ) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest( + new SuggestBuilder().addSuggestion(suggestionName, SuggestBuilders.completionSuggestion(FIELD).text(suggestString).size(10)) + ).get(); assertSuggestions(searchResponse, false, suggestionName, suggestions); } @@ -1309,7 +1251,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { refresh(); assertSuggestions("b"); - assertThat(2L, equalTo(client().prepareSearch(INDEX).setSize(0).get().getHits().getTotalHits().value)); + assertThat(2L, equalTo(prepareSearch(INDEX).setSize(0).get().getHits().getTotalHits().value)); for (IndexShardSegments seg : indicesAdmin().prepareSegments().get().getIndices().get(INDEX)) { ShardSegments[] shards = seg.shards(); for (ShardSegments shardSegments : shards) { @@ -1411,11 +1353,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch(INDEX) - .addAggregation( - AggregationBuilders.terms("suggest_agg").field(FIELD).collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get() + () -> prepareSearch(INDEX).addAggregation( + AggregationBuilders.terms("suggest_agg").field(FIELD).collectMode(randomFrom(SubAggCollectionMode.values())) + ).get() ); assertThat(e.toString(), containsString("Fielddata is not supported on field [" + FIELD + "] of type [completion]")); } @@ -1492,8 +1432,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD).prefix("sugg"); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .setExplain(true) + SearchResponse searchResponse = prepareSearch(INDEX).setExplain(true) .suggest(new SuggestBuilder().addSuggestion("foo", prefix)) .get(); assertSuggestions(searchResponse, "foo", "suggestion10", "suggestion9", "suggestion8", "suggestion7", "suggestion6"); @@ -1528,8 +1467,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { indicesAdmin().prepareRefresh(index).get(); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(suggestField).prefix("sug").size(1); - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse searchResponse = prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()) .setFrom(1) .setSize(1) .setCollapse(new CollapseBuilder("collapse_field")) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java index 7b2ba7cb4677..ea4c21cc06fe 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java @@ -619,9 +619,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { Collections.singletonList(GeoQueryContext.builder().setGeoPoint(new GeoPoint(52.52, 13.4)).build()) ) ); - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion(suggestionName, context)) - .get(); + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion(suggestionName, context)).get(); assertEquals(searchResponse.getSuggest().size(), 1); assertEquals( @@ -671,8 +669,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { } public void assertSuggestions(String suggestionName, SuggestionBuilder suggestBuilder, String... suggestions) { - SearchResponse searchResponse = client().prepareSearch(INDEX) - .suggest(new SuggestBuilder().addSuggestion(suggestionName, suggestBuilder)) + SearchResponse searchResponse = prepareSearch(INDEX).suggest(new SuggestBuilder().addSuggestion(suggestionName, suggestBuilder)) .get(); CompletionSuggestSearchIT.assertSuggestions(searchResponse, suggestionName, suggestions); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java index 96a2fe69732d..d68301a31072 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/ConcurrentSnapshotsIT.java @@ -941,7 +941,7 @@ public class ConcurrentSnapshotsIT extends AbstractSnapshotIntegTestCase { indexDoc(testIndex, Integer.toString(i), "foo", "bar" + i); } refresh(); - assertThat(client().prepareSearch(testIndex).setSize(0).get().getHits().getTotalHits().value, equalTo(100L)); + assertThat(prepareSearch(testIndex).setSize(0).get().getHits().getTotalHits().value, equalTo(100L)); logger.info("--> start relocations"); allowNodes(testIndex, 1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index 8a617a1243ac..7f5cacdfc935 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -1615,7 +1615,7 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas assertThat(restoreSnapshotResponse.getRestoreInfo().successfulShards(), equalTo(snapshotInfo.successfulShards())); ensureGreen("test-idx-1", "test-idx-2"); - assertHitCount(client().prepareSearch("test-idx-*").setSize(0), 3); + assertHitCount(prepareSearch("test-idx-*").setSize(0), 3); } /** @@ -1684,7 +1684,7 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas ensureGreen(); for (Map.Entry entry : nbDocsPerIndex.entrySet()) { if (isRestorableIndex.test(entry.getKey())) { - assertHitCount(client().prepareSearch(entry.getKey()).setSize(0), entry.getValue().longValue()); + assertHitCount(prepareSearch(entry.getKey()).setSize(0), entry.getValue().longValue()); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java b/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java index d319eab2b192..d6dad537afae 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java @@ -63,8 +63,8 @@ public class SimpleThreadPoolIT extends ESIntegTestCase { indexRandom(true, builders); int numSearches = randomIntBetween(2, 100); for (int i = 0; i < numSearches; i++) { - assertNoFailures(client().prepareSearch("idx").setQuery(QueryBuilders.termQuery("str_value", "s" + i))); - assertNoFailures(client().prepareSearch("idx").setQuery(QueryBuilders.termQuery("l_value", i))); + assertNoFailures(prepareSearch("idx").setQuery(QueryBuilders.termQuery("str_value", "s" + i))); + assertNoFailures(prepareSearch("idx").setQuery(QueryBuilders.termQuery("l_value", i))); } Set threadNames = new HashSet<>(); for (long l : threadBean.getAllThreadIds()) { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java index 8b7731c6b350..f5912872e004 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java @@ -78,11 +78,11 @@ public abstract class ShardSizeTestCase extends ESIntegTestCase { indexRandom(true, docs); - SearchResponse resp = client().prepareSearch("idx").setRouting(routing1).setQuery(matchAllQuery()).get(); + SearchResponse resp = prepareSearch("idx").setRouting(routing1).setQuery(matchAllQuery()).get(); assertNoFailures(resp); long totalOnOne = resp.getHits().getTotalHits().value; assertThat(totalOnOne, is(15L)); - resp = client().prepareSearch("idx").setRouting(routing2).setQuery(matchAllQuery()).get(); + resp = prepareSearch("idx").setRouting(routing2).setQuery(matchAllQuery()).get(); assertNoFailures(resp); long totalOnTwo = resp.getHits().getTotalHits().value; assertThat(totalOnTwo, is(12L)); diff --git a/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java index 9ef137cefeeb..57fe0bfe3a9e 100644 --- a/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java +++ b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java @@ -27,6 +27,7 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.search.aggregations.AggregationBuilders.significantTerms; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.ESIntegTestCase.client; +import static org.elasticsearch.test.ESIntegTestCase.prepareSearch; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; @@ -47,10 +48,9 @@ public class SharedSignificantTermsTestMethods { } private static void checkSignificantTermsAggregationCorrect(ESIntegTestCase testCase) { - SearchResponse response = client().prepareSearch(INDEX_NAME) - .addAggregation(terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD))) - .execute() - .actionGet(); + SearchResponse response = prepareSearch(INDEX_NAME).addAggregation( + terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD)) + ).execute().actionGet(); assertNoFailures(response); StringTerms classes = response.getAggregations().get("class"); Assert.assertThat(classes.getBuckets().size(), equalTo(2)); diff --git a/test/external-modules/seek-tracking-directory/src/internalClusterTest/java/org/elasticsearch/test/seektracker/SeekTrackerPluginIT.java b/test/external-modules/seek-tracking-directory/src/internalClusterTest/java/org/elasticsearch/test/seektracker/SeekTrackerPluginIT.java index 784730efff99..d9c239905f34 100644 --- a/test/external-modules/seek-tracking-directory/src/internalClusterTest/java/org/elasticsearch/test/seektracker/SeekTrackerPluginIT.java +++ b/test/external-modules/seek-tracking-directory/src/internalClusterTest/java/org/elasticsearch/test/seektracker/SeekTrackerPluginIT.java @@ -45,7 +45,7 @@ public class SeekTrackerPluginIT extends ESIntegTestCase { } indexRandom(true, docs); - client().prepareSearch("index").setQuery(QueryBuilders.termQuery("field", "term2")).get(); + prepareSearch("index").setQuery(QueryBuilders.termQuery("field", "term2")).get(); SeekStatsResponse response = client().execute(SeekTrackerPlugin.SEEK_STATS_ACTION, new SeekStatsRequest("index")).actionGet(); List shardSeekStats = response.getSeekStats().get("index"); diff --git a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java index 4a9a7cba2abe..40da3fb0432d 100644 --- a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java @@ -139,7 +139,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase assertFalse(stateResponse.getState().getRoutingNodes().node(blueNodeId).isEmpty()); - assertHitCount(client().prepareSearch(indexName), numDocs); + assertHitCount(prepareSearch(indexName), numDocs); logger.info("--> will temporarily interrupt recovery action between blue & red on [{}]", recoveryActionToBlock); @@ -241,7 +241,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase assertFalse(stateResponse.getState().getRoutingNodes().node(blueNodeId).isEmpty()); - assertHitCount(client().prepareSearch(indexName), numDocs); + assertHitCount(prepareSearch(indexName), numDocs); final boolean dropRequests = randomBoolean(); logger.info("--> will {} between blue & red on [{}]", dropRequests ? "drop requests" : "break connection", recoveryActionToBlock); @@ -342,7 +342,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase } indexRandom(true, requests); ensureSearchable(indexName); - assertHitCount(client().prepareSearch(indexName), numDocs); + assertHitCount(prepareSearch(indexName), numDocs); if (useSnapshotBasedRecoveries) { createSnapshotThatCanBeUsedDuringRecovery(indexName); @@ -457,7 +457,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase } for (int i = 0; i < 10; i++) { - assertHitCount(client().prepareSearch(indexName), numDocs); + assertHitCount(prepareSearch(indexName), numDocs); } } diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java index 61be2eb43361..cfff900e372f 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java @@ -295,7 +295,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase docCounts[i] = iterations(10, 1000); logger.info("--> create random index {} with {} records", indexNames[i], docCounts[i]); addRandomDocuments(indexNames[i], docCounts[i]); - assertHitCount(client().prepareSearch(indexNames[i]).setSize(0), docCounts[i]); + assertHitCount(prepareSearch(indexNames[i]).setSize(0), docCounts[i]); } final String snapshotName = randomName(); @@ -319,7 +319,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase logger.info("--> add random documents to {}", index); addRandomDocuments(index, randomIntBetween(10, 1000)); } else { - int docCount = (int) client().prepareSearch(index).setSize(0).get().getHits().getTotalHits().value; + int docCount = (int) prepareSearch(index).setSize(0).get().getHits().getTotalHits().value; int deleteCount = randomIntBetween(1, docCount); logger.info("--> delete {} random documents from {}", deleteCount, index); for (int i = 0; i < deleteCount; i++) { @@ -348,7 +348,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase ensureGreen(TimeValue.timeValueSeconds(120)); for (int i = 0; i < indexCount; i++) { - assertHitCount(client().prepareSearch(indexNames[i]).setSize(0), docCounts[i]); + assertHitCount(prepareSearch(indexNames[i]).setSize(0), docCounts[i]); } logger.info("--> delete snapshot {}:{}", repoName, snapshotName); @@ -392,7 +392,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase addRandomDocuments(indexName, docCount); } // Check number of documents in this iteration - docCounts[i] = (int) client().prepareSearch(indexName).setSize(0).get().getHits().getTotalHits().value; + docCounts[i] = (int) prepareSearch(indexName).setSize(0).get().getHits().getTotalHits().value; logger.info("--> create snapshot {}:{} with {} documents", repoName, snapshotName + "-" + i, docCounts[i]); assertSuccessfulSnapshot( clusterAdmin().prepareCreateSnapshot(repoName, snapshotName + "-" + i).setWaitForCompletion(true).setIndices(indexName) @@ -415,7 +415,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase ); ensureGreen(); - assertHitCount(client().prepareSearch(indexName).setSize(0), docCounts[iterationToRestore]); + assertHitCount(prepareSearch(indexName).setSize(0), docCounts[iterationToRestore]); } for (int i = 0; i < iterationCount; i++) { diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESFsBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESFsBasedRepositoryIntegTestCase.java index c51869d5b079..8e94b3fa41fc 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESFsBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESFsBasedRepositoryIntegTestCase.java @@ -46,7 +46,7 @@ public abstract class ESFsBasedRepositoryIntegTestCase extends ESBlobStoreReposi int docCount = iterations(10, 1000); logger.info("--> create random index {} with {} records", indexName, docCount); addRandomDocuments(indexName, docCount); - assertHitCount(client().prepareSearch(indexName).setSize(0), docCount); + assertHitCount(prepareSearch(indexName).setSize(0), docCount); final String snapshotName = randomName(); logger.info("--> create snapshot {}:{}", repoName, snapshotName); diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index a5bed4f75a7b..1e66dd061d9b 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -166,7 +166,7 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreR flushAndRefresh(index); ForceMergeResponse forceMerge = client().admin().indices().prepareForceMerge(index).setFlush(true).setMaxNumSegments(1).get(); assertThat(forceMerge.getSuccessfulShards(), equalTo(1)); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); final String snapshot = "snapshot"; assertSuccessfulSnapshot(clusterAdmin().prepareCreateSnapshot(repository, snapshot).setWaitForCompletion(true).setIndices(index)); @@ -175,7 +175,7 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreR assertSuccessfulRestore(clusterAdmin().prepareRestoreSnapshot(repository, snapshot).setWaitForCompletion(true)); ensureGreen(index); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); assertAcked(clusterAdmin().prepareDeleteSnapshot(repository, snapshot).get()); } @@ -193,7 +193,7 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreR flushAndRefresh(index); ForceMergeResponse forceMerge = client().admin().indices().prepareForceMerge(index).setFlush(true).setMaxNumSegments(1).get(); assertThat(forceMerge.getSuccessfulShards(), equalTo(1)); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); final String snapshot = "snapshot"; assertSuccessfulSnapshot(clusterAdmin().prepareCreateSnapshot(repository, snapshot).setWaitForCompletion(true).setIndices(index)); @@ -202,7 +202,7 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreR assertSuccessfulRestore(clusterAdmin().prepareRestoreSnapshot(repository, snapshot).setWaitForCompletion(true)); ensureGreen(index); - assertHitCount(client().prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); + assertHitCount(prepareSearch(index).setSize(0).setTrackTotalHits(true), nbDocs); assertAcked(clusterAdmin().prepareDeleteSnapshot(repository, snapshot).get()); diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTestCase.java index 9bfe15cb7f0b..ea94f342a953 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTestCase.java @@ -33,14 +33,12 @@ public abstract class AbstractTermsTestCase extends ESIntegTestCase { public void testOtherDocCount(String... fieldNames) { for (String fieldName : fieldNames) { - SearchResponse allTerms = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(fieldName) - .size(10000) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse allTerms = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(fieldName) + .size(10000) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(allTerms); Terms terms = allTerms.getAggregations().get("terms"); @@ -50,15 +48,13 @@ public abstract class AbstractTermsTestCase extends ESIntegTestCase { for (int size = 1; size < totalNumTerms + 2; size += randomIntBetween(1, 5)) { for (int shardSize = size; shardSize <= totalNumTerms + 2; shardSize += randomIntBetween(1, 5)) { - SearchResponse resp = client().prepareSearch("idx") - .addAggregation( - new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) - .field(fieldName) - .size(size) - .shardSize(shardSize) - .collectMode(randomFrom(SubAggCollectionMode.values())) - ) - .get(); + SearchResponse resp = prepareSearch("idx").addAggregation( + new TermsAggregationBuilder("terms").executionHint(randomExecutionHint()) + .field(fieldName) + .size(size) + .shardSize(shardSize) + .collectMode(randomFrom(SubAggCollectionMode.values())) + ).get(); assertNoFailures(resp); terms = resp.getAggregations().get("terms"); assertEquals(Math.min(size, totalNumTerms), terms.getBuckets().size()); diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java index 571e269bf532..7b4e591051e6 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java @@ -229,8 +229,7 @@ public abstract class AbstractGeoTestCase extends ESIntegTestCase { // value for NUMBER_FIELD_NAME. This will check that after random indexing each document only has 1 value for // NUMBER_FIELD_NAME and it is the correct value. Following this initial change its seems that this call was getting // more that 2000 hits (actual value was 2059) so now it will also check to ensure all hits have the correct index and type. - SearchResponse response = client().prepareSearch(HIGH_CARD_IDX_NAME) - .addStoredField(NUMBER_FIELD_NAME) + SearchResponse response = prepareSearch(HIGH_CARD_IDX_NAME).addStoredField(NUMBER_FIELD_NAME) .addSort(SortBuilders.fieldSort(NUMBER_FIELD_NAME).order(SortOrder.ASC)) .setSize(5000) .get(); 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 5af696fb644d..45ec7c00bd44 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 @@ -34,8 +34,7 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase { protected abstract ValuesSourceAggregationBuilder centroidAgg(String name); public void testEmptyAggregation() { - SearchResponse response = client().prepareSearch(EMPTY_IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch(EMPTY_IDX_NAME).setQuery(matchAllQuery()) .addAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) .get(); assertNoFailures(response); @@ -49,8 +48,7 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase { } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch(UNMAPPED_IDX_NAME) - .addAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) + SearchResponse response = prepareSearch(UNMAPPED_IDX_NAME).addAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) .get(); assertNoFailures(response); @@ -75,8 +73,7 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase { } public void testSingleValuedField() { - SearchResponse response = client().prepareSearch(IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch(IDX_NAME).setQuery(matchAllQuery()) .addAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME)) .get(); assertNoFailures(response); @@ -89,8 +86,7 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase { } public void testSingleValueFieldGetProperty() { - SearchResponse response = client().prepareSearch(IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse response = prepareSearch(IDX_NAME).setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(centroidAgg(aggName()).field(SINGLE_VALUED_FIELD_NAME))) .get(); assertNoFailures(response); @@ -116,8 +112,7 @@ public abstract class CentroidAggregationTestBase extends AbstractGeoTestCase { } public void testMultiValuedField() throws Exception { - SearchResponse searchResponse = client().prepareSearch(IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch(IDX_NAME).setQuery(matchAllQuery()) .addAggregation(centroidAgg(aggName()).field(MULTI_VALUED_FIELD_NAME)) .get(); assertNoFailures(searchResponse); 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 1b318eb4952c..f63401d34b62 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 @@ -39,7 +39,7 @@ public abstract class SpatialBoundsAggregationTestBase e protected abstract void assertBoundsLimits(SpatialBounds spatialBounds); public void testSingleValuedField() throws Exception { - SearchResponse response = client().prepareSearch(IDX_NAME).addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)).get(); + SearchResponse response = prepareSearch(IDX_NAME).addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)).get(); assertNoFailures(response); @@ -55,8 +55,7 @@ public abstract class SpatialBoundsAggregationTestBase e } public void testSingleValuedField_getProperty() { - SearchResponse searchResponse = client().prepareSearch(IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch(IDX_NAME).setQuery(matchAllQuery()) .addAggregation(global("global").subAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME))) .get(); @@ -98,7 +97,7 @@ public abstract class SpatialBoundsAggregationTestBase e } public void testMultiValuedField() throws Exception { - SearchResponse response = client().prepareSearch(IDX_NAME).addAggregation(boundsAgg(aggName(), MULTI_VALUED_FIELD_NAME)).get(); + SearchResponse response = prepareSearch(IDX_NAME).addAggregation(boundsAgg(aggName(), MULTI_VALUED_FIELD_NAME)).get(); assertNoFailures(response); @@ -114,9 +113,7 @@ public abstract class SpatialBoundsAggregationTestBase e } public void testUnmapped() throws Exception { - SearchResponse response = client().prepareSearch(UNMAPPED_IDX_NAME) - .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)) - .get(); + SearchResponse response = prepareSearch(UNMAPPED_IDX_NAME).addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)).get(); assertNoFailures(response); @@ -148,8 +145,7 @@ public abstract class SpatialBoundsAggregationTestBase e } public void testEmptyAggregation() throws Exception { - SearchResponse searchResponse = client().prepareSearch(EMPTY_IDX_NAME) - .setQuery(matchAllQuery()) + SearchResponse searchResponse = prepareSearch(EMPTY_IDX_NAME).setQuery(matchAllQuery()) .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)) .get(); @@ -167,9 +163,9 @@ public abstract class SpatialBoundsAggregationTestBase e * This test forces the bounds {@link MetricsAggregator} to resize the {@link BigArray}s it uses to ensure they are resized correctly */ public void testSingleValuedFieldAsSubAggToHighCardTermsAgg() { - SearchResponse response = client().prepareSearch(HIGH_CARD_IDX_NAME) - .addAggregation(terms("terms").field(NUMBER_FIELD_NAME).subAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME))) - .get(); + SearchResponse response = prepareSearch(HIGH_CARD_IDX_NAME).addAggregation( + terms("terms").field(NUMBER_FIELD_NAME).subAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)) + ).get(); assertNoFailures(response); @@ -190,9 +186,7 @@ public abstract class SpatialBoundsAggregationTestBase e } public void testSingleValuedFieldWithZeroLon() { - SearchResponse response = client().prepareSearch(IDX_ZERO_NAME) - .addAggregation(boundsAgg(aggName(), SINGLE_VALUED_FIELD_NAME)) - .get(); + SearchResponse response = prepareSearch(IDX_ZERO_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 3e9d840cb7ed..6aa245d429e5 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 @@ -184,7 +184,7 @@ public abstract class BaseShapeIntegTestCase= numDocs) { try { - long count = client().prepareSearch() - .setTrackTotalHits(true) + long count = prepareSearch().setTrackTotalHits(true) .setSize(0) .setQuery(matchAllQuery()) .get() @@ -1095,6 +1095,10 @@ public abstract class ESIntegTestCase extends ESTestCase { }, maxWaitTimeMs, TimeUnit.MILLISECONDS); } + public static SearchRequestBuilder prepareSearch(String... indices) { + return client().prepareSearch(indices); + } + /** * Retrieves the persistent tasks with the requested task name from the given cluster state. */ diff --git a/x-pack/plugin/analytics/src/internalClusterTest/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsWithRequestBreakerIT.java b/x-pack/plugin/analytics/src/internalClusterTest/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsWithRequestBreakerIT.java index 714892558d42..f8b276dbbf6a 100644 --- a/x-pack/plugin/analytics/src/internalClusterTest/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsWithRequestBreakerIT.java +++ b/x-pack/plugin/analytics/src/internalClusterTest/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsWithRequestBreakerIT.java @@ -55,16 +55,14 @@ public class MultiTermsWithRequestBreakerIT extends ESIntegTestCase { ); try { - client().prepareSearch("test") - .addAggregation( - new MultiTermsAggregationBuilder("xxx").terms( - List.of( - new MultiValuesSourceFieldConfig.Builder().setFieldName("field0.keyword").build(), - new MultiValuesSourceFieldConfig.Builder().setFieldName("field1.keyword").build() - ) + prepareSearch("test").addAggregation( + new MultiTermsAggregationBuilder("xxx").terms( + List.of( + new MultiValuesSourceFieldConfig.Builder().setFieldName("field0.keyword").build(), + new MultiValuesSourceFieldConfig.Builder().setFieldName("field1.keyword").build() ) ) - .get(); + ).get(); } catch (ElasticsearchException e) { if (ExceptionsHelper.unwrap(e, CircuitBreakingException.class) == null) { throw e; diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java index d17637a3fd5a..02f61498fa93 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/snapshots/sourceonly/SourceOnlySnapshotIT.java @@ -116,15 +116,12 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { assertHits(sourceIdx, builders.length, sourceHadDeletions); assertMappings(sourceIdx, requireRouting, useNested); SearchPhaseExecutionException e = expectThrows(SearchPhaseExecutionException.class, () -> { - client().prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))).get(); + prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))).get(); }); assertTrue(e.toString().contains("_source only indices can't be searched or filtered")); // can-match phase pre-filters access to non-existing field - assertEquals( - 0, - client().prepareSearch(sourceIdx).setQuery(QueryBuilders.termQuery("field1", "bar")).get().getHits().getTotalHits().value - ); + assertEquals(0, prepareSearch(sourceIdx).setQuery(QueryBuilders.termQuery("field1", "bar")).get().getHits().getTotalHits().value); // make sure deletes do not work String idToDelete = "" + randomIntBetween(0, builders.length); expectThrows(ClusterBlockException.class, () -> client().prepareDelete(sourceIdx, idToDelete).setRouting("r" + idToDelete).get()); @@ -144,16 +141,11 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { assertMappings(sourceIdx, requireRouting, true); SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, - () -> client().prepareSearch(sourceIdx) - .setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))) - .get() + () -> prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("" + randomIntBetween(0, builders.length))).get() ); assertTrue(e.toString().contains("_source only indices can't be searched or filtered")); // can-match phase pre-filters access to non-existing field - assertEquals( - 0, - client().prepareSearch(sourceIdx).setQuery(QueryBuilders.termQuery("field1", "bar")).get().getHits().getTotalHits().value - ); + assertEquals(0, prepareSearch(sourceIdx).setQuery(QueryBuilders.termQuery("field1", "bar")).get().getHits().getTotalHits().value); // make sure deletes do not work String idToDelete = "" + randomIntBetween(0, builders.length); expectThrows(ClusterBlockException.class, () -> client().prepareDelete(sourceIdx, idToDelete).setRouting("r" + idToDelete).get()); @@ -259,10 +251,7 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { } private void assertHits(String index, int numDocsExpected, boolean sourceHadDeletions) { - SearchResponse searchResponse = client().prepareSearch(index) - .addSort(SeqNoFieldMapper.NAME, SortOrder.ASC) - .setSize(numDocsExpected) - .get(); + SearchResponse searchResponse = prepareSearch(index).addSort(SeqNoFieldMapper.NAME, SortOrder.ASC).setSize(numDocsExpected).get(); BiConsumer assertConsumer = (res, allowHoles) -> { SearchHits hits = res.getHits(); long i = 0; @@ -283,8 +272,7 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { }; assertConsumer.accept(searchResponse, sourceHadDeletions); assertEquals(numDocsExpected, searchResponse.getHits().getTotalHits().value); - searchResponse = client().prepareSearch(index) - .addSort(SeqNoFieldMapper.NAME, SortOrder.ASC) + searchResponse = prepareSearch(index).addSort(SeqNoFieldMapper.NAME, SortOrder.ASC) .setScroll("1m") .slice(new SliceBuilder(SeqNoFieldMapper.NAME, randomIntBetween(0, 1), 2)) .setSize(randomIntBetween(1, 10)) @@ -348,7 +336,7 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { } indexRandom(true, builders); flushAndRefresh(); - assertHitCount(client().prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("0")), 1); + assertHitCount(prepareSearch(sourceIdx).setQuery(QueryBuilders.idsQuery().addIds("0")), 1); createSnapshot(repo, snapshot, Collections.singletonList(sourceIdx)); diff --git a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongTests.java b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongTests.java index 727441f5dba1..d86f09045606 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongTests.java +++ b/x-pack/plugin/mapper-unsigned-long/src/test/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongTests.java @@ -99,8 +99,7 @@ public class UnsignedLongTests extends ESIntegTestCase { for (String index : new String[] { "idx", "idx-sort" }) { // asc sort { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .get(); @@ -114,8 +113,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // desc sort { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.DESC) .get(); @@ -129,8 +127,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // asc sort with search_after as Long { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .searchAfter(new Long[] { 100L }) @@ -145,8 +142,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // asc sort with search_after as BigInteger { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .searchAfter(new BigInteger[] { new BigInteger("18446744073709551614") }) @@ -161,8 +157,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // asc sort with search_after as BigInteger in String format { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .searchAfter(new String[] { "18446744073709551614" }) @@ -177,8 +172,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // asc sort with search_after of negative value should fail { - SearchRequestBuilder srb = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchRequestBuilder srb = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .searchAfter(new Long[] { -1L }); @@ -187,8 +181,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // asc sort with search_after of value>=2^64 should fail { - SearchRequestBuilder srb = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchRequestBuilder srb = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.ASC) .searchAfter(new BigInteger[] { new BigInteger("18446744073709551616") }); @@ -197,8 +190,7 @@ public class UnsignedLongTests extends ESIntegTestCase { } // desc sort with search_after as BigInteger { - SearchResponse response = client().prepareSearch(index) - .setQuery(QueryBuilders.matchAllQuery()) + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()) .setSize(numDocs) .addSort("ul_field", SortOrder.DESC) .searchAfter(new BigInteger[] { new BigInteger("18446744073709551615") }) @@ -217,7 +209,7 @@ public class UnsignedLongTests extends ESIntegTestCase { public void testAggs() { // terms agg { - SearchResponse response = client().prepareSearch("idx").setSize(0).addAggregation(terms("ul_terms").field("ul_field")).get(); + SearchResponse response = prepareSearch("idx").setSize(0).addAggregation(terms("ul_terms").field("ul_field")).get(); assertNoFailures(response); Terms terms = response.getAggregations().get("ul_terms"); @@ -240,8 +232,7 @@ public class UnsignedLongTests extends ESIntegTestCase { // histogram agg { - SearchResponse response = client().prepareSearch("idx") - .setSize(0) + SearchResponse response = prepareSearch("idx").setSize(0) .addAggregation(histogram("ul_histo").field("ul_field").interval(9E18).minDocCount(0)) .get(); assertNoFailures(response); @@ -259,8 +250,7 @@ public class UnsignedLongTests extends ESIntegTestCase { // range agg { - SearchResponse response = client().prepareSearch("idx") - .setSize(0) + SearchResponse response = prepareSearch("idx").setSize(0) .addAggregation( range("ul_range").field("ul_field").addUnboundedTo(9.0E18).addRange(9.0E18, 1.8E19).addUnboundedFrom(1.8E19) ) @@ -280,7 +270,7 @@ public class UnsignedLongTests extends ESIntegTestCase { // sum agg { - SearchResponse response = client().prepareSearch("idx").setSize(0).addAggregation(sum("ul_sum").field("ul_field")).get(); + SearchResponse response = prepareSearch("idx").setSize(0).addAggregation(sum("ul_sum").field("ul_field")).get(); assertNoFailures(response); Sum sum = response.getAggregations().get("ul_sum"); double expectedSum = Arrays.stream(values).mapToDouble(Number::doubleValue).sum(); @@ -288,14 +278,14 @@ public class UnsignedLongTests extends ESIntegTestCase { } // max agg { - SearchResponse response = client().prepareSearch("idx").setSize(0).addAggregation(max("ul_max").field("ul_field")).get(); + SearchResponse response = prepareSearch("idx").setSize(0).addAggregation(max("ul_max").field("ul_field")).get(); assertNoFailures(response); Max max = response.getAggregations().get("ul_max"); assertEquals(1.8446744073709551615E19, max.value(), 0.001); } // min agg { - SearchResponse response = client().prepareSearch("idx").setSize(0).addAggregation(min("ul_min").field("ul_field")).get(); + SearchResponse response = prepareSearch("idx").setSize(0).addAggregation(min("ul_min").field("ul_field")).get(); assertNoFailures(response); Min min = response.getAggregations().get("ul_min"); assertEquals(0, min.value(), 0.001); @@ -318,17 +308,15 @@ public class UnsignedLongTests extends ESIntegTestCase { } public void testRangeQuery() { - SearchResponse response = client().prepareSearch("idx") - .setSize(0) + SearchResponse response = prepareSearch("idx").setSize(0) .setQuery(new RangeQueryBuilder("ul_field").to("9.0E18").includeUpper(false)) .get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); - response = client().prepareSearch("idx") - .setSize(0) + response = prepareSearch("idx").setSize(0) .setQuery(new RangeQueryBuilder("ul_field").from("9.0E18").to("1.8E19").includeUpper(false)) .get(); assertThat(response.getHits().getTotalHits().value, equalTo(3L)); - response = client().prepareSearch("idx").setSize(0).setQuery(new RangeQueryBuilder("ul_field").from("1.8E19")).get(); + response = prepareSearch("idx").setSize(0).setQuery(new RangeQueryBuilder("ul_field").from("1.8E19")).get(); assertThat(response.getHits().getTotalHits().value, equalTo(4L)); } } diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/CategorizationIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/CategorizationIT.java index a2fa26914e08..f0b23b087537 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/CategorizationIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/CategorizationIT.java @@ -303,9 +303,9 @@ public class CategorizationIT extends MlNativeAutodetectIntegTestCase { // before closing the job to prove that it was persisted in the background at the // end of lookback rather than when the job was closed. assertBusy(() -> { - SearchResponse stateDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setQuery(QueryBuilders.idsQuery().addIds(CategorizerState.documentId(job.getId(), 1))) - .get(); + SearchResponse stateDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery( + QueryBuilders.idsQuery().addIds(CategorizerState.documentId(job.getId(), 1)) + ).get(); SearchHit[] hits = stateDocsResponse.getHits().getHits(); assertThat(hits, arrayWithSize(1)); @@ -554,14 +554,11 @@ public class CategorizationIT extends MlNativeAutodetectIntegTestCase { private List getCategorizerStats(String jobId) throws IOException { - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)) - .setQuery( - QueryBuilders.boolQuery() - .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), CategorizerStats.RESULT_TYPE_VALUE)) - .filter(QueryBuilders.termQuery(Job.ID.getPreferredName(), jobId)) - ) - .setSize(1000) - .get(); + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)).setQuery( + QueryBuilders.boolQuery() + .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), CategorizerStats.RESULT_TYPE_VALUE)) + .filter(QueryBuilders.termQuery(Job.ID.getPreferredName(), jobId)) + ).setSize(1000).get(); List stats = new ArrayList<>(); for (SearchHit hit : searchResponse.getHits().getHits()) { diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationHousePricingIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationHousePricingIT.java index ee15832d6848..610a492ef078 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationHousePricingIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationHousePricingIT.java @@ -1566,7 +1566,7 @@ public class ClassificationHousePricingIT extends MlNativeDataFrameAnalyticsInte waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); // obtain addition information for investigation of #90599 String modelId = getModelId(jobId); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java index 3ddb05fd0218..0b1edd0f3553 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationIT.java @@ -145,7 +145,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -210,7 +210,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -259,7 +259,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -348,7 +348,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -425,7 +425,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { int trainingRowsCount = 0; int nonTrainingRowsCount = 0; client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -569,7 +569,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); @@ -840,7 +840,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { // Now calling the _delete_expired_data API should remove unused state assertThat(deleteExpiredData().isDeleted(), is(true)); - SearchResponse stateIndexSearchResponse = client().prepareSearch(".ml-state*").execute().actionGet(); + SearchResponse stateIndexSearchResponse = prepareSearch(".ml-state*").execute().actionGet(); assertThat(stateIndexSearchResponse.getHits().getTotalHits().value, equalTo(0L)); } @@ -928,7 +928,7 @@ public class ClassificationIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse destData = client().prepareSearch(destIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse destData = prepareSearch(destIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : destData.getHits()) { Map destDoc = hit.getSourceAsMap(); Map resultsObject = getFieldValue(destDoc, "ml"); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DataFrameAnalysisCustomFeatureIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DataFrameAnalysisCustomFeatureIT.java index 91d302c381f5..153f3aa46c35 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DataFrameAnalysisCustomFeatureIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DataFrameAnalysisCustomFeatureIT.java @@ -134,7 +134,7 @@ public class DataFrameAnalysisCustomFeatureIT extends MlNativeDataFrameAnalytics waitUntilAnalyticsIsStopped(jobId); client().admin().indices().refresh(new RefreshRequest(destIndex)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getFieldValue(destDoc, "ml"); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedWithAggsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedWithAggsIT.java index dab0bb54a676..9773a4d3b3d8 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedWithAggsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedWithAggsIT.java @@ -164,21 +164,14 @@ public class DatafeedWithAggsIT extends MlNativeAutodetectIntegTestCase { ); // Confirm that it's possible to search for the same buckets by @timestamp - proves that @timestamp works as a field alias assertThat( - client().prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)) - .setQuery( - QueryBuilders.boolQuery() - .filter(QueryBuilders.termQuery("job_id", jobId)) - .filter(QueryBuilders.termQuery("result_type", "bucket")) - .filter( - QueryBuilders.rangeQuery("@timestamp") - .gte(bucket.getTimestamp().getTime()) - .lte(bucket.getTimestamp().getTime()) - ) - ) - .setTrackTotalHits(true) - .get() - .getHits() - .getTotalHits().value, + prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)).setQuery( + QueryBuilders.boolQuery() + .filter(QueryBuilders.termQuery("job_id", jobId)) + .filter(QueryBuilders.termQuery("result_type", "bucket")) + .filter( + QueryBuilders.rangeQuery("@timestamp").gte(bucket.getTimestamp().getTime()).lte(bucket.getTimestamp().getTime()) + ) + ).setTrackTotalHits(true).get().getHits().getTotalHits().value, equalTo(1L) ); } diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java index 15026a719590..0bdf68cdbb5a 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DeleteExpiredDataIT.java @@ -268,14 +268,12 @@ public class DeleteExpiredDataIT extends MlNativeAutodetectIntegTestCase { retainAllSnapshots("snapshots-retention-with-retain"); - long totalModelSizeStatsBeforeDelete = client().prepareSearch("*") - .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN) + long totalModelSizeStatsBeforeDelete = prepareSearch("*").setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN) .setQuery(QueryBuilders.termQuery("result_type", "model_size_stats")) .get() .getHits() .getTotalHits().value; - long totalNotificationsCountBeforeDelete = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .get() + long totalNotificationsCountBeforeDelete = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).get() .getHits() .getTotalHits().value; assertThat(totalModelSizeStatsBeforeDelete, greaterThan(0L)); @@ -321,14 +319,12 @@ public class DeleteExpiredDataIT extends MlNativeAutodetectIntegTestCase { assertThat(getRecords("results-and-snapshots-retention").size(), equalTo(0)); assertThat(getModelSnapshots("results-and-snapshots-retention").size(), equalTo(1)); - long totalModelSizeStatsAfterDelete = client().prepareSearch("*") - .setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN) + long totalModelSizeStatsAfterDelete = prepareSearch("*").setIndicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN) .setQuery(QueryBuilders.termQuery("result_type", "model_size_stats")) .get() .getHits() .getTotalHits().value; - long totalNotificationsCountAfterDelete = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .get() + long totalNotificationsCountAfterDelete = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).get() .getHits() .getTotalHits().value; assertThat(totalModelSizeStatsAfterDelete, equalTo(totalModelSizeStatsBeforeDelete)); @@ -347,8 +343,7 @@ public class DeleteExpiredDataIT extends MlNativeAutodetectIntegTestCase { } // Verify .ml-state doesn't contain unused state documents - SearchResponse stateDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setFetchSource(false) + SearchResponse stateDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setFetchSource(false) .setTrackTotalHits(true) .setSize(10000) .get(); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DetectionRulesIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DetectionRulesIT.java index a8825ea46774..079443f5cf42 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DetectionRulesIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DetectionRulesIT.java @@ -186,8 +186,7 @@ public class DetectionRulesIT extends MlNativeAutodetectIntegTestCase { // Wait until the notification that the filter was updated is indexed assertBusy(() -> { - SearchResponse searchResponse = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .setSize(1) + SearchResponse searchResponse = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).setSize(1) .addSort("timestamp", SortOrder.DESC) .setQuery( QueryBuilders.boolQuery() diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InterimResultsDeletedAfterReopeningJobIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InterimResultsDeletedAfterReopeningJobIT.java index 4cc4811c5bfe..2a76fffc5559 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InterimResultsDeletedAfterReopeningJobIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InterimResultsDeletedAfterReopeningJobIT.java @@ -108,7 +108,7 @@ public class InterimResultsDeletedAfterReopeningJobIT extends MlNativeAutodetect private void assertNoInterimResults(String jobId) { String indexName = AnomalyDetectorsIndex.jobResultsAliasedName(jobId); - SearchResponse search = client().prepareSearch(indexName).setSize(1000).setQuery(QueryBuilders.termQuery("is_interim", true)).get(); + SearchResponse search = prepareSearch(indexName).setSize(1000).setQuery(QueryBuilders.termQuery("is_interim", true)).get(); assertThat(search.getHits().getTotalHits().value, equalTo(0L)); } } diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeAutodetectIntegTestCase.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeAutodetectIntegTestCase.java index 5218dafc1af1..c57a983c2c61 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeAutodetectIntegTestCase.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeAutodetectIntegTestCase.java @@ -286,9 +286,9 @@ abstract class MlNativeAutodetectIntegTestCase extends MlNativeIntegTestCase { } protected ForecastRequestStats getForecastStats(String jobId, String forecastId) { - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)) - .setQuery(QueryBuilders.idsQuery().addIds(ForecastRequestStats.documentId(jobId, forecastId))) - .get(); + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)).setQuery( + QueryBuilders.idsQuery().addIds(ForecastRequestStats.documentId(jobId, forecastId)) + ).get(); if (searchResponse.getHits().getHits().length == 0) { return null; @@ -313,8 +313,7 @@ abstract class MlNativeAutodetectIntegTestCase extends MlNativeIntegTestCase { protected List getForecastStats() { List forecastStats = new ArrayList<>(); - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*") - .setSize(1000) + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*").setSize(1000) .setQuery( QueryBuilders.boolQuery() .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), ForecastRequestStats.RESULT_TYPE_VALUE)) @@ -339,22 +338,20 @@ abstract class MlNativeAutodetectIntegTestCase extends MlNativeIntegTestCase { } protected long countForecastDocs(String jobId, String forecastId) { - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*") - .setQuery( - QueryBuilders.boolQuery() - .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), Forecast.RESULT_TYPE_VALUE)) - .filter(QueryBuilders.termQuery(Job.ID.getPreferredName(), jobId)) - .filter(QueryBuilders.termQuery(Forecast.FORECAST_ID.getPreferredName(), forecastId)) - ) - .execute() - .actionGet(); + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*").setQuery( + QueryBuilders.boolQuery() + .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), Forecast.RESULT_TYPE_VALUE)) + .filter(QueryBuilders.termQuery(Job.ID.getPreferredName(), jobId)) + .filter(QueryBuilders.termQuery(Forecast.FORECAST_ID.getPreferredName(), forecastId)) + ).execute().actionGet(); return searchResponse.getHits().getTotalHits().value; } protected List getForecasts(String jobId, ForecastRequestStats forecastRequestStats) { List forecasts = new ArrayList<>(); - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*") - .setSize((int) forecastRequestStats.getRecordCount()) + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsIndexPrefix() + "*").setSize( + (int) forecastRequestStats.getRecordCount() + ) .setQuery( QueryBuilders.boolQuery() .filter(QueryBuilders.termQuery(Result.RESULT_TYPE.getPreferredName(), Forecast.RESULT_TYPE_VALUE)) diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java index 3894c46e7a81..628400120bd4 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/MlNativeDataFrameAnalyticsIntegTestCase.java @@ -248,7 +248,7 @@ abstract class MlNativeDataFrameAnalyticsIntegTestCase extends MlNativeIntegTest protected SearchResponse searchStoredProgress(String jobId) { String docId = StoredProgress.documentId(jobId); - return client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery(QueryBuilders.idsQuery().addIds(docId)).get(); + return prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery(QueryBuilders.idsQuery().addIds(docId)).get(); } protected void assertExactlyOneInferenceModelPersisted(String jobId) { @@ -260,9 +260,9 @@ abstract class MlNativeDataFrameAnalyticsIntegTestCase extends MlNativeIntegTest } private void assertInferenceModelPersisted(String jobId, Matcher modelHitsArraySizeMatcher) { - SearchResponse searchResponse = client().prepareSearch(InferenceIndexConstants.LATEST_INDEX_NAME) - .setQuery(QueryBuilders.boolQuery().filter(QueryBuilders.termQuery(TrainedModelConfig.TAGS.getPreferredName(), jobId))) - .get(); + SearchResponse searchResponse = prepareSearch(InferenceIndexConstants.LATEST_INDEX_NAME).setQuery( + QueryBuilders.boolQuery().filter(QueryBuilders.termQuery(TrainedModelConfig.TAGS.getPreferredName(), jobId)) + ).get(); // If the job is stopped during writing_results phase and it is then restarted, there is a chance two trained models // were persisted as there is no way currently for the process to be certain the model was persisted. assertThat( @@ -294,23 +294,20 @@ abstract class MlNativeDataFrameAnalyticsIntegTestCase extends MlNativeIntegTest } protected String getModelId(String jobId) { - SearchResponse searchResponse = client().prepareSearch(InferenceIndexConstants.LATEST_INDEX_NAME) - .setQuery(QueryBuilders.boolQuery().filter(QueryBuilders.termQuery(TrainedModelConfig.TAGS.getPreferredName(), jobId))) - .get(); + SearchResponse searchResponse = prepareSearch(InferenceIndexConstants.LATEST_INDEX_NAME).setQuery( + QueryBuilders.boolQuery().filter(QueryBuilders.termQuery(TrainedModelConfig.TAGS.getPreferredName(), jobId)) + ).get(); assertThat(searchResponse.getHits().getHits(), arrayWithSize(1)); return searchResponse.getHits().getHits()[0].getId(); } protected TrainedModelMetadata getModelMetadata(String modelId) { - SearchResponse response = client().prepareSearch(InferenceIndexConstants.INDEX_PATTERN) - .setQuery( - QueryBuilders.boolQuery() - .filter(QueryBuilders.termQuery("model_id", modelId)) - .filter(QueryBuilders.termQuery(InferenceIndexConstants.DOC_TYPE.getPreferredName(), TrainedModelMetadata.NAME)) - ) - .setSize(1) - .get(); + SearchResponse response = prepareSearch(InferenceIndexConstants.INDEX_PATTERN).setQuery( + QueryBuilders.boolQuery() + .filter(QueryBuilders.termQuery("model_id", modelId)) + .filter(QueryBuilders.termQuery(InferenceIndexConstants.DOC_TYPE.getPreferredName(), TrainedModelMetadata.NAME)) + ).setSize(1).get(); assertThat(response.getHits().getHits(), arrayWithSize(1)); try ( @@ -364,7 +361,7 @@ abstract class MlNativeDataFrameAnalyticsIntegTestCase extends MlNativeIntegTest protected static Set getTrainingRowsIds(String index) { Set trainingRowsIds = new HashSet<>(); - SearchResponse hits = client().prepareSearch(index).setSize(10000).get(); + SearchResponse hits = prepareSearch(index).setSize(10000).get(); for (SearchHit hit : hits.getHits()) { Map sourceAsMap = hit.getSourceAsMap(); assertThat(sourceAsMap.containsKey("ml"), is(true)); @@ -381,9 +378,9 @@ abstract class MlNativeDataFrameAnalyticsIntegTestCase extends MlNativeIntegTest } protected static void assertModelStatePersisted(String stateDocId) { - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setQuery(QueryBuilders.idsQuery().addIds(stateDocId)) - .get(); + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery( + QueryBuilders.idsQuery().addIds(stateDocId) + ).get(); assertThat("Hits were: " + Strings.toString(searchResponse.getHits()), searchResponse.getHits().getHits(), is(arrayWithSize(1))); } diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelPlotsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelPlotsIT.java index 36d5c71f399a..d2fa397ab5d6 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelPlotsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ModelPlotsIT.java @@ -159,10 +159,9 @@ public class ModelPlotsIT extends MlNativeAutodetectIntegTestCase { } private Set modelPlotTerms(String jobId, String fieldName) { - SearchResponse searchResponse = client().prepareSearch(".ml-anomalies-" + jobId) - .setQuery(QueryBuilders.termQuery("result_type", "model_plot")) - .addAggregation(AggregationBuilders.terms("model_plot_terms").field(fieldName)) - .get(); + SearchResponse searchResponse = prepareSearch(".ml-anomalies-" + jobId).setQuery( + QueryBuilders.termQuery("result_type", "model_plot") + ).addAggregation(AggregationBuilders.terms("model_plot_terms").field(fieldName)).get(); Terms aggregation = searchResponse.getAggregations().get("model_plot_terms"); return aggregation.getBuckets().stream().map(agg -> agg.getKeyAsString()).collect(Collectors.toSet()); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/OutlierDetectionWithMissingFieldsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/OutlierDetectionWithMissingFieldsIT.java index 2265ad8e934c..4433193e306f 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/OutlierDetectionWithMissingFieldsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/OutlierDetectionWithMissingFieldsIT.java @@ -89,7 +89,7 @@ public class OutlierDetectionWithMissingFieldsIT extends MlNativeDataFrameAnalyt assertThat(stats.getDataCounts().getTestDocsCount(), equalTo(0L)); assertThat(stats.getDataCounts().getSkippedDocsCount(), equalTo(2L)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); for (SearchHit hit : sourceData.getHits()) { GetResponse destDocGetResponse = client().prepareGet().setIndex(config.getDest().getIndex()).setId(hit.getId()).get(); assertThat(destDocGetResponse.isExists(), is(true)); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/PersistJobIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/PersistJobIT.java index 57702d205a31..ad0d9135ebb9 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/PersistJobIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/PersistJobIT.java @@ -64,8 +64,7 @@ public class PersistJobIT extends MlNativeAutodetectIntegTestCase { long job1CloseTime = System.currentTimeMillis() / 1000; // Check that state has been persisted - SearchResponse stateDocsResponse1 = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setFetchSource(false) + SearchResponse stateDocsResponse1 = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setFetchSource(false) .setTrackTotalHits(true) .setSize(10000) .get(); @@ -104,8 +103,7 @@ public class PersistJobIT extends MlNativeAutodetectIntegTestCase { closeJob(jobId); // Check that a new state record exists. - SearchResponse stateDocsResponse2 = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setFetchSource(false) + SearchResponse stateDocsResponse2 = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setFetchSource(false) .setTrackTotalHits(true) .setSize(10000) .get(); @@ -143,8 +141,7 @@ public class PersistJobIT extends MlNativeAutodetectIntegTestCase { closeJob(jobId); // Check that state has been persisted - SearchResponse stateDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setFetchSource(false) + SearchResponse stateDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setFetchSource(false) .setTrackTotalHits(true) .setSize(10000) .get(); @@ -170,8 +167,7 @@ public class PersistJobIT extends MlNativeAutodetectIntegTestCase { closeJob(jobId); deleteJob(jobId); - stateDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setFetchSource(false) + stateDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setFetchSource(false) .setTrackTotalHits(true) .setSize(10000) .get(); @@ -199,11 +195,11 @@ public class PersistJobIT extends MlNativeAutodetectIntegTestCase { closeJob(jobId); // Check that state has not been persisted - SearchResponse stateDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).get(); + SearchResponse stateDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).get(); assertThat(Arrays.asList(stateDocsResponse.getHits().getHits()), empty()); // Check that results have not been persisted - SearchResponse resultsDocsResponse = client().prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)).get(); + SearchResponse resultsDocsResponse = prepareSearch(AnomalyDetectorsIndex.jobResultsAliasedName(jobId)).get(); assertThat(Arrays.asList(resultsDocsResponse.getHits().getHits()), empty()); deleteJob(jobId); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java index 993a65cf45bc..7b977640e9b3 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RegressionIT.java @@ -117,7 +117,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { // for debugging List> badDocuments = new ArrayList<>(); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getMlResultsObjectFromDestDoc(destDoc); @@ -207,7 +207,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { startAnalytics(jobId); waitUntilAnalyticsIsStopped(jobId); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map resultsObject = getMlResultsObjectFromDestDoc(getDestDoc(config, hit)); @@ -266,7 +266,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { int trainingRowsCount = 0; int nonTrainingRowsCount = 0; - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map resultsObject = getMlResultsObjectFromDestDoc(getDestDoc(config, hit)); @@ -344,7 +344,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map resultsObject = getMlResultsObjectFromDestDoc(getDestDoc(config, hit)); @@ -440,7 +440,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { // Now calling the _delete_expired_data API should remove unused state assertThat(deleteExpiredData().isDeleted(), is(true)); - SearchResponse stateIndexSearchResponse = client().prepareSearch(".ml-state*").execute().actionGet(); + SearchResponse stateIndexSearchResponse = prepareSearch(".ml-state*").execute().actionGet(); assertThat(stateIndexSearchResponse.getHits().getTotalHits().value, equalTo(0L)); } @@ -498,7 +498,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { startAnalytics(jobId); waitUntilAnalyticsIsStopped(jobId); - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getMlResultsObjectFromDestDoc(destDoc); @@ -607,7 +607,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { double predictionErrorSum = 0.0; - SearchResponse sourceData = client().prepareSearch(sourceIndex).setSize(totalDocCount).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setSize(totalDocCount).get(); StringBuilder targetsPredictions = new StringBuilder(); // used to investigate #90599 for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); @@ -704,7 +704,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { waitUntilAnalyticsIsStopped(jobId); // for debugging - SearchResponse sourceData = client().prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : sourceData.getHits()) { Map destDoc = getDestDoc(config, hit); Map resultsObject = getMlResultsObjectFromDestDoc(destDoc); @@ -795,7 +795,7 @@ public class RegressionIT extends MlNativeDataFrameAnalyticsIntegTestCase { startAnalytics(jobId); waitUntilAnalyticsIsStopped(jobId); - SearchResponse destData = client().prepareSearch(destIndex).setTrackTotalHits(true).setSize(1000).get(); + SearchResponse destData = prepareSearch(destIndex).setTrackTotalHits(true).setSize(1000).get(); for (SearchHit hit : destData.getHits()) { Map destDoc = hit.getSourceAsMap(); Map resultsObject = getMlResultsObjectFromDestDoc(destDoc); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RevertModelSnapshotIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RevertModelSnapshotIT.java index 4e8272053245..90614703cc17 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RevertModelSnapshotIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RevertModelSnapshotIT.java @@ -289,8 +289,7 @@ public class RevertModelSnapshotIT extends MlNativeAutodetectIntegTestCase { } private Quantiles getQuantiles(String jobId) { - SearchResponse response = client().prepareSearch(".ml-state*") - .setQuery(QueryBuilders.idsQuery().addIds(Quantiles.documentId(jobId))) + SearchResponse response = prepareSearch(".ml-state*").setQuery(QueryBuilders.idsQuery().addIds(Quantiles.documentId(jobId))) .setSize(1) .get(); SearchHits hits = response.getHits(); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RunDataFrameAnalyticsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RunDataFrameAnalyticsIT.java index b495eb860b75..3910ab0c1c52 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RunDataFrameAnalyticsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/RunDataFrameAnalyticsIT.java @@ -102,7 +102,7 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest assertThat(stats.getDataCounts().getTestDocsCount(), equalTo(0L)); assertThat(stats.getDataCounts().getSkippedDocsCount(), equalTo(0L)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); double scoreOfOutlier = 0.0; double scoreOfNonOutlier = -1.0; for (SearchHit hit : sourceData.getHits()) { @@ -230,12 +230,11 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest waitUntilAnalyticsIsStopped(id); // Check we've got all docs - SearchResponse searchResponse = client().prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); + SearchResponse searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) docCount)); // Check they all have an outlier_score - searchResponse = client().prepareSearch(config.getDest().getIndex()) - .setTrackTotalHits(true) + searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true) .setQuery(QueryBuilders.existsQuery("custom_ml.outlier_score")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) docCount)); @@ -312,7 +311,7 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest startAnalytics(id); waitUntilAnalyticsIsStopped(id); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); for (SearchHit hit : sourceData.getHits()) { GetResponse destDocGetResponse = client().prepareGet().setIndex(config.getDest().getIndex()).setId(hit.getId()).get(); assertThat(destDocGetResponse.isExists(), is(true)); @@ -392,10 +391,9 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest return; } - SearchResponse searchResponse = client().prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); + SearchResponse searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); if (searchResponse.getHits().getTotalHits().value == docCount) { - searchResponse = client().prepareSearch(config.getDest().getIndex()) - .setTrackTotalHits(true) + searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true) .setQuery(QueryBuilders.existsQuery("custom_ml.outlier_score")) .get(); logger.debug("We stopped during analysis: [{}] < [{}]", searchResponse.getHits().getTotalHits().value, docCount); @@ -459,12 +457,11 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest waitUntilAnalyticsIsStopped(id); // Check we've got all docs - SearchResponse searchResponse = client().prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); + SearchResponse searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) bulkRequestBuilder.numberOfActions())); // Check they all have an outlier_score - searchResponse = client().prepareSearch(config.getDest().getIndex()) - .setTrackTotalHits(true) + searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true) .setQuery(QueryBuilders.existsQuery("ml.outlier_score")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) bulkRequestBuilder.numberOfActions())); @@ -523,12 +520,11 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest waitUntilAnalyticsIsStopped(id); // Check we've got all docs - SearchResponse searchResponse = client().prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); + SearchResponse searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) bulkRequestBuilder.numberOfActions())); // Check they all have an outlier_score - searchResponse = client().prepareSearch(config.getDest().getIndex()) - .setTrackTotalHits(true) + searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true) .setQuery(QueryBuilders.existsQuery("ml.outlier_score")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) bulkRequestBuilder.numberOfActions())); @@ -690,12 +686,11 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest waitUntilAnalyticsIsStopped(id); // Check we've got all docs - SearchResponse searchResponse = client().prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); + SearchResponse searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) docCount)); // Check they all have an outlier_score - searchResponse = client().prepareSearch(config.getDest().getIndex()) - .setTrackTotalHits(true) + searchResponse = prepareSearch(config.getDest().getIndex()).setTrackTotalHits(true) .setQuery(QueryBuilders.existsQuery("custom_ml.outlier_score")) .get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo((long) docCount)); @@ -750,7 +745,7 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest startAnalytics(id); waitUntilAnalyticsIsStopped(id); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); double scoreOfOutlier = 0.0; double scoreOfNonOutlier = -1.0; for (SearchHit hit : sourceData.getHits()) { @@ -859,7 +854,7 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest assertThat(stats.getDataCounts().getTestDocsCount(), equalTo(0L)); assertThat(stats.getDataCounts().getSkippedDocsCount(), equalTo(0L)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); double scoreOfOutlier = 0.0; double scoreOfNonOutlier = -1.0; for (SearchHit hit : sourceData.getHits()) { @@ -964,7 +959,7 @@ public class RunDataFrameAnalyticsIT extends MlNativeDataFrameAnalyticsIntegTest assertThat(stats.getDataCounts().getTestDocsCount(), equalTo(0L)); assertThat(stats.getDataCounts().getSkippedDocsCount(), equalTo(0L)); - SearchResponse sourceData = client().prepareSearch(sourceIndex).get(); + SearchResponse sourceData = prepareSearch(sourceIndex).get(); double scoreOfOutlier = 0.0; double scoreOfNonOutlier = -1.0; for (SearchHit hit : sourceData.getHits()) { diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ScheduledEventsIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ScheduledEventsIT.java index eeb8e5489238..45d1e57a52f4 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ScheduledEventsIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ScheduledEventsIT.java @@ -248,8 +248,7 @@ public class ScheduledEventsIT extends MlNativeAutodetectIntegTestCase { // Wait until the notification that the process was updated is indexed assertBusy(() -> { - SearchResponse searchResponse = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .setSize(1) + SearchResponse searchResponse = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).setSize(1) .addSort("timestamp", SortOrder.DESC) .setQuery( QueryBuilders.boolQuery() @@ -335,8 +334,7 @@ public class ScheduledEventsIT extends MlNativeAutodetectIntegTestCase { // Wait until the notification that the job was updated is indexed assertBusy(() -> { - SearchResponse searchResponse = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .setSize(1) + SearchResponse searchResponse = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).setSize(1) .addSort("timestamp", SortOrder.DESC) .setQuery( QueryBuilders.boolQuery() @@ -422,8 +420,7 @@ public class ScheduledEventsIT extends MlNativeAutodetectIntegTestCase { // Wait until the notification that the job was updated is indexed assertBusy(() -> { - SearchResponse searchResponse = client().prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX) - .setSize(1) + SearchResponse searchResponse = prepareSearch(NotificationsIndex.NOTIFICATIONS_INDEX).setSize(1) .addSort("timestamp", SortOrder.DESC) .setQuery( QueryBuilders.boolQuery() diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextAggregationIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextAggregationIT.java index 309ca2211b1c..d356fe49f912 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextAggregationIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextAggregationIT.java @@ -39,8 +39,7 @@ public class CategorizeTextAggregationIT extends BaseMlIntegTestCase { } public void testAggregation() { - SearchResponse response = client().prepareSearch(DATA_INDEX) - .setSize(0) + SearchResponse response = prepareSearch(DATA_INDEX).setSize(0) .setTrackTotalHits(false) .addAggregation( new CategorizeTextAggregationBuilder("categorize", "msg").subAggregation(AggregationBuilders.max("max").field("time")) @@ -57,8 +56,7 @@ public class CategorizeTextAggregationIT extends BaseMlIntegTestCase { } public void testAggregationWithOnlyOneBucket() { - SearchResponse response = client().prepareSearch(DATA_INDEX) - .setSize(0) + SearchResponse response = prepareSearch(DATA_INDEX).setSize(0) .setTrackTotalHits(false) .addAggregation( new CategorizeTextAggregationBuilder("categorize", "msg").size(1) @@ -73,8 +71,7 @@ public class CategorizeTextAggregationIT extends BaseMlIntegTestCase { } public void testAggregationWithBroadCategories() { - SearchResponse response = client().prepareSearch(DATA_INDEX) - .setSize(0) + SearchResponse response = prepareSearch(DATA_INDEX).setSize(0) .setTrackTotalHits(false) .addAggregation( // Overriding the similarity threshold to just 11% (default is 70%) results in the diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextDistributedIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextDistributedIT.java index 6f32acd5f08d..c91b2e8d5b54 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextDistributedIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/CategorizeTextDistributedIT.java @@ -82,11 +82,9 @@ public class CategorizeTextDistributedIT extends BaseMlIntegTestCase { .collect(Collectors.toSet()); assertThat(nodesWithShards, hasSize(internalCluster().size())); - SearchResponse searchResponse = client().prepareSearch(indexName) - .addAggregation(new CategorizeTextAggregationBuilder("categories", "message")) - .setSize(0) - .execute() - .actionGet(); + SearchResponse searchResponse = prepareSearch(indexName).addAggregation( + new CategorizeTextAggregationBuilder("categories", "message") + ).setSize(0).execute().actionGet(); InternalCategorizationAggregation aggregation = searchResponse.getAggregations().get("categories"); assertThat(aggregation, notNullValue()); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/NetworkDisruptionIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/NetworkDisruptionIT.java index e2dc111007aa..6a3ff6551503 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/NetworkDisruptionIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/NetworkDisruptionIT.java @@ -81,12 +81,9 @@ public class NetworkDisruptionIT extends BaseMlIntegTestCase { assertEquals(newJobNode, finalJobNode); // The job running on the original node should have been killed, and hence should not have persisted quantiles - SearchResponse searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setQuery(QueryBuilders.idsQuery().addIds(Quantiles.documentId(job.getId()))) - .setTrackTotalHits(true) - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) - .execute() - .actionGet(); + SearchResponse searchResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery( + QueryBuilders.idsQuery().addIds(Quantiles.documentId(job.getId())) + ).setTrackTotalHits(true).setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute().actionGet(); assertEquals(0L, searchResponse.getHits().getTotalHits().value); CloseJobAction.Request closeJobRequest = new CloseJobAction.Request(job.getId()); @@ -94,12 +91,9 @@ public class NetworkDisruptionIT extends BaseMlIntegTestCase { assertTrue(closeJobResponse.isClosed()); // The relocated job was closed rather than killed, and hence should have persisted quantiles - searchResponse = client().prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()) - .setQuery(QueryBuilders.idsQuery().addIds(Quantiles.documentId(job.getId()))) - .setTrackTotalHits(true) - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) - .execute() - .actionGet(); + searchResponse = prepareSearch(AnomalyDetectorsIndex.jobStateIndexPattern()).setQuery( + QueryBuilders.idsQuery().addIds(Quantiles.documentId(job.getId())) + ).setTrackTotalHits(true).setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute().actionGet(); assertEquals(1L, searchResponse.getHits().getTotalHits().value); } } diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java index d34343a4dc20..59a79def9bd1 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/persistence/MockClientBuilder.java @@ -29,14 +29,10 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.xcontent.XContentBuilder; -import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -109,22 +105,6 @@ public class MockClientBuilder { return this; } - public MockClientBuilder prepareSearch(String index, int from, int size, SearchResponse response, ArgumentCaptor filter) { - SearchRequestBuilder builder = mock(SearchRequestBuilder.class); - when(builder.addSort(any(SortBuilder.class))).thenReturn(builder); - when(builder.setQuery(filter.capture())).thenReturn(builder); - when(builder.setPostFilter(filter.capture())).thenReturn(builder); - when(builder.setFrom(eq(from))).thenReturn(builder); - when(builder.setSize(eq(size))).thenReturn(builder); - when(builder.setFetchSource(eq(true))).thenReturn(builder); - when(builder.addDocValueField(any(String.class))).thenReturn(builder); - when(builder.addDocValueField(any(String.class), any(String.class))).thenReturn(builder); - when(builder.addSort(any(String.class), any(SortOrder.class))).thenReturn(builder); - when(builder.get()).thenReturn(response); - when(client.prepareSearch(eq(index))).thenReturn(builder); - return this; - } - public MockClientBuilder prepareSearches(String index, SearchRequestBuilder first, SearchRequestBuilder... searches) { when(client.prepareSearch(eq(index))).thenReturn(first, searches); return this; diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java index 29b044e81f7d..02c9a8e2f210 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/MultiNodesStatsTests.java @@ -78,11 +78,9 @@ public class MultiNodesStatsTests extends MonitoringIntegTestCase { flush(ALL_MONITORING_INDICES); refresh(); - SearchResponse response = client().prepareSearch(ALL_MONITORING_INDICES) - .setQuery(QueryBuilders.termQuery("type", NodeStatsMonitoringDoc.TYPE)) - .setSize(0) - .addAggregation(AggregationBuilders.terms("nodes_ids").field("node_stats.node_id")) - .get(); + SearchResponse response = prepareSearch(ALL_MONITORING_INDICES).setQuery( + QueryBuilders.termQuery("type", NodeStatsMonitoringDoc.TYPE) + ).setSize(0).addAggregation(AggregationBuilders.terms("nodes_ids").field("node_stats.node_id")).get(); for (Aggregation aggregation : response.getAggregations()) { assertThat(aggregation, instanceOf(StringTerms.class)); diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java index 503d83162df5..91dff9abcc5e 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterIntegTests.java @@ -111,7 +111,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { assertThat(indexExists(".monitoring-*"), is(true)); ensureYellowAndNoInitializingShards(".monitoring-*"); - SearchResponse response = client().prepareSearch(".monitoring-*").get(); + SearchResponse response = prepareSearch(".monitoring-*").get(); assertThat((long) nbDocs, lessThanOrEqualTo(response.getHits().getTotalHits().value)); }); @@ -125,8 +125,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ensureYellowAndNoInitializingShards(".monitoring-*"); assertThat( - client().prepareSearch(".monitoring-es-*") - .setSize(0) + prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "cluster_stats")) .get() .getHits() @@ -135,8 +134,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ); assertThat( - client().prepareSearch(".monitoring-es-*") - .setSize(0) + prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "index_recovery")) .get() .getHits() @@ -145,8 +143,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ); assertThat( - client().prepareSearch(".monitoring-es-*") - .setSize(0) + prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "index_stats")) .get() .getHits() @@ -155,8 +152,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ); assertThat( - client().prepareSearch(".monitoring-es-*") - .setSize(0) + prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "indices_stats")) .get() .getHits() @@ -165,8 +161,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ); assertThat( - client().prepareSearch(".monitoring-es-*") - .setSize(0) + prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "shards")) .get() .getHits() @@ -174,8 +169,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { greaterThan(0L) ); - SearchResponse response = client().prepareSearch(".monitoring-es-*") - .setSize(0) + SearchResponse response = prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "node_stats")) .addAggregation(terms("agg_nodes_ids").field("node_stats.node_id")) .get(); @@ -212,8 +206,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { ensureYellowAndNoInitializingShards(".monitoring-*"); refresh(".monitoring-es-*"); - SearchResponse response = client().prepareSearch(".monitoring-es-*") - .setSize(0) + SearchResponse response = prepareSearch(".monitoring-es-*").setSize(0) .setQuery(QueryBuilders.termQuery("type", "node_stats")) .addAggregation( terms("agg_nodes_ids").field("node_stats.node_id").subAggregation(max("agg_last_time_collected").field("timestamp")) @@ -271,7 +264,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { DateFormatter dateParser = DateFormatter.forPattern("strict_date_time"); DateFormatter dateFormatter = DateFormatter.forPattern(customTimeFormat).withZone(ZoneOffset.UTC); - SearchResponse searchResponse = client().prepareSearch(".monitoring-*").setSize(100).get(); + SearchResponse searchResponse = prepareSearch(".monitoring-*").setSize(100).get(); assertThat(searchResponse.getHits().getTotalHits().value, greaterThan(0L)); for (SearchHit hit : searchResponse.getHits().getHits()) { diff --git a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterResourceIntegTests.java b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterResourceIntegTests.java index d96ee3726a03..71590943e4bf 100644 --- a/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterResourceIntegTests.java +++ b/x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/local/LocalExporterResourceIntegTests.java @@ -265,7 +265,7 @@ public class LocalExporterResourceIntegTests extends LocalExporterIntegTestCase SearchSourceBuilder searchSource = SearchSourceBuilder.searchSource() .query(QueryBuilders.matchQuery("metadata.xpack.cluster_uuid", clusterUUID)); Set watchIds = new HashSet<>(Arrays.asList(ClusterAlertsUtil.WATCH_IDS)); - for (SearchHit hit : client().prepareSearch(".watches").setSource(searchSource).get().getHits().getHits()) { + for (SearchHit hit : prepareSearch(".watches").setSource(searchSource).get().getHits().getHits()) { String watchId = ObjectPath.eval("metadata.xpack.watch", hit.getSourceAsMap()); assertNotNull("Missing watch ID", watchId); assertTrue("found unexpected watch id", watchIds.contains(watchId)); @@ -289,7 +289,7 @@ public class LocalExporterResourceIntegTests extends LocalExporterIntegTestCase String clusterUUID = clusterService().state().getMetadata().clusterUUID(); SearchSourceBuilder searchSource = SearchSourceBuilder.searchSource() .query(QueryBuilders.matchQuery("metadata.xpack.cluster_uuid", clusterUUID)); - SearchResponse searchResponse = client().prepareSearch(".watches").setSource(searchSource).get(); + SearchResponse searchResponse = prepareSearch(".watches").setSource(searchSource).get(); if (searchResponse.getHits().getTotalHits().value > 0) { List invalidWatches = new ArrayList<>(); for (SearchHit hit : searchResponse.getHits().getHits()) { diff --git a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankCoordinatorCanMatchIT.java b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankCoordinatorCanMatchIT.java index 640d4ca2f939..c5fac43723b7 100644 --- a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankCoordinatorCanMatchIT.java +++ b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankCoordinatorCanMatchIT.java @@ -130,8 +130,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { }); // match 2 separate shard with no overlap in queries - SearchResponse response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -150,8 +149,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { assertEquals(3, response.getSkippedShards()); // match 2 shards with overlap in queries - response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -170,8 +168,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { assertEquals(3, response.getSkippedShards()); // match one shard with one query in range and one query out of range - response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -190,8 +187,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match no shards, but still use one to generate a search response - response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -210,8 +206,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match one shard with with no overlap in queries - response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -230,8 +225,7 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match one shard with exact overlap in queries - response = client().prepareSearch("time_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("time_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) diff --git a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankMultiShardIT.java b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankMultiShardIT.java index 63afb47273cb..3db050e071aa 100644 --- a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankMultiShardIT.java +++ b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankMultiShardIT.java @@ -139,8 +139,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testTotalDocsSmallerThanSize() { float[] queryVector = { 0.0f }; KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector", queryVector, 3, 3, null); - SearchResponse response = client().prepareSearch("tiny_index") - .setRankBuilder(new RRFRankBuilder(100, 1)) + SearchResponse response = prepareSearch("tiny_index").setRankBuilder(new RRFRankBuilder(100, 1)) .setKnnSearch(List.of(knnSearch)) .setQuery(QueryBuilders.termQuery("text", "term")) .addFetchField("vector") @@ -170,8 +169,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testBM25AndKnn() { float[] queryVector = { 500.0f }; KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearch)) .setQuery( @@ -211,8 +209,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(51, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1)) .setTrackTotalHits(true) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .addFetchField("vector_asc") @@ -262,8 +259,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(51, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .setQuery( @@ -332,8 +328,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testBM25AndKnnWithBucketAggregation() { float[] queryVector = { 500.0f }; KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(true) .setKnnSearch(List.of(knnSearch)) .setQuery( @@ -389,8 +384,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(51, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .addFetchField("vector_asc") @@ -456,8 +450,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 51, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 51, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(51, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(51, 1)) .setTrackTotalHits(true) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .setQuery( @@ -542,8 +535,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testMultiBM25() { for (SearchType searchType : SearchType.CURRENTLY_SUPPORTED) { - SearchResponse response = client().prepareSearch("nrd_index") - .setSearchType(searchType) + SearchResponse response = prepareSearch("nrd_index").setSearchType(searchType) .setRankBuilder(new RRFRankBuilder(8, 1)) .setTrackTotalHits(false) .setSubSearches( @@ -612,8 +604,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testMultiBM25WithAggregation() { for (SearchType searchType : SearchType.CURRENTLY_SUPPORTED) { - SearchResponse response = client().prepareSearch("nrd_index") - .setSearchType(searchType) + SearchResponse response = prepareSearch("nrd_index").setSearchType(searchType) .setRankBuilder(new RRFRankBuilder(8, 1)) .setTrackTotalHits(false) .setSubSearches( @@ -699,8 +690,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testMultiBM25AndSingleKnn() { float[] queryVector = { 500.0f }; KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearch)) .setSubSearches( @@ -756,8 +746,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { public void testMultiBM25AndSingleKnnWithAggregation() { float[] queryVector = { 500.0f }; KnnSearchBuilder knnSearch = new KnnSearchBuilder("vector_asc", queryVector, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearch)) .setSubSearches( @@ -831,8 +820,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .setSubSearches( @@ -892,8 +880,7 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { float[] queryVectorDesc = { 500.0f }; KnnSearchBuilder knnSearchAsc = new KnnSearchBuilder("vector_asc", queryVectorAsc, 101, 1001, null); KnnSearchBuilder knnSearchDesc = new KnnSearchBuilder("vector_desc", queryVectorDesc, 101, 1001, null); - SearchResponse response = client().prepareSearch("nrd_index") - .setRankBuilder(new RRFRankBuilder(101, 1)) + SearchResponse response = prepareSearch("nrd_index").setRankBuilder(new RRFRankBuilder(101, 1)) .setTrackTotalHits(false) .setKnnSearch(List.of(knnSearchAsc, knnSearchDesc)) .setSubSearches( diff --git a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankShardCanMatchIT.java b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankShardCanMatchIT.java index a7019d76cdcd..0e51958ea164 100644 --- a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankShardCanMatchIT.java +++ b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankShardCanMatchIT.java @@ -144,8 +144,7 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { indicesAdmin().prepareRefresh("value_index").get(); // match 2 separate shard with no overlap in queries - SearchResponse response = client().prepareSearch("value_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + SearchResponse response = prepareSearch("value_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -164,8 +163,7 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { assertEquals(3, response.getSkippedShards()); // match one shard with one query and do not match the other shard with one query - response = client().prepareSearch("value_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("value_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -184,8 +182,7 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match no shards, but still use one to generate a search response - response = client().prepareSearch("value_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("value_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -204,8 +201,7 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match the same shard for both queries - response = client().prepareSearch("value_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("value_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) @@ -224,8 +220,7 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { assertEquals(4, response.getSkippedShards()); // match one shard with the exact same query - response = client().prepareSearch("value_index") - .setSearchType(SearchType.QUERY_THEN_FETCH) + response = prepareSearch("value_index").setSearchType(SearchType.QUERY_THEN_FETCH) .setPreFilterShardSize(1) .setRankBuilder(new RRFRankBuilder(20, 1)) .setTrackTotalHits(false) diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java index 71c3253b0607..b07d307f105c 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java @@ -289,15 +289,10 @@ public abstract class BaseSearchableSnapshotsIntegTestCase extends AbstractSnaps } catch (InterruptedException e) { throw new RuntimeException(e); } - allHits.set(t, client().prepareSearch(indexName).setTrackTotalHits(true).get().getHits().getTotalHits()); + allHits.set(t, prepareSearch(indexName).setTrackTotalHits(true).get().getHits().getTotalHits()); barHits.set( t, - client().prepareSearch(indexName) - .setTrackTotalHits(true) - .setQuery(matchQuery("foo", "bar")) - .get() - .getHits() - .getTotalHits() + prepareSearch(indexName).setTrackTotalHits(true).setQuery(matchQuery("foo", "bar")).get().getHits().getTotalHits() ); }); threads[i].start(); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java index 8e414002bfa6..81ea36e88628 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java @@ -478,7 +478,7 @@ public class SearchableSnapshotsIntegTests extends BaseSearchableSnapshotsIntegT assertThat(restore.getRestoreInfo().failedShards(), equalTo(0)); ensureGreen(restoredIndexName); - assertHitCount(client().prepareSearch(restoredIndexName).setSize(0), nbDocs); + assertHitCount(prepareSearch(restoredIndexName).setSize(0), nbDocs); final Index restoredIndex = resolveIndex(restoredIndexName); for (String node : internalCluster().getNodeNames()) { diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRecoverFromSnapshotIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRecoverFromSnapshotIntegTests.java index 1e2d288af2fa..6f71f7c33bf0 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRecoverFromSnapshotIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRecoverFromSnapshotIntegTests.java @@ -87,7 +87,7 @@ public class SearchableSnapshotsRecoverFromSnapshotIntegTests extends BaseSearch ensureGreen(restoredIndexName); - assertHitCount(client().prepareSearch(restoredIndexName).setTrackTotalHits(true), totalHits.value); + assertHitCount(prepareSearch(restoredIndexName).setTrackTotalHits(true), totalHits.value); mockAppender.assertAllExpectationsMatched(); Loggers.removeAppender(logger, mockAppender); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRepositoryIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRepositoryIntegTests.java index d3cdfce0b817..cb6cf45b641c 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRepositoryIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsRepositoryIntegTests.java @@ -68,7 +68,7 @@ public class SearchableSnapshotsRepositoryIntegTests extends BaseFrozenSearchabl Storage storage = randomFrom(Storage.values()); String restoredIndexName = (storage == Storage.FULL_COPY ? "fully-mounted-" : "partially-mounted-") + indexName + '-' + i; mountSnapshot(repositoryName, snapshotName, indexName, restoredIndexName, Settings.EMPTY, storage); - assertHitCount(client().prepareSearch(restoredIndexName).setTrackTotalHits(true), totalHits.value); + assertHitCount(prepareSearch(restoredIndexName).setTrackTotalHits(true), totalHits.value); mountedIndices[i] = restoredIndexName; } @@ -182,7 +182,7 @@ public class SearchableSnapshotsRepositoryIntegTests extends BaseFrozenSearchabl ? equalTo(Boolean.toString(deleteSnapshot)) : nullValue() ); - assertHitCount(client().prepareSearch(mounted).setTrackTotalHits(true), totalHits.value); + assertHitCount(prepareSearch(mounted).setTrackTotalHits(true), totalHits.value); final String mountedAgain = randomValueOtherThan(mounted, () -> randomAlphaOfLength(10).toLowerCase(Locale.ROOT)); final SnapshotRestoreException exception = expectThrows( @@ -207,7 +207,7 @@ public class SearchableSnapshotsRepositoryIntegTests extends BaseFrozenSearchabl ? equalTo(Boolean.toString(deleteSnapshot)) : nullValue() ); - assertHitCount(client().prepareSearch(mountedAgain).setTrackTotalHits(true), totalHits.value); + assertHitCount(prepareSearch(mountedAgain).setTrackTotalHits(true), totalHits.value); assertAcked(indicesAdmin().prepareDelete(mountedAgain)); assertAcked(indicesAdmin().prepareDelete(mounted)); @@ -237,7 +237,7 @@ public class SearchableSnapshotsRepositoryIntegTests extends BaseFrozenSearchabl ? equalTo(Boolean.toString(deleteSnapshot)) : nullValue() ); - assertHitCount(client().prepareSearch(mounted).setTrackTotalHits(true), totalHits.value); + assertHitCount(prepareSearch(mounted).setTrackTotalHits(true), totalHits.value); if (randomBoolean()) { assertAcked(indicesAdmin().prepareClose(mounted)); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheIntegTests.java index 7a4a92ac600a..0a2056c94ded 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheIntegTests.java @@ -225,7 +225,7 @@ public class SearchableSnapshotsBlobStoreCacheIntegTests extends BaseFrozenSearc final long numberOfCacheWrites = indexingStats != null ? indexingStats.getTotal().getIndexCount() : 0L; logger.info("--> verifying number of documents in index [{}]", restoredIndex); - assertHitCount(client().prepareSearch(restoredIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); + assertHitCount(prepareSearch(restoredIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); for (IndicesService indicesService : internalCluster().getDataNodeInstances(IndicesService.class)) { for (IndexService indexService : indicesService) { @@ -266,7 +266,7 @@ public class SearchableSnapshotsBlobStoreCacheIntegTests extends BaseFrozenSearc checkNoBlobStoreAccess(); logger.info("--> verifying number of documents in index [{}]", restoredAgainIndex); - assertHitCount(client().prepareSearch(restoredAgainIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); + assertHitCount(prepareSearch(restoredAgainIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); logger.info("--> verifying that no extra cached blobs were indexed [{}]", SNAPSHOT_BLOB_CACHE_INDEX); refreshSystemIndex(); @@ -322,7 +322,7 @@ public class SearchableSnapshotsBlobStoreCacheIntegTests extends BaseFrozenSearc assertThat(indexingStats != null ? indexingStats.getTotal().getIndexCount() : 0L, equalTo(0L)); logger.info("--> verifying number of documents in index [{}]", restoredAgainIndex); - assertHitCount(client().prepareSearch(restoredAgainIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); + assertHitCount(prepareSearch(restoredAgainIndex).setSize(0).setTrackTotalHits(true), numberOfDocs); logger.info("--> deleting indices, maintenance service should clean up [{}] docs in system index", numberOfCachedBlobs); assertAcked(indicesAdmin().prepareDelete("restored-*")); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java index 28a537c5da9e..0d1bc7eec94b 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/shared/NodesCachesStatsIntegTests.java @@ -107,14 +107,11 @@ public class NodesCachesStatsIntegTests extends BaseFrozenSearchableSnapshotsInt } for (int i = 0; i < 20; i++) { - client().prepareSearch(mountedIndex) - .setQuery( - randomBoolean() - ? QueryBuilders.rangeQuery("id").gte(randomIntBetween(0, 1000)) - : QueryBuilders.termQuery("test", "value" + randomIntBetween(0, 1000)) - ) - .setSize(randomIntBetween(0, 1000)) - .get(); + prepareSearch(mountedIndex).setQuery( + randomBoolean() + ? QueryBuilders.rangeQuery("id").gte(randomIntBetween(0, 1000)) + : QueryBuilders.termQuery("test", "value" + randomIntBetween(0, 1000)) + ).setSize(randomIntBetween(0, 1000)).get(); } assertExecutorIsIdle(SearchableSnapshots.CACHE_FETCH_ASYNC_THREAD_POOL_NAME); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java index 1aa5c9609f6a..b5e5183df086 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityRandomTests.java @@ -108,7 +108,7 @@ public class DocumentLevelSecurityRandomTests extends SecurityIntegTestCase { SearchResponse searchResponse1 = client().filterWithHeader( Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user" + roleI, USERS_PASSWD)) ).prepareSearch("test").get(); - SearchResponse searchResponse2 = client().prepareSearch("alias" + roleI).get(); + SearchResponse searchResponse2 = prepareSearch("alias" + roleI).get(); assertThat(searchResponse1.getHits().getTotalHits().value, equalTo(searchResponse2.getHits().getTotalHits().value)); for (int hitI = 0; hitI < searchResponse1.getHits().getHits().length; hitI++) { assertThat(searchResponse1.getHits().getAt(hitI).getId(), equalTo(searchResponse2.getHits().getAt(hitI).getId())); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java index be3162ac98b3..a76b04373737 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityTests.java @@ -455,8 +455,8 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD)) ) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -472,8 +472,8 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user2", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -490,14 +490,10 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user3", USERS_PASSWD))) .prepareMultiSearch() .add( - client().prepareSearch("test1") - .addSort(SortBuilders.fieldSort("id").sortMode(SortMode.MIN)) - .setQuery(QueryBuilders.matchAllQuery()) + prepareSearch("test1").addSort(SortBuilders.fieldSort("id").sortMode(SortMode.MIN)).setQuery(QueryBuilders.matchAllQuery()) ) .add( - client().prepareSearch("test2") - .addSort(SortBuilders.fieldSort("id").sortMode(SortMode.MIN)) - .setQuery(QueryBuilders.matchAllQuery()) + prepareSearch("test2").addSort(SortBuilders.fieldSort("id").sortMode(SortMode.MIN)).setQuery(QueryBuilders.matchAllQuery()) ) .get(); assertFalse(response.getResponses()[0].isFailure()); @@ -925,9 +921,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); - SearchResponse response = client().prepareSearch("test") - .addAggregation(AggregationBuilders.global("global").subAggregation(AggregationBuilders.terms("field2").field("field2"))) - .get(); + SearchResponse response = prepareSearch("test").addAggregation( + AggregationBuilders.global("global").subAggregation(AggregationBuilders.terms("field2").field("field2")) + ).get(); assertHitCount(response, 3); assertSearchHits(response, "1", "2", "3"); @@ -1023,14 +1019,11 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { } private void verifyParentChild() { - SearchResponse searchResponse = client().prepareSearch("test") - .setQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.None)) - .get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(hasChildQuery("child", matchAllQuery(), ScoreMode.None)).get(); assertHitCount(searchResponse, 1L); assertThat(searchResponse.getHits().getAt(0).getId(), equalTo("p1")); - searchResponse = client().prepareSearch("test") - .setQuery(hasParentQuery("parent", matchAllQuery(), false)) + searchResponse = prepareSearch("test").setQuery(hasParentQuery("parent", matchAllQuery(), false)) .addSort("id", SortOrder.ASC) .get(); assertHitCount(searchResponse, 3L); @@ -1356,9 +1349,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { ); // Term suggester: - SearchResponse response = client().prepareSearch("test") - .suggest(new SuggestBuilder().setGlobalText("valeu").addSuggestion("_name1", new TermSuggestionBuilder("suggest_field1"))) - .get(); + SearchResponse response = prepareSearch("test").suggest( + new SuggestBuilder().setGlobalText("valeu").addSuggestion("_name1", new TermSuggestionBuilder("suggest_field1")) + ).get(); assertNoFailures(response); TermSuggestion termSuggestion = response.getSuggest().getSuggestion("_name1"); @@ -1381,9 +1374,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { assertThat(e.getMessage(), equalTo("Suggest isn't supported if document level security is enabled")); // Phrase suggester: - response = client().prepareSearch("test") - .suggest(new SuggestBuilder().setGlobalText("valeu").addSuggestion("_name1", new PhraseSuggestionBuilder("suggest_field1"))) - .get(); + response = prepareSearch("test").suggest( + new SuggestBuilder().setGlobalText("valeu").addSuggestion("_name1", new PhraseSuggestionBuilder("suggest_field1")) + ).get(); assertNoFailures(response); PhraseSuggestion phraseSuggestion = response.getSuggest().getSuggestion("_name1"); @@ -1402,9 +1395,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { assertThat(e.getMessage(), equalTo("Suggest isn't supported if document level security is enabled")); // Completion suggester: - response = client().prepareSearch("test") - .suggest(new SuggestBuilder().setGlobalText("valu").addSuggestion("_name1", new CompletionSuggestionBuilder("suggest_field2"))) - .get(); + response = prepareSearch("test").suggest( + new SuggestBuilder().setGlobalText("valu").addSuggestion("_name1", new CompletionSuggestionBuilder("suggest_field2")) + ).get(); assertNoFailures(response); CompletionSuggestion completionSuggestion = response.getSuggest().getSuggestion("_name1"); @@ -1449,10 +1442,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=text", "other_field", "type=text", "yet_another", "type=text") ); - SearchResponse response = client().prepareSearch("test") - .setProfile(true) - .setQuery(new FuzzyQueryBuilder("other_field", "valeu")) - .get(); + SearchResponse response = prepareSearch("test").setProfile(true).setQuery(new FuzzyQueryBuilder("other_field", "valeu")).get(); assertNoFailures(response); assertThat(response.getProfileResults().size(), equalTo(1)); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java index 8c69a96648a3..f9bd893ea365 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityRandomTests.java @@ -206,8 +206,7 @@ public class FieldLevelSecurityRandomTests extends SecurityIntegTestCase { .should(QueryBuilders.termQuery("field3", "value")) ) .get(); - SearchResponse expected = client().prepareSearch("test") - .addSort("id", SortOrder.ASC) + SearchResponse expected = prepareSearch("test").addSort("id", SortOrder.ASC) .setQuery(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("field1", "value"))) .get(); assertThat(actual.getHits().getTotalHits().value, equalTo(expected.getHits().getTotalHits().value)); @@ -226,8 +225,7 @@ public class FieldLevelSecurityRandomTests extends SecurityIntegTestCase { .should(QueryBuilders.termQuery("field3", "value")) ) .get(); - expected = client().prepareSearch("test") - .addSort("id", SortOrder.ASC) + expected = prepareSearch("test").addSort("id", SortOrder.ASC) .setQuery(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("field2", "value"))) .get(); assertThat(actual.getHits().getTotalHits().value, equalTo(expected.getHits().getTotalHits().value)); @@ -246,8 +244,7 @@ public class FieldLevelSecurityRandomTests extends SecurityIntegTestCase { .should(QueryBuilders.termQuery("field3", "value")) ) .get(); - expected = client().prepareSearch("test") - .addSort("id", SortOrder.ASC) + expected = prepareSearch("test").addSort("id", SortOrder.ASC) .setQuery(QueryBuilders.boolQuery().should(QueryBuilders.termQuery("field3", "value"))) .get(); assertThat(actual.getHits().getTotalHits().value, equalTo(expected.getHits().getTotalHits().value)); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityTests.java index 5d7644efccfe..d5d48440c34e 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityTests.java @@ -934,8 +934,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD)) ) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -948,8 +948,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user2 is granted access to field2 only response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user2", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -962,8 +962,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user3 is granted access to field1 and field2 response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user3", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -978,8 +978,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user4 is granted access to no fields, so the search response does say the doc exist, but no fields are returned response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user4", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -990,8 +990,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user5 has no field level security configured, so all fields are returned response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user5", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -1008,8 +1008,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user6 has access to field* response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user6", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -1026,8 +1026,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user7 has roles with field level security and without field level security response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user7", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); @@ -1044,8 +1044,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // user8 has roles with field level security with access to field1 and field2 response = client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user8", USERS_PASSWD))) .prepareMultiSearch() - .add(client().prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) - .add(client().prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test1").setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch("test2").setQuery(QueryBuilders.matchAllQuery())) .get(); assertFalse(response.getResponses()[0].isFailure()); assertThat(response.getResponses()[0].getResponse().getHits().getTotalHits().value, is(1L)); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java index fe0dd919d745..e2cce37789ff 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/KibanaUserRoleIntegTests.java @@ -102,7 +102,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { final String field = "foo"; indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); - SearchResponse response = client().prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()).get(); + SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()).get(); final long hits = response.getHits().getTotalHits().value; assertThat(hits, greaterThan(0L)); response = client().filterWithHeader( @@ -111,13 +111,13 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { assertEquals(response.getHits().getTotalHits().value, hits); MultiSearchResponse multiSearchResponse = client().prepareMultiSearch() - .add(client().prepareSearch(index).setQuery(QueryBuilders.matchAllQuery())) + .add(prepareSearch(index).setQuery(QueryBuilders.matchAllQuery())) .get(); final long multiHits = multiSearchResponse.getResponses()[0].getResponse().getHits().getTotalHits().value; assertThat(hits, greaterThan(0L)); multiSearchResponse = client().filterWithHeader( singletonMap("Authorization", UsernamePasswordToken.basicAuthHeaderValue("kibana_user", USERS_PASSWD)) - ).prepareMultiSearch().add(client().prepareSearch(index).setQuery(QueryBuilders.matchAllQuery())).get(); + ).prepareMultiSearch().add(prepareSearch(index).setQuery(QueryBuilders.matchAllQuery())).get(); assertEquals(multiSearchResponse.getResponses()[0].getResponse().getHits().getTotalHits().value, multiHits); } diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityCachePermissionTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityCachePermissionTests.java index 49bb1034ee0b..d2e390720465 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityCachePermissionTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityCachePermissionTests.java @@ -47,10 +47,9 @@ public class SecurityCachePermissionTests extends SecurityIntegTestCase { } public void testThatTermsFilterQueryDoesntLeakData() { - SearchResponse response = client().prepareSearch("data") - .setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.termsLookupQuery("token", new TermsLookup("tokens", "1", "tokens")))) - .execute() - .actionGet(); + SearchResponse response = prepareSearch("data").setQuery( + QueryBuilders.constantScoreQuery(QueryBuilders.termsLookupQuery("token", new TermsLookup("tokens", "1", "tokens"))) + ).execute().actionGet(); assertThat(response.isTimedOut(), is(false)); assertThat(response.getHits().getHits().length, is(1)); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityClearScrollTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityClearScrollTests.java index 83cda0e51851..ca826be90477 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityClearScrollTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/SecurityClearScrollTests.java @@ -78,7 +78,7 @@ public class SecurityClearScrollTests extends SecurityIntegTestCase { MultiSearchRequestBuilder multiSearchRequestBuilder = client().prepareMultiSearch(); int count = randomIntBetween(5, 15); for (int i = 0; i < count; i++) { - multiSearchRequestBuilder.add(client().prepareSearch("index").setScroll("10m").setSize(1)); + multiSearchRequestBuilder.add(prepareSearch("index").setScroll("10m").setSize(1)); } MultiSearchResponse multiSearchResponse = multiSearchRequestBuilder.get(); scrollIds = getScrollIds(multiSearchResponse); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java index 1a663678a738..c5efabfca13d 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java @@ -55,9 +55,6 @@ public class ShrinkIndexWithSecurityTests extends SecurityIntegTestCase { // verify all docs ensureGreen(); - assertHitCount( - client().prepareSearch("shrunk_bigindex").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), - randomNumberOfDocs - ); + assertHitCount(prepareSearch("shrunk_bigindex").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), randomNumberOfDocs); } } diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/ReadActionsTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/ReadActionsTests.java index f48a6eaf2655..6220fc2ae2c2 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/ReadActionsTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/ReadActionsTests.java @@ -410,11 +410,11 @@ public class ReadActionsTests extends SecurityIntegTestCase { } private SearchRequestBuilder trySearch(String... indices) { - return client().prepareSearch(indices); + return prepareSearch(indices); } private SearchRequestBuilder trySearch(IndicesOptions options, String... indices) { - return client().prepareSearch(indices).setIndicesOptions(options); + return prepareSearch(indices).setIndicesOptions(options); } private static T expectThrows(Class expectedType, SearchRequestBuilder searchRequestBuilder) { 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 0ead99610325..6a439dd5c856 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 @@ -46,11 +46,7 @@ public class SecurityScrollTests extends SecurityIntegTestCase { } indexRandom(true, docs); - SearchResponse response = client().prepareSearch("foo") - .setScroll(TimeValue.timeValueSeconds(5L)) - .setQuery(matchAllQuery()) - .setSize(1) - .get(); + SearchResponse response = prepareSearch("foo").setScroll(TimeValue.timeValueSeconds(5L)).setQuery(matchAllQuery()).setSize(1).get(); assertEquals(numDocs, response.getHits().getTotalHits().value); assertEquals(1, response.getHits().getHits().length); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java index 544d86525a97..0892c6f88873 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/SecurityDomainIntegTests.java @@ -379,7 +379,7 @@ public class SecurityDomainIntegTests extends AbstractProfileIntegTestCase { .prepareHealth() .execute() .actionGet(); - final SearchResponse searchResponse = client().prepareSearch(SecuritySystemIndices.SECURITY_TOKENS_ALIAS).execute().actionGet(); + final SearchResponse searchResponse = prepareSearch(SecuritySystemIndices.SECURITY_TOKENS_ALIAS).execute().actionGet(); final String encodedAuthentication = createTokenResponse.getAuthentication().encode(); for (SearchHit searchHit : searchResponse.getHits().getHits()) { diff --git a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java index b17fbb6a0371..6699097e847a 100644 --- a/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java +++ b/x-pack/plugin/slm/src/internalClusterTest/java/org/elasticsearch/xpack/slm/SLMSnapshotBlockingIntegTests.java @@ -271,9 +271,9 @@ public class SLMSnapshotBlockingIntegTests extends AbstractSnapshotIntegTestCase // Assert that the history document has been written for taking the snapshot and deleting it assertBusy(() -> { - SearchResponse resp = client().prepareSearch(".slm-history*") - .setQuery(QueryBuilders.matchQuery("snapshot_name", completedSnapshotName)) - .get(); + SearchResponse resp = prepareSearch(".slm-history*").setQuery( + QueryBuilders.matchQuery("snapshot_name", completedSnapshotName) + ).get(); logger.info( "--> checking history written for {}, got: {}", completedSnapshotName, diff --git a/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java b/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java index e0ea9d4ff076..3fd9a3a2e9c4 100644 --- a/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java +++ b/x-pack/plugin/snapshot-based-recoveries/src/internalClusterTest/java/org/elasticsearch/xpack/snapshotbasedrecoveries/recovery/SnapshotBasedIndexRecoveryIT.java @@ -1632,9 +1632,7 @@ public class SnapshotBasedIndexRecoveryIT extends AbstractSnapshotIntegTestCase private void assertDocumentsAreEqual(String indexName, int docCount) { assertDocCount(indexName, docCount); for (int testCase = 0; testCase < 3; testCase++) { - final SearchRequestBuilder searchRequestBuilder = client().prepareSearch(indexName) - .addSort("field", SortOrder.ASC) - .setSize(10_000); + final SearchRequestBuilder searchRequestBuilder = prepareSearch(indexName).addSort("field", SortOrder.ASC).setSize(10_000); SearchResponse searchResponse; switch (testCase) { diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoGridAggAndQueryConsistencyIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoGridAggAndQueryConsistencyIT.java index e70fc324064a..46ee89bf8044 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoGridAggAndQueryConsistencyIT.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoGridAggAndQueryConsistencyIT.java @@ -115,7 +115,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { .precision(15) .setGeoBoundingBox(boundingBox) .size(256 * 256); - SearchResponse response = client().prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); + SearchResponse response = prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); InternalGeoGrid gridPoint = response.getAggregations().get("geometry"); for (InternalGeoGridBucket bucket : gridPoint.getBuckets()) { assertThat(bucket.getDocCount(), Matchers.greaterThan(0L)); @@ -123,7 +123,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { GeoGridQueryBuilder.Grid.GEOHEX, bucket.getKeyAsString() ); - response = client().prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); + response = prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); assertThat( "Bucket " + bucket.getKeyAsString(), response.getHits().getTotalHits().value, @@ -166,7 +166,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { .precision(precision) .setGeoBoundingBox(boundingBox) .size(256 * 256); - SearchResponse response = client().prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); + SearchResponse response = prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); InternalGeoGrid gridPoint = response.getAggregations().get("geometry"); for (InternalGeoGridBucket bucket : gridPoint.getBuckets()) { assertThat(bucket.getDocCount(), Matchers.greaterThan(0L)); @@ -174,7 +174,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { GeoGridQueryBuilder.Grid.GEOHEX, bucket.getKeyAsString() ); - response = client().prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); + response = prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); assertThat(response.getHits().getTotalHits().value, Matchers.equalTo(bucket.getDocCount())); } } @@ -269,7 +269,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { for (int i = minPrecision; i <= maxPrecision; i++) { GeoGridAggregationBuilder builderPoint = aggBuilder.apply("geometry").field("geometry").precision(i); - SearchResponse response = client().prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); + SearchResponse response = prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); InternalGeoGrid gridPoint = response.getAggregations().get("geometry"); assertQuery(gridPoint.getBuckets(), queryBuilder, i); } @@ -297,7 +297,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { .precision(i) .setGeoBoundingBox(boundingBox) .size(256 * 256); - SearchResponse response = client().prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); + SearchResponse response = prepareSearch("test").addAggregation(builderPoint).setSize(0).get(); InternalGeoGrid gridPoint = response.getAggregations().get("geometry"); assertQuery(gridPoint.getBuckets(), queryBuilder, i); } @@ -307,7 +307,7 @@ public class GeoGridAggAndQueryConsistencyIT extends ESIntegTestCase { for (InternalGeoGridBucket bucket : buckets) { assertThat(bucket.getDocCount(), Matchers.greaterThan(0L)); QueryBuilder queryBuilder = queryFunction.apply("geometry", bucket.getKeyAsString()); - SearchResponse response = client().prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); + SearchResponse response = prepareSearch("test").setTrackTotalHits(true).setQuery(queryBuilder).get(); assertThat( "Expected hits at precision " + precision + " for H3 cell " + bucket.getKeyAsString(), response.getHits().getTotalHits().value, 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 61179bdd60b9..31158b2371e5 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 @@ -178,7 +178,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { indexRandom(true, client().prepareIndex("test").setId("0").setSource(source, XContentType.JSON)); - SearchResponse searchResponse = client().prepareSearch("test").setFetchSource(false).addStoredField("shape").get(); + SearchResponse searchResponse = prepareSearch("test").setFetchSource(false).addStoredField("shape").get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); SearchHit searchHit = searchResponse.getHits().getAt(0); assertThat(searchHit.field("shape").getValue(), instanceOf(BytesRef.class)); diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java index d3ee69bf41ea..8a64f64ed958 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java @@ -103,7 +103,7 @@ public class LegacyGeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { })); // test self crossing of circles - SearchResponse searchResponse = client().prepareSearch("test").setQuery(geoShapeQuery("shape", new Circle(30, 50, 77000))).get(); + SearchResponse searchResponse = prepareSearch("test").setQuery(geoShapeQuery("shape", new Circle(30, 50, 77000))).get(); assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L)); } } diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/SpatialQueryStringIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/SpatialQueryStringIT.java index 6ff882f97e31..04f260fa1f1c 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/SpatialQueryStringIT.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/SpatialQueryStringIT.java @@ -63,32 +63,26 @@ public class SpatialQueryStringIT extends ESIntegTestCase { ); // nothing matches indexRandom(true, false, reqs); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("foo")), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("foo")), 0L); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("\"2015/09/02\"")), 0L); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("127.0.0.1 OR 1.8")), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("127.0.0.1 OR 1.8")), 0L); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)")), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)")), 0L); Exception e = expectThrows( Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("geo_shape")).get() + () -> prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("geo_shape")).get() ); assertThat(e.getCause().getMessage(), containsString("Field [geo_shape] of type [geo_shape] does not support match queries")); - e = expectThrows( - Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("shape")).get() - ); + e = expectThrows(Exception.class, () -> prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("shape")).get()); assertThat(e.getCause().getMessage(), containsString("Field [shape] of type [shape] does not support match queries")); - e = expectThrows( - Exception.class, - () -> client().prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("point")).get() - ); + e = expectThrows(Exception.class, () -> prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("point")).get()); assertThat(e.getCause().getMessage(), containsString("Field [point] of type [point] does not support match queries")); - assertHitCount(client().prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("*shape")), 0L); + assertHitCount(prepareSearch("test").setQuery(queryStringQuery("POINT(0 0)").field("*shape")), 0L); } } diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/WatcherConcreteIndexTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/WatcherConcreteIndexTests.java index 8df698d8150d..1ce21cae4aee 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/WatcherConcreteIndexTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/WatcherConcreteIndexTests.java @@ -48,7 +48,7 @@ public class WatcherConcreteIndexTests extends AbstractWatcherIntegrationTestCas assertBusy(() -> timeWarp().trigger("mywatch")); assertBusy(() -> { - SearchResponse searchResult = client().prepareSearch(watchResultsIndex).setTrackTotalHits(true).get(); + SearchResponse searchResult = prepareSearch(watchResultsIndex).setTrackTotalHits(true).get(); assertThat((int) searchResult.getHits().getTotalHits().value, greaterThan(0)); }); } diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java index cc0490664ec8..4f679742c686 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/TimeThrottleIntegrationTests.java @@ -96,8 +96,7 @@ public class TimeThrottleIntegrationTests extends AbstractWatcherIntegrationTest assertBusy(() -> { ensureGreen(HistoryStoreField.DATA_STREAM); refresh(HistoryStoreField.DATA_STREAM + "*"); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSize(1) + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSize(1) .setSource(new SearchSourceBuilder().query(QueryBuilders.boolQuery().must(termQuery("watch_id", id)))) .addSort(SortBuilders.fieldSort("result.execution_time").order(SortOrder.DESC)) .get(); @@ -115,8 +114,7 @@ public class TimeThrottleIntegrationTests extends AbstractWatcherIntegrationTest assertBusy(() -> { // Watcher history is now written asynchronously, so we check this in an assertBusy ensureGreen(HistoryStoreField.DATA_STREAM); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSize(0) + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSize(0) .setSource(new SearchSourceBuilder().query(QueryBuilders.boolQuery().must(termQuery("watch_id", id)))) .get(); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java index ee0cd616461c..00c960e5631b 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/actions/email/EmailAttachmentTests.java @@ -194,10 +194,9 @@ public class EmailAttachmentTests extends AbstractWatcherIntegrationTestCase { assertBusy(() -> { SearchResponse searchResponse; try { - searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setQuery(QueryBuilders.termQuery("watch_id", "_test_id")) - .execute() - .actionGet(); + searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setQuery( + QueryBuilders.termQuery("watch_id", "_test_id") + ).execute().actionGet(); } catch (SearchPhaseExecutionException e) { if (e.getCause() instanceof NoShardAvailableActionException) { // Nothing has created the index yet diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/ArrayCompareConditionSearchTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/ArrayCompareConditionSearchTests.java index cfa70942566e..2a16bfe0b491 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/ArrayCompareConditionSearchTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/ArrayCompareConditionSearchTests.java @@ -44,9 +44,9 @@ public class ArrayCompareConditionSearchTests extends AbstractWatcherIntegration refresh(); - SearchResponse response = client().prepareSearch(index) - .addAggregation(AggregationBuilders.terms("top_tweeters").field("user.screen_name.keyword").size(3)) - .get(); + SearchResponse response = prepareSearch(index).addAggregation( + AggregationBuilders.terms("top_tweeters").field("user.screen_name.keyword").size(3) + ).get(); ArrayCompareCondition condition = new ArrayCompareCondition( "ctx.payload.aggregations.top_tweeters.buckets", @@ -80,8 +80,7 @@ public class ArrayCompareConditionSearchTests extends AbstractWatcherIntegration client().prepareIndex(index).setSource(source("fights_for_the_users", "you know, for the users", numberOfDocuments)).get(); refresh(); - response = client().prepareSearch(index) - .addAggregation(AggregationBuilders.terms("top_tweeters").field("user.screen_name.keyword").size(3)) + response = prepareSearch(index).addAggregation(AggregationBuilders.terms("top_tweeters").field("user.screen_name.keyword").size(3)) .get(); ctx = mockExecutionContext("_name", new Payload.XContent(response, ToXContent.EMPTY_PARAMS)); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/CompareConditionSearchTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/CompareConditionSearchTests.java index ac728f59d5d3..9f957e8dc959 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/CompareConditionSearchTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/condition/CompareConditionSearchTests.java @@ -40,14 +40,12 @@ public class CompareConditionSearchTests extends AbstractWatcherIntegrationTestC client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:30").get(); refresh(); - SearchResponse response = client().prepareSearch("my-index") - .addAggregation( - AggregationBuilders.dateHistogram("rate") - .field("@timestamp") - .fixedInterval(DateHistogramInterval.HOUR) - .order(BucketOrder.count(false)) - ) - .get(); + SearchResponse response = prepareSearch("my-index").addAggregation( + AggregationBuilders.dateHistogram("rate") + .field("@timestamp") + .fixedInterval(DateHistogramInterval.HOUR) + .order(BucketOrder.count(false)) + ).get(); CompareCondition condition = new CompareCondition( "ctx.payload.aggregations.rate.buckets.0.doc_count", @@ -66,14 +64,12 @@ public class CompareConditionSearchTests extends AbstractWatcherIntegrationTestC client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:40").get(); refresh(); - response = client().prepareSearch("my-index") - .addAggregation( - AggregationBuilders.dateHistogram("rate") - .field("@timestamp") - .fixedInterval(DateHistogramInterval.HOUR) - .order(BucketOrder.count(false)) - ) - .get(); + response = prepareSearch("my-index").addAggregation( + AggregationBuilders.dateHistogram("rate") + .field("@timestamp") + .fixedInterval(DateHistogramInterval.HOUR) + .order(BucketOrder.count(false)) + ).get(); ctx = mockExecutionContext("_name", new Payload.XContent(response, ToXContent.EMPTY_PARAMS)); result = condition.execute(ctx); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java index 6324b9fd9dc5..b0e71ecfa318 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateEmailMappingsTests.java @@ -95,15 +95,13 @@ public class HistoryTemplateEmailMappingsTests extends AbstractWatcherIntegratio // the action should fail as no email server is available assertWatchWithMinimumActionsCount("_id", ExecutionState.EXECUTED, 1); - SearchResponse response = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSource( - searchSource().aggregation(terms("from").field("result.actions.email.message.from")) - .aggregation(terms("to").field("result.actions.email.message.to")) - .aggregation(terms("cc").field("result.actions.email.message.cc")) - .aggregation(terms("bcc").field("result.actions.email.message.bcc")) - .aggregation(terms("reply_to").field("result.actions.email.message.reply_to")) - ) - .get(); + SearchResponse response = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource( + searchSource().aggregation(terms("from").field("result.actions.email.message.from")) + .aggregation(terms("to").field("result.actions.email.message.to")) + .aggregation(terms("cc").field("result.actions.email.message.cc")) + .aggregation(terms("bcc").field("result.actions.email.message.bcc")) + .aggregation(terms("reply_to").field("result.actions.email.message.reply_to")) + ).get(); assertThat(response, notNullValue()); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java index a5b6d8af85d9..36d2cf0239bd 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateHttpMappingsTests.java @@ -94,13 +94,11 @@ public class HistoryTemplateHttpMappingsTests extends AbstractWatcherIntegration // the action should fail as no email server is available assertWatchWithMinimumActionsCount("_id", ExecutionState.EXECUTED, 1); - SearchResponse response = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSource( - searchSource().aggregation(terms("input_result_path").field("result.input.http.request.path")) - .aggregation(terms("input_result_host").field("result.input.http.request.host")) - .aggregation(terms("webhook_path").field("result.actions.webhook.request.path")) - ) - .get(); + SearchResponse response = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource( + searchSource().aggregation(terms("input_result_path").field("result.input.http.request.path")) + .aggregation(terms("input_result_host").field("result.input.http.request.host")) + .aggregation(terms("webhook_path").field("result.actions.webhook.request.path")) + ).get(); assertThat(response, notNullValue()); assertThat(response.getHits().getTotalHits().value, is(oneOf(1L, 2L))); @@ -166,10 +164,7 @@ public class HistoryTemplateHttpMappingsTests extends AbstractWatcherIntegration assertBusy(() -> { // ensure watcher history index has been written with this id flushAndRefresh(HistoryStoreField.INDEX_PREFIX + "*"); - assertHitCount( - client().prepareSearch(HistoryStoreField.INDEX_PREFIX + "*").setQuery(QueryBuilders.termQuery("watch_id", id)), - 1L - ); + assertHitCount(prepareSearch(HistoryStoreField.INDEX_PREFIX + "*").setQuery(QueryBuilders.termQuery("watch_id", id)), 1L); }); // ensure that enabled is set to false diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java index 7b122d250785..ecd3424f8813 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateIndexActionMappingsTests.java @@ -48,9 +48,9 @@ public class HistoryTemplateIndexActionMappingsTests extends AbstractWatcherInte flush(); refresh(); - SearchResponse response = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSource(searchSource().aggregation(terms("index_action_indices").field("result.actions.index.response.index"))) - .get(); + SearchResponse response = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource( + searchSource().aggregation(terms("index_action_indices").field("result.actions.index.response.index")) + ).get(); assertThat(response, notNullValue()); assertThat(response.getHits().getTotalHits().value, is(oneOf(1L, 2L))); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java index 7cd5bce4372e..4fba54f7e020 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateSearchInputMappingsTests.java @@ -64,13 +64,11 @@ public class HistoryTemplateSearchInputMappingsTests extends AbstractWatcherInte // the action should fail as no email server is available assertWatchWithMinimumActionsCount("_id", ExecutionState.EXECUTED, 1); - SearchResponse response = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setSource( - searchSource().aggregation(terms("input_search_type").field("result.input.search.request.search_type")) - .aggregation(terms("input_indices").field("result.input.search.request.indices")) - .aggregation(terms("input_body").field("result.input.search.request.body")) - ) - .get(); + SearchResponse response = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource( + searchSource().aggregation(terms("input_search_type").field("result.input.search.request.search_type")) + .aggregation(terms("input_indices").field("result.input.search.request.indices")) + .aggregation(terms("input_body").field("result.input.search.request.body")) + ).get(); assertThat(response, notNullValue()); assertThat(response.getHits().getTotalHits().value, is(oneOf(1L, 2L))); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java index 1f0f38ac5be5..cec68468acf0 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/input/chain/ChainIntegrationTests.java @@ -82,7 +82,7 @@ public class ChainIntegrationTests extends AbstractWatcherIntegrationTestCase { public void assertWatchExecuted() { try { refresh(); - SearchResponse searchResponse = client().prepareSearch("my-index").get(); + SearchResponse searchResponse = prepareSearch("my-index").get(); assertHitCount(searchResponse, 1); assertThat(searchResponse.getHits().getAt(0).getSourceAsString(), containsString("the-most-awesome-index-ever")); } catch (IndexNotFoundException e) { diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index 12ae292f8da2..33852bca0724 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -315,12 +315,12 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase } protected long docCount(String index, SearchSourceBuilder source) { - SearchRequestBuilder builder = client().prepareSearch(index).setSource(source).setSize(0); + SearchRequestBuilder builder = prepareSearch(index).setSource(source).setSize(0); return builder.get().getHits().getTotalHits().value; } protected SearchResponse searchHistory(SearchSourceBuilder builder) { - return client().prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource(builder).get(); + return prepareSearch(HistoryStoreField.DATA_STREAM + "*").setSource(builder).get(); } protected T getInstanceFromMaster(Class type) { @@ -371,8 +371,9 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase } refresh(); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setIndicesOptions( + IndicesOptions.lenientExpandOpen() + ) .setQuery(boolQuery().must(matchQuery("watch_id", watchName)).must(matchQuery("state", ExecutionState.EXECUTED.id()))) .get(); lastResponse.set(searchResponse); @@ -403,17 +404,16 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase } protected SearchResponse searchWatchRecords(Consumer requestBuilderCallback) { - SearchRequestBuilder builder = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*"); + SearchRequestBuilder builder = prepareSearch(HistoryStoreField.DATA_STREAM + "*"); requestBuilderCallback.accept(builder); return builder.get(); } protected long findNumberOfPerformedActions(String watchName) { refresh(); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) - .setQuery(boolQuery().must(matchQuery("watch_id", watchName)).must(matchQuery("state", ExecutionState.EXECUTED.id()))) - .get(); + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setIndicesOptions( + IndicesOptions.lenientExpandOpen() + ).setQuery(boolQuery().must(matchQuery("watch_id", watchName)).must(matchQuery("state", ExecutionState.EXECUTED.id()))).get(); return searchResponse.getHits().getTotalHits().value; } @@ -438,8 +438,9 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase assertThat(routingTable.allPrimaryShardsActive(), is(true)); } refresh(); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setIndicesOptions( + IndicesOptions.lenientExpandOpen() + ) .setQuery( boolQuery().must(matchQuery("watch_id", watchName)) .must(matchQuery("state", ExecutionState.EXECUTION_NOT_NEEDED.id())) @@ -477,10 +478,9 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase } refresh(); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setIndicesOptions(IndicesOptions.lenientExpandOpen()) - .setQuery(boolQuery().must(matchQuery("watch_id", watchName)).must(matchQuery("state", recordState.id()))) - .get(); + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setIndicesOptions( + IndicesOptions.lenientExpandOpen() + ).setQuery(boolQuery().must(matchQuery("watch_id", watchName)).must(matchQuery("state", recordState.id()))).get(); assertThat( "could not find executed watch record", searchResponse.getHits().getTotalHits().value, diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java index 0acefafb50ca..2d64fcb7bc83 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java @@ -134,7 +134,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { assertThat(deleteWatchResponse.isFound(), is(true)); refresh(); - assertHitCount(client().prepareSearch(Watch.INDEX).setSize(0), 0L); + assertHitCount(prepareSearch(Watch.INDEX).setSize(0), 0L); // Deleting the same watch for the second time deleteWatchResponse = new DeleteWatchRequestBuilder(client()).setId("_name").get(); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java index 6c4a75929733..c32246e33c57 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BootStrapTests.java @@ -193,7 +193,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { ); } bulkRequestBuilder.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); - assertHitCount(client().prepareSearch(Watch.INDEX).setSize(0), numWatches); + assertHitCount(prepareSearch(Watch.INDEX).setSize(0), numWatches); startWatcher(); @@ -318,12 +318,12 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { assertThat(maxSize, equalTo(0L)); refresh(); - SearchResponse searchResponse = client().prepareSearch("output").get(); + SearchResponse searchResponse = prepareSearch("output").get(); assertThat(searchResponse.getHits().getTotalHits().value, is(greaterThanOrEqualTo(numberOfWatches))); long successfulWatchExecutions = searchResponse.getHits().getTotalHits().value; // the watch history should contain entries for each triggered watch, which a few have been marked as not executed - SearchResponse historySearchResponse = client().prepareSearch(HistoryStoreField.INDEX_PREFIX + "*").setSize(10000).get(); + SearchResponse historySearchResponse = prepareSearch(HistoryStoreField.INDEX_PREFIX + "*").setSize(10000).get(); assertHitCount(historySearchResponse, expectedWatchHistoryCount); long notExecutedCount = Arrays.stream(historySearchResponse.getHits().getHits()) .filter(hit -> hit.getSourceAsMap().get("state").equals(ExecutionState.NOT_EXECUTED_ALREADY_QUEUED.id())) @@ -402,7 +402,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { // but even then since the execution of the watch record is async it may take a little bit before // the actual documents are in the output index refresh(); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM).setSize(numRecords).get(); + SearchResponse searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM).setSize(numRecords).get(); assertThat(searchResponse.getHits().getTotalHits().value, Matchers.equalTo((long) numRecords)); for (int i = 0; i < numRecords; i++) { assertThat(searchResponse.getHits().getAt(i).getSourceAsMap().get("state"), is(ExecutionState.EXECUTED.id())); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java index 3e176f396fab..2332ef24ff5e 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java @@ -73,7 +73,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase assertBusy(() -> { flushAndRefresh(".watcher-history-*"); - assertHitCount(client().prepareSearch(".watcher-history-*"), 1); + assertHitCount(prepareSearch(".watcher-history-*"), 1); }); } @@ -106,7 +106,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase assertBusy(() -> { refresh(".watcher-history*"); - assertHitCount(client().prepareSearch(".watcher-history*").setSize(0), 1); + assertHitCount(prepareSearch(".watcher-history*").setSize(0), 1); }); // as fields with dots are allowed in 5.0 again, the mapping must be checked in addition @@ -151,7 +151,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase assertBusy(() -> { refresh(".watcher-history*"); - assertHitCount(client().prepareSearch(".watcher-history*").setSize(0), 1); + assertHitCount(prepareSearch(".watcher-history*").setSize(0), 1); }); // as fields with dots are allowed in 5.0 again, the mapping must be checked in addition @@ -187,7 +187,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase assertBusy(() -> { refresh(".watcher-history*"); - SearchResponse searchResponse = client().prepareSearch(".watcher-history*").setSize(1).get(); + SearchResponse searchResponse = prepareSearch(".watcher-history*").setSize(1).get(); assertHitCount(searchResponse, 1); SearchHit hit = searchResponse.getHits().getAt(0); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java index 817b8a4d7ff9..5c4039566661 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/RejectedExecutionTests.java @@ -50,7 +50,7 @@ public class RejectedExecutionTests extends AbstractWatcherIntegrationTestCase { assertBusy(() -> { flushAndRefresh(".watcher-history-*"); - SearchResponse searchResponse = client().prepareSearch(".watcher-history-*").get(); + SearchResponse searchResponse = prepareSearch(".watcher-history-*").get(); assertThat(searchResponse.getHits().getTotalHits().value, greaterThanOrEqualTo(2L)); }); } diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java index de53486c235d..be9b2da6e739 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/SingleNodeTests.java @@ -67,7 +67,7 @@ public class SingleNodeTests extends AbstractWatcherIntegrationTestCase { assertBusy(() -> { RefreshResponse refreshResponse = indicesAdmin().prepareRefresh(".watcher-history*").get(); assertThat(refreshResponse.getStatus(), equalTo(RestStatus.OK)); - SearchResponse searchResponse = client().prepareSearch(".watcher-history*").setSize(0).get(); + SearchResponse searchResponse = prepareSearch(".watcher-history*").setSize(0).get(); assertThat(searchResponse.getHits().getTotalHits().value, is(greaterThanOrEqualTo(1L))); }, 30, TimeUnit.SECONDS); } diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java index 82f302b6fb44..83a3b175819b 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchAckTests.java @@ -236,7 +236,7 @@ public class WatchAckTests extends AbstractWatcherIntegrationTestCase { assertThat(ackResponse.getStatus().actionStatus("_id").ackStatus().state(), is(ActionStatus.AckStatus.State.ACKED)); refresh("actions"); - long countAfterAck = client().prepareSearch("actions").setQuery(matchAllQuery()).get().getHits().getTotalHits().value; + long countAfterAck = prepareSearch("actions").setQuery(matchAllQuery()).get().getHits().getTotalHits().value; assertThat(countAfterAck, greaterThanOrEqualTo(1L)); restartWatcherRandomly(); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java index 4f5fabac8197..bb4fa3b12bab 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/WatchMetadataTests.java @@ -68,9 +68,7 @@ public class WatchMetadataTests extends AbstractWatcherIntegrationTestCase { refresh(); SearchResponse searchResponse; try { - searchResponse = client().prepareSearch(HistoryStoreField.DATA_STREAM + "*") - .setQuery(termQuery("metadata.foo", "bar")) - .get(); + searchResponse = prepareSearch(HistoryStoreField.DATA_STREAM + "*").setQuery(termQuery("metadata.foo", "bar")).get(); } catch (SearchPhaseExecutionException e) { if (e.getCause() instanceof NoShardAvailableActionException) { // Nothing has created the index yet diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java index 75489785dfaa..5ea85eb81398 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transform/TransformIntegrationTests.java @@ -141,13 +141,13 @@ public class TransformIntegrationTests extends AbstractWatcherIntegrationTestCas assertWatchWithMinimumPerformedActionsCount("_id2", 1, false); refresh(); - SearchResponse response = client().prepareSearch("output1").get(); + SearchResponse response = prepareSearch("output1").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat(response.getHits().getAt(0).getSourceAsMap().get("key3").toString(), equalTo("20")); - response = client().prepareSearch("output2").get(); + response = prepareSearch("output2").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); @@ -186,12 +186,12 @@ public class TransformIntegrationTests extends AbstractWatcherIntegrationTestCas assertWatchWithMinimumPerformedActionsCount("_id2", 1, false); refresh(); - SearchResponse response = client().prepareSearch("output1").get(); + SearchResponse response = prepareSearch("output1").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsString(), containsString("mytestresult")); - response = client().prepareSearch("output2").get(); + response = prepareSearch("output2").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsString(), containsString("mytestresult")); @@ -225,13 +225,13 @@ public class TransformIntegrationTests extends AbstractWatcherIntegrationTestCas assertWatchWithMinimumPerformedActionsCount("_id2", 1, false); refresh(); - SearchResponse response = client().prepareSearch("output1").get(); + SearchResponse response = prepareSearch("output1").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); assertThat(response.getHits().getAt(0).getSourceAsMap().get("key4").toString(), equalTo("30")); - response = client().prepareSearch("output2").get(); + response = prepareSearch("output2").get(); assertNoFailures(response); assertThat(response.getHits().getTotalHits().value, greaterThanOrEqualTo(1L)); assertThat(response.getHits().getAt(0).getSourceAsMap().size(), equalTo(1)); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java index 3cbf38fb8af4..e48c4efd32b0 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/delete/DeleteWatchTests.java @@ -81,9 +81,7 @@ public class DeleteWatchTests extends AbstractWatcherIntegrationTestCase { // during execution refresh(HistoryStoreField.INDEX_PREFIX + "*"); - SearchResponse searchResponse = client().prepareSearch(HistoryStoreField.INDEX_PREFIX + "*") - .setQuery(matchAllQuery()) - .get(); + SearchResponse searchResponse = prepareSearch(HistoryStoreField.INDEX_PREFIX + "*").setQuery(matchAllQuery()).get(); assertHitCount(searchResponse, 1); Map source = searchResponse.getHits().getAt(0).getSourceAsMap();