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 37e782cd7c61..44e708e00d4d 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 @@ -61,19 +61,19 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { for (int i = 0; i < numTag1Docs; i++) { numSingleTag1Docs++; XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).field("tag", "tag1").endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { // randomly index the document twice so that we have deleted // docs that match the filter - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } for (int i = numTag1Docs; i < (numTag1Docs + numTag2Docs); i++) { numSingleTag2Docs++; XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).field("tag", "tag2").endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } for (int i = numTag1Docs + numTag2Docs; i < numDocs; i++) { @@ -81,17 +81,15 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase { numTag1Docs++; numTag2Docs++; XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).array("tag", "tag1", "tag2").endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } prepareCreate("empty_bucket_idx").setMapping("value", "type=integer").get(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } indexRandom(true, builders); 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 4d64ad103013..714af4d8c40d 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 @@ -80,8 +80,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase { BulkRequestBuilder bulkRequestBuilder = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); for (int j = 0; j < numberOfDocsPerRefresh; j++) { bulkRequestBuilder.add( - client().prepareIndex("test") - .setOpType(DocWriteRequest.OpType.CREATE) + prepareIndex("test").setOpType(DocWriteRequest.OpType.CREATE) .setSource( "@timestamp", now + (long) i * numberOfDocsPerRefresh + j, 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 3f7d52c32e8d..2050ce20b1ae 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 @@ -170,7 +170,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { tsValues.put(timestamp, metrics); docSource.field("@timestamp", timestamp); docSource.endObject(); - docs.add(client().prepareIndex("index" + findIndex(timestamp)).setOpType(DocWriteRequest.OpType.CREATE).setSource(docSource)); + docs.add(prepareIndex("index" + findIndex(timestamp)).setOpType(DocWriteRequest.OpType.CREATE).setSource(docSource)); } indexRandom(true, false, docs); } @@ -503,20 +503,20 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase { ); client().prepareBulk() - .add(client().prepareIndex("test").setId("2").setSource("key", "bar", "val", 2, "@timestamp", "2021-01-01T00:00:10Z")) - .add(client().prepareIndex("test").setId("1").setSource("key", "bar", "val", 10, "@timestamp", "2021-01-01T00:00:00Z")) + .add(prepareIndex("test").setId("2").setSource("key", "bar", "val", 2, "@timestamp", "2021-01-01T00:00:10Z")) + .add(prepareIndex("test").setId("1").setSource("key", "bar", "val", 10, "@timestamp", "2021-01-01T00:00:00Z")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); client().prepareBulk() - .add(client().prepareIndex("test").setId("4").setSource("key", "bar", "val", 50, "@timestamp", "2021-01-01T00:00:30Z")) - .add(client().prepareIndex("test").setId("3").setSource("key", "bar", "val", 40, "@timestamp", "2021-01-01T00:00:20Z")) + .add(prepareIndex("test").setId("4").setSource("key", "bar", "val", 50, "@timestamp", "2021-01-01T00:00:30Z")) + .add(prepareIndex("test").setId("3").setSource("key", "bar", "val", 40, "@timestamp", "2021-01-01T00:00:20Z")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); client().prepareBulk() - .add(client().prepareIndex("test").setId("7").setSource("key", "foo", "val", 20, "@timestamp", "2021-01-01T00:00:00Z")) - .add(client().prepareIndex("test").setId("8").setSource("key", "foo", "val", 30, "@timestamp", "2021-01-01T00:10:00Z")) - .add(client().prepareIndex("test").setId("5").setSource("key", "baz", "val", 20, "@timestamp", "2021-01-01T00:00:00Z")) - .add(client().prepareIndex("test").setId("6").setSource("key", "baz", "val", 30, "@timestamp", "2021-01-01T00:10:00Z")) + .add(prepareIndex("test").setId("7").setSource("key", "foo", "val", 20, "@timestamp", "2021-01-01T00:00:00Z")) + .add(prepareIndex("test").setId("8").setSource("key", "foo", "val", 30, "@timestamp", "2021-01-01T00:10:00Z")) + .add(prepareIndex("test").setId("5").setSource("key", "baz", "val", 20, "@timestamp", "2021-01-01T00:00:00Z")) + .add(prepareIndex("test").setId("6").setSource("key", "baz", "val", 30, "@timestamp", "2021-01-01T00:10:00Z")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); 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 7fddc65ac3e0..5c58b7f7bff5 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 @@ -67,7 +67,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase { final BulkRequestBuilder bulkIndexRequest = client().prepareBulk(); for (int docId = 0; docId < numberOfDocuments; docId++) { final XContentBuilder document = timeSeriesDocument(FOO_DIM_VALUE, BAR_DIM_VALUE, BAZ_DIM_VALUE, docId, timestamps::next); - bulkIndexRequest.add(client().prepareIndex("index").setOpType(DocWriteRequest.OpType.CREATE).setSource(document)); + bulkIndexRequest.add(prepareIndex("index").setOpType(DocWriteRequest.OpType.CREATE).setSource(document)); } final BulkResponse bulkIndexResponse = bulkIndexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); 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 14bae46e1e00..ce7e4c63dc69 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 @@ -64,21 +64,20 @@ public class DateDerivativeIT extends ESIntegTestCase { } private static IndexRequestBuilder indexDoc(String idx, ZonedDateTime date, int value) throws Exception { - return client().prepareIndex(idx).setSource(jsonBuilder().startObject().timeField("date", date).field("value", value).endObject()); + return prepareIndex(idx).setSource(jsonBuilder().startObject().timeField("date", date).field("value", value).endObject()); } private IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception { - return client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("value", value) - .timeField("date", date(month, day)) - .startArray("dates") - .timeValue(date(month, day)) - .timeValue(date(month + 1, day + 1)) - .endArray() - .endObject() - ); + return prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("value", value) + .timeField("date", date(month, day)) + .startArray("dates") + .timeValue(date(month, day)) + .timeValue(date(month + 1, day + 1)) + .endArray() + .endObject() + ); } @Override @@ -90,9 +89,7 @@ public class DateDerivativeIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } builders.addAll( 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 e0c91689b333..7cbb298f4993 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 @@ -142,8 +142,9 @@ public class SerialDiffIT extends AggregationIntegTestCase { for (PipelineAggregationHelperTests.MockBucket mockBucket : mockHisto) { for (double value : mockBucket.docValues) { builders.add( - client().prepareIndex("idx") - .setSource(jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject()) + prepareIndex("idx").setSource( + jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject() + ) ); } } 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 32e20aea3c2e..bb450f1cc43e 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 @@ -49,7 +49,7 @@ public class QueryStringWithAnalyzersIT extends ESIntegTestCase { .setMapping("field1", "type=text,analyzer=my_analyzer", "field2", "type=text,analyzer=my_analyzer") ); - client().prepareIndex("test").setId("1").setSource("field1", "foo bar baz", "field2", "not needed").get(); + prepareIndex("test").setId("1").setSource("field1", "foo bar baz", "field2", "not needed").get(); refresh(); assertHitCount( diff --git a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadAnalyzerTests.java b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadAnalyzerTests.java index 97a7e31904ee..2ef1a7639e59 100644 --- a/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadAnalyzerTests.java +++ b/modules/analysis-common/src/internalClusterTest/java/org/elasticsearch/analysis/common/ReloadAnalyzerTests.java @@ -91,7 +91,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .setMapping("field", "type=text,analyzer=standard,search_analyzer=" + SYNONYM_ANALYZER_NAME) ); - client().prepareIndex(INDEX_NAME).setId("1").setSource("field", "Foo").get(); + prepareIndex(INDEX_NAME).setId("1").setSource("field", "Foo").get(); assertNoFailures(indicesAdmin().prepareRefresh(INDEX_NAME).get()); assertHitCount(client().prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); @@ -161,7 +161,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .setMapping("field", "type=text,analyzer=standard,search_analyzer=" + SYNONYM_ANALYZER_NAME) ); - client().prepareIndex(INDEX_NAME).setId("1").setSource("field", "foo").get(); + prepareIndex(INDEX_NAME).setId("1").setSource("field", "foo").get(); assertNoFailures(indicesAdmin().prepareRefresh(INDEX_NAME).get()); assertHitCount(client().prepareSearch(INDEX_NAME).setQuery(QueryBuilders.matchQuery("field", "baz")), 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 d08ae1a31008..d55dbd0f1d78 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 @@ -70,7 +70,7 @@ public class ReloadSynonymAnalyzerIT extends ESIntegTestCase { .setMapping("field", "type=text,analyzer=standard,search_analyzer=my_synonym_analyzer") ); - client().prepareIndex("test").setId("1").setSource("field", "foo").get(); + prepareIndex("test").setId("1").setSource("field", "foo").get(); assertNoFailures(indicesAdmin().prepareRefresh("test").get()); assertHitCount(prepareSearch("test").setQuery(QueryBuilders.matchQuery("field", "baz")), 1L); 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 9c46e8830647..2693245ac275 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 @@ -109,7 +109,7 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { .putList("analysis.analyzer.search_autocomplete.filter", "lowercase", "wordDelimiter") ) ); - client().prepareIndex("test").setId("1").setSource("name", "ARCOTEL Hotels Deutschland").get(); + prepareIndex("test").setId("1").setSource("name", "ARCOTEL Hotels Deutschland").get(); refresh(); assertResponse( prepareSearch("test").setQuery(matchQuery("name.autocomplete", "deut tel").operator(Operator.OR)) @@ -151,8 +151,7 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( "body", "Test: http://www.facebook.com http://elasticsearch.org " @@ -212,7 +211,7 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setId("0").setSource("field1", "The quick brown fox jumps over the lazy dog").get(); + prepareIndex("test").setId("0").setSource("field1", "The quick brown fox jumps over the lazy dog").get(); refresh(); for (String highlighterType : new String[] { "plain", "fvh", "unified" }) { logger.info("--> highlighting (type=" + highlighterType + ") and searching on field1"); @@ -249,14 +248,10 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("first_test_index") - .setId("0") + prepareIndex("first_test_index").setId("0") .setSource("field0", "The quick brown fox jumps over the lazy dog", "field1", "The quick brown fox jumps over the lazy dog") .get(); - client().prepareIndex("first_test_index") - .setId("1") - .setSource("field1", "The quick browse button is a fancy thing, right bro?") - .get(); + prepareIndex("first_test_index").setId("1").setSource("field1", "The quick browse button is a fancy thing, right bro?").get(); refresh(); logger.info("--> highlighting and searching on field0"); @@ -329,8 +324,7 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { "type=text,analyzer=synonym" ) ); - client().prepareIndex("second_test_index") - .setId("0") + prepareIndex("second_test_index").setId("0") .setSource( "type", "type2", @@ -340,11 +334,10 @@ public class HighlighterWithAnalyzersTests extends ESIntegTestCase { "The quick brown fox jumps over the lazy dog" ) .get(); - client().prepareIndex("second_test_index") - .setId("1") + prepareIndex("second_test_index").setId("1") .setSource("type", "type2", "field4", "The quick browse button is a fancy thing, right bro?") .get(); - client().prepareIndex("second_test_index").setId("2").setSource("type", "type2", "field4", "a quick fast blue car").get(); + prepareIndex("second_test_index").setId("2").setSource("type", "type2", "field4", "a quick fast blue car").get(); refresh(); assertResponse( 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 0fd9a036b4a5..fc5b4500dc5d 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 @@ -542,8 +542,7 @@ public class DataStreamIT extends ESIntegTestCase { verifyResolvability( dataStreamName, - client().prepareIndex(dataStreamName) - .setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON) + prepareIndex(dataStreamName).setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE), false ); @@ -586,8 +585,7 @@ public class DataStreamIT extends ESIntegTestCase { client().execute(CreateDataStreamAction.INSTANCE, request).actionGet(); verifyResolvability( "logs-barbaz", - client().prepareIndex("logs-barbaz") - .setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON) + prepareIndex("logs-barbaz").setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE), false ); @@ -703,13 +701,11 @@ public class DataStreamIT extends ESIntegTestCase { public void testDataSteamAliasWithFilter() throws Exception { putComposableIndexTemplate("id1", List.of("logs-*")); String dataStreamName = "logs-foobar"; - client().prepareIndex(dataStreamName) - .setId("1") + prepareIndex(dataStreamName).setId("1") .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"x\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); - client().prepareIndex(dataStreamName) - .setId("2") + prepareIndex(dataStreamName).setId("2") .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"y\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); @@ -778,13 +774,11 @@ public class DataStreamIT extends ESIntegTestCase { public void testSearchFilteredAndUnfilteredAlias() throws Exception { putComposableIndexTemplate("id1", List.of("logs-*")); String dataStreamName = "logs-foobar"; - client().prepareIndex(dataStreamName) - .setId("1") + prepareIndex(dataStreamName).setId("1") .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"x\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); - client().prepareIndex(dataStreamName) - .setId("2") + prepareIndex(dataStreamName).setId("2") .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"y\"}", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataTierDataStreamIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataTierDataStreamIT.java index 69c28a06bb20..672d2d21d73a 100644 --- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataTierDataStreamIT.java +++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataTierDataStreamIT.java @@ -43,8 +43,7 @@ public class DataTierDataStreamIT extends ESIntegTestCase { new PutComposableIndexTemplateAction.Request("template").indexTemplate(template) ).actionGet(); - var dsIndexName = client().prepareIndex(index) - .setCreate(true) + var dsIndexName = prepareIndex(index).setCreate(true) .setId("1") .setSource("@timestamp", "2020-09-09") .setWaitForActiveShards(0) diff --git a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/SystemDataStreamSnapshotIT.java b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/SystemDataStreamSnapshotIT.java index e1c7a54cdc5a..698656dfa740 100644 --- a/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/SystemDataStreamSnapshotIT.java +++ b/modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/SystemDataStreamSnapshotIT.java @@ -64,8 +64,7 @@ public class SystemDataStreamSnapshotIT extends AbstractSnapshotIntegTestCase { } // Index a doc so that a concrete backing index will be created - DocWriteResponse indexRepsonse = client().prepareIndex(SYSTEM_DATA_STREAM_NAME) - .setId("42") + DocWriteResponse indexRepsonse = prepareIndex(SYSTEM_DATA_STREAM_NAME).setId("42") .setSource("{ \"@timestamp\": \"2099-03-08T11:06:07.000Z\", \"name\": \"my-name\" }", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); @@ -162,16 +161,14 @@ public class SystemDataStreamSnapshotIT extends AbstractSnapshotIntegTestCase { } // Index a doc so that a concrete backing index will be created - DocWriteResponse indexToDataStreamResponse = client().prepareIndex(SYSTEM_DATA_STREAM_NAME) - .setId("42") + DocWriteResponse indexToDataStreamResponse = prepareIndex(SYSTEM_DATA_STREAM_NAME).setId("42") .setSource("{ \"@timestamp\": \"2099-03-08T11:06:07.000Z\", \"name\": \"my-name\" }", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); assertThat(indexToDataStreamResponse.status().getStatus(), oneOf(200, 201)); // Index a doc so that a concrete backing index will be created - DocWriteResponse indexResponse = client().prepareIndex("my-index") - .setId("42") + DocWriteResponse indexResponse = prepareIndex("my-index").setId("42") .setSource("{ \"name\": \"my-name\" }", XContentType.JSON) .setOpType(DocWriteRequest.OpType.CREATE) .get(); diff --git a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java index 5709fbd9d8bf..0ff34cf68750 100644 --- a/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java +++ b/modules/ingest-common/src/internalClusterTest/java/org/elasticsearch/ingest/common/IngestRestartIT.java @@ -88,8 +88,7 @@ public class IngestRestartIT extends ESIntegTestCase { Exception e = expectThrows( Exception.class, - () -> client().prepareIndex("index") - .setId("1") + () -> prepareIndex("index").setId("1") .setSource("x", 0) .setPipeline(pipelineId) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) @@ -144,8 +143,7 @@ public class IngestRestartIT extends ESIntegTestCase { checkPipelineExists.accept(pipelineIdWithoutScript); checkPipelineExists.accept(pipelineIdWithScript); - client().prepareIndex("index") - .setId("1") + prepareIndex("index").setId("1") .setSource("x", 0) .setPipeline(pipelineIdWithoutScript) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) @@ -153,8 +151,7 @@ public class IngestRestartIT extends ESIntegTestCase { IllegalStateException exception = expectThrows( IllegalStateException.class, - () -> client().prepareIndex("index") - .setId("2") + () -> prepareIndex("index").setId("2") .setSource("x", 0) .setPipeline(pipelineIdWithScript) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) @@ -194,12 +191,7 @@ public class IngestRestartIT extends ESIntegTestCase { }"""); clusterAdmin().preparePutPipeline("_id", pipeline, XContentType.JSON).get(); - client().prepareIndex("index") - .setId("1") - .setSource("x", 0) - .setPipeline("_id") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); Map source = client().prepareGet("index", "1").get().getSource(); assertThat(source.get("x"), equalTo(0)); @@ -213,12 +205,7 @@ public class IngestRestartIT extends ESIntegTestCase { internalCluster().fullRestart(); ensureYellow("index"); - client().prepareIndex("index") - .setId("2") - .setSource("x", 0) - .setPipeline("_id") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("index").setId("2").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); source = client().prepareGet("index", "2").get().getSource(); assertThat(source.get("x"), equalTo(0)); @@ -238,12 +225,7 @@ public class IngestRestartIT extends ESIntegTestCase { }"""); clusterAdmin().preparePutPipeline("_id", pipeline, XContentType.JSON).get(); - client().prepareIndex("index") - .setId("1") - .setSource("x", 0) - .setPipeline("_id") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); Map source = client().prepareGet("index", "1").get().getSource(); assertThat(source.get("x"), equalTo(0)); @@ -304,8 +286,7 @@ public class IngestRestartIT extends ESIntegTestCase { assertThat( expectThrows( ClusterBlockException.class, - () -> client().prepareIndex("index") - .setId("fails") + () -> prepareIndex("index").setId("fails") .setSource("x", 1) .setTimeout(TimeValue.timeValueMillis(100)) // 100ms, to fail quickly .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) @@ -316,8 +297,7 @@ public class IngestRestartIT extends ESIntegTestCase { // but this one should pass since it has a longer timeout final PlainActionFuture future = new PlainActionFuture<>(); - client().prepareIndex("index") - .setId("passes1") + prepareIndex("index").setId("passes1") .setSource("x", 2) .setTimeout(TimeValue.timeValueSeconds(60)) // wait for second node to start in below .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) @@ -331,7 +311,7 @@ public class IngestRestartIT extends ESIntegTestCase { assertThat(indexResponse.status(), equalTo(RestStatus.CREATED)); assertThat(indexResponse.getResult(), equalTo(DocWriteResponse.Result.CREATED)); - client().prepareIndex("index").setId("passes2").setSource("x", 3).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); + prepareIndex("index").setId("passes2").setSource("x", 3).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); // successfully indexed documents should have the value field set by the pipeline Map source = client().prepareGet("index", "passes1").get(timeout).getSource(); 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 77fa3d90c447..69e33863b0f2 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 @@ -78,7 +78,7 @@ public class MoreExpressionIT extends ESIntegTestCase { public void testBasic() throws Exception { createIndex("test"); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); assertResponse(buildRequest("doc['foo'] + 1"), rsp -> { assertEquals(1, rsp.getHits().getTotalHits().value); assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D); @@ -88,7 +88,7 @@ public class MoreExpressionIT extends ESIntegTestCase { public void testFunction() throws Exception { createIndex("test"); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); assertNoFailuresAndResponse(buildRequest("doc['foo'] + abs(1)"), rsp -> { assertEquals(1, rsp.getHits().getTotalHits().value); assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D); @@ -98,7 +98,8 @@ public class MoreExpressionIT extends ESIntegTestCase { public void testBasicUsingDotValue() throws Exception { createIndex("test"); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); + + prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get(); assertResponse(buildRequest("doc['foo'].value + 1"), rsp -> { assertEquals(1, rsp.getHits().getTotalHits().value); assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D); @@ -110,9 +111,9 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("text", "hello goodbye"), - client().prepareIndex("test").setId("2").setSource("text", "hello hello hello goodbye"), - client().prepareIndex("test").setId("3").setSource("text", "hello hello goodebye") + prepareIndex("test").setId("1").setSource("text", "hello goodbye"), + prepareIndex("test").setId("2").setSource("text", "hello hello hello goodbye"), + prepareIndex("test").setId("3").setSource("text", "hello hello goodebye") ); ScriptScoreFunctionBuilder score = ScoreFunctionBuilders.scriptFunction( new Script(ScriptType.INLINE, "expression", "1 / _score", Collections.emptyMap()) @@ -142,8 +143,8 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "date0", "2015-04-28T04:02:07Z", "date1", "1985-09-01T23:11:01Z"), - client().prepareIndex("test").setId("2").setSource("id", 2, "date0", "2013-12-25T11:56:45Z", "date1", "1983-10-13T23:15:00Z") + prepareIndex("test").setId("1").setSource("id", 1, "date0", "2015-04-28T04:02:07Z", "date1", "1985-09-01T23:11:01Z"), + prepareIndex("test").setId("2").setSource("id", 2, "date0", "2013-12-25T11:56:45Z", "date1", "1983-10-13T23:15:00Z") ); assertResponse(buildRequest("doc['date0'].getSeconds() - doc['date0'].getMinutes()"), rsp -> { assertEquals(2, rsp.getHits().getTotalHits().value); @@ -176,8 +177,8 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "date0", "2015-04-28T04:02:07Z", "date1", "1985-09-01T23:11:01Z"), - client().prepareIndex("test").setId("2").setSource("id", 2, "date0", "2013-12-25T11:56:45Z", "date1", "1983-10-13T23:15:00Z") + prepareIndex("test").setId("1").setSource("id", 1, "date0", "2015-04-28T04:02:07Z", "date1", "1985-09-01T23:11:01Z"), + prepareIndex("test").setId("2").setSource("id", 2, "date0", "2013-12-25T11:56:45Z", "date1", "1983-10-13T23:15:00Z") ); assertResponse(buildRequest("doc['date0'].date.secondOfMinute - doc['date0'].date.minuteOfHour"), rsp -> { assertEquals(2, rsp.getHits().getTotalHits().value); @@ -229,9 +230,9 @@ public class MoreExpressionIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource(doc1), - client().prepareIndex("test").setId("2").setSource(doc2), - client().prepareIndex("test").setId("3").setSource(doc3) + prepareIndex("test").setId("1").setSource(doc1), + prepareIndex("test").setId("2").setSource(doc2), + prepareIndex("test").setId("3").setSource(doc3) ); assertNoFailuresAndResponse(buildRequest("doc['double0'].count() + doc['double1'].count()"), rsp -> { @@ -312,7 +313,7 @@ public class MoreExpressionIT extends ESIntegTestCase { public void testInvalidDateMethodCall() throws Exception { ElasticsearchAssertions.assertAcked(prepareCreate("test").setMapping("double", "type=double")); ensureGreen("test"); - indexRandom(true, client().prepareIndex("test").setId("1").setSource("double", "178000000.0")); + indexRandom(true, prepareIndex("test").setId("1").setSource("double", "178000000.0")); try { buildRequest("doc['double'].getYear()").get(); fail(); @@ -335,8 +336,8 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "x", 4), - client().prepareIndex("test").setId("2").setSource("id", 2, "y", 2) + prepareIndex("test").setId("1").setSource("id", 1, "x", 4), + prepareIndex("test").setId("2").setSource("id", 2, "y", 2) ); assertNoFailuresAndResponse(buildRequest("doc['x'] + 1"), rsp -> { SearchHits hits = rsp.getHits(); @@ -349,7 +350,7 @@ public class MoreExpressionIT extends ESIntegTestCase { public void testMissingField() throws Exception { createIndex("test"); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("x", 4).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("x", 4).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("doc['bogus']").get(); fail("Expected missing field to cause failure"); @@ -368,9 +369,9 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "x", 10), - client().prepareIndex("test").setId("2").setSource("id", 2, "x", 3), - client().prepareIndex("test").setId("3").setSource("id", 3, "x", 5) + prepareIndex("test").setId("1").setSource("id", 1, "x", 10), + prepareIndex("test").setId("2").setSource("id", 2, "x", 3), + prepareIndex("test").setId("3").setSource("id", 3, "x", 5) ); // a = int, b = double, c = long String script = "doc['x'] * a + b + ((c + doc['x']) > 5000000009 ? 1 : 0)"; @@ -384,7 +385,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testCompileFailure() { - client().prepareIndex("test").setId("1").setSource("x", 1).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("x", 1).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("garbage%@#%@").get(); fail("Expected expression compilation failure"); @@ -395,7 +396,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testNonNumericParam() { - client().prepareIndex("test").setId("1").setSource("x", 1).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("x", 1).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("a", "a", "astring").get(); fail("Expected string parameter to cause failure"); @@ -410,7 +411,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testNonNumericField() { - client().prepareIndex("test").setId("1").setSource("text", "this is not a number").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("text", "this is not a number").setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("doc['text.keyword']").get(); fail("Expected text field to cause execution failure"); @@ -425,7 +426,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testInvalidGlobalVariable() { - client().prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("bogus").get(); fail("Expected bogus variable to cause execution failure"); @@ -440,7 +441,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testDocWithoutField() { - client().prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("doc").get(); fail("Expected doc variable without field to cause execution failure"); @@ -455,7 +456,7 @@ public class MoreExpressionIT extends ESIntegTestCase { } public void testInvalidFieldMember() { - client().prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", 5).setRefreshPolicy(IMMEDIATE).get(); try { buildRequest("doc['foo'].bogus").get(); fail("Expected bogus field member to cause execution failure"); @@ -475,9 +476,9 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("x", 5, "y", 1.2), - client().prepareIndex("test").setId("2").setSource("x", 10, "y", 1.4), - client().prepareIndex("test").setId("3").setSource("x", 13, "y", 1.8) + prepareIndex("test").setId("1").setSource("x", 5, "y", 1.2), + prepareIndex("test").setId("2").setSource("x", 10, "y", 1.4), + prepareIndex("test").setId("3").setSource("x", 13, "y", 1.8) ); SearchRequestBuilder req = prepareSearch().setIndices("test"); @@ -522,9 +523,9 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("text", "hello"), - client().prepareIndex("test").setId("2").setSource("text", "goodbye"), - client().prepareIndex("test").setId("3").setSource("text", "hello") + prepareIndex("test").setId("1").setSource("text", "hello"), + prepareIndex("test").setId("2").setSource("text", "goodbye"), + prepareIndex("test").setId("3").setSource("text", "hello") ); SearchRequestBuilder req = prepareSearch().setIndices("test"); @@ -555,7 +556,7 @@ public class MoreExpressionIT extends ESIntegTestCase { try { createIndex("test_index"); ensureGreen("test_index"); - indexRandom(true, client().prepareIndex("test_index").setId("1").setSource("text_field", "text")); + indexRandom(true, prepareIndex("test_index").setId("1").setSource("text_field", "text")); UpdateRequestBuilder urb = client().prepareUpdate().setIndex("test_index"); urb.setId("1"); urb.setScript(new Script(ScriptType.INLINE, ExpressionScriptEngine.NAME, "0", Collections.emptyMap())); @@ -575,11 +576,11 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("agg_index"); indexRandom( true, - client().prepareIndex("agg_index").setId("1").setSource("one", 1.0, "two", 2.0, "three", 3.0, "four", 4.0), - client().prepareIndex("agg_index").setId("2").setSource("one", 2.0, "two", 2.0, "three", 3.0, "four", 4.0), - client().prepareIndex("agg_index").setId("3").setSource("one", 3.0, "two", 2.0, "three", 3.0, "four", 4.0), - 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) + prepareIndex("agg_index").setId("1").setSource("one", 1.0, "two", 2.0, "three", 3.0, "four", 4.0), + prepareIndex("agg_index").setId("2").setSource("one", 2.0, "two", 2.0, "three", 3.0, "four", 4.0), + prepareIndex("agg_index").setId("3").setSource("one", 3.0, "two", 2.0, "three", 3.0, "four", 4.0), + prepareIndex("agg_index").setId("4").setSource("one", 4.0, "two", 2.0, "three", 3.0, "four", 4.0), + prepareIndex("agg_index").setId("5").setSource("one", 5.0, "two", 2.0, "three", 3.0, "four", 4.0) ); assertResponse( prepareSearch("agg_index").addAggregation( @@ -639,8 +640,7 @@ public class MoreExpressionIT extends ESIntegTestCase { xContentBuilder.endObject().endObject().endObject().endObject(); assertAcked(prepareCreate("test").setMapping(xContentBuilder)); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("name", "test") @@ -686,9 +686,9 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen(); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "price", 1.0, "vip", true), - client().prepareIndex("test").setId("2").setSource("id", 2, "price", 2.0, "vip", false), - client().prepareIndex("test").setId("3").setSource("id", 3, "price", 2.0, "vip", false) + prepareIndex("test").setId("1").setSource("id", 1, "price", 1.0, "vip", true), + prepareIndex("test").setId("2").setSource("id", 2, "price", 2.0, "vip", false), + prepareIndex("test").setId("3").setSource("id", 3, "price", 2.0, "vip", false) ); // access .value assertNoFailuresAndResponse(buildRequest("doc['vip'].value"), rsp -> { @@ -719,8 +719,8 @@ public class MoreExpressionIT extends ESIntegTestCase { ensureGreen("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("id", 1, "foo", 1.0), - client().prepareIndex("test").setId("2").setSource("id", 2, "foo", 0.0) + prepareIndex("test").setId("1").setSource("id", 1, "foo", 1.0), + prepareIndex("test").setId("2").setSource("id", 2, "foo", 0.0) ); SearchRequestBuilder builder = buildRequest("doc['foo'].value"); Script script = new Script(ScriptType.INLINE, "expression", "doc['foo'].value", Collections.emptyMap()); 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 dcf380d338c1..121a6b01ea79 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 @@ -41,7 +41,7 @@ public class StoredExpressionIT extends ESIntegTestCase { public void testAllOpsDisabledIndexedScripts() throws IOException { clusterAdmin().preparePutStoredScript().setId("script1").setContent(new BytesArray(""" {"script": {"lang": "expression", "source": "2"} }"""), XContentType.JSON).get(); - client().prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON).get(); try { client().prepareUpdate("test", "1").setScript(new Script(ScriptType.STORED, null, "script1", Collections.emptyMap())).get(); fail("update script should have been rejected"); diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java index 000728209456..d9e346454aef 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java @@ -59,9 +59,7 @@ public class MultiSearchTemplateIT extends ESIntegTestCase { final int numDocs = randomIntBetween(10, 100); IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - indexRequestBuilders[i] = client().prepareIndex("msearch") - .setId(String.valueOf(i)) - .setSource("odd", (i % 2 == 0), "group", (i % 3)); + indexRequestBuilders[i] = prepareIndex("msearch").setId(String.valueOf(i)).setSource("odd", (i % 2 == 0), "group", (i % 3)); } indexRandom(true, indexRequestBuilders); diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java index 517828cbeba3..77480e6bc9e6 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java @@ -55,8 +55,8 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { @Before public void setup() throws IOException { createIndex("test"); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "value1").endObject()).get(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("text", "value2").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "value1").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("text", "value2").endObject()).get(); indicesAdmin().prepareRefresh().get(); } @@ -166,11 +166,11 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { assertNotNull(getResponse.getSource()); BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); - bulkRequestBuilder.add(client().prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); bulkRequestBuilder.get(); indicesAdmin().prepareRefresh().get(); @@ -263,11 +263,11 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { assertAcked(clusterAdmin().preparePutStoredScript().setId("3").setContent(new BytesArray(script), XContentType.JSON)); BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); - bulkRequestBuilder.add(client().prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); bulkRequestBuilder.get(); indicesAdmin().prepareRefresh().get(); @@ -304,7 +304,7 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { createIndex("testindex"); ensureGreen("testindex"); - client().prepareIndex("testindex").setId("1").setSource(jsonBuilder().startObject().field("searchtext", "dev1").endObject()).get(); + prepareIndex("testindex").setId("1").setSource(jsonBuilder().startObject().field("searchtext", "dev1").endObject()).get(); indicesAdmin().prepareRefresh().get(); int iterations = randomIntBetween(2, 11); @@ -382,11 +382,11 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { }"""; assertAcked(clusterAdmin().preparePutStoredScript().setId("4").setContent(new BytesArray(multiQuery), XContentType.JSON)); BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); - bulkRequestBuilder.add(client().prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("3").setSource("{\"theField\":\"foo 3\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("4").setSource("{\"theField\":\"foo 4\"}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("test").setId("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON)); bulkRequestBuilder.get(); indicesAdmin().prepareRefresh().get(); 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 a7fe63eb34ce..2b9c35429c32 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 @@ -59,7 +59,7 @@ public class LegacyGeoShapeIT extends GeoShapeIntegTestCase { ); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setId("0").setSource("shape", (ToXContent) (builder, params) -> { + indexRandom(true, prepareIndex("test").setId("0").setSource("shape", (ToXContent) (builder, params) -> { builder.startObject() .field("type", "circle") .startArray("coordinates") diff --git a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeQueryTests.java b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeQueryTests.java index 6ef1f4c8a99b..6ad4d2c06c6d 100644 --- a/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeQueryTests.java +++ b/modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeQueryTests.java @@ -86,16 +86,14 @@ public class LegacyGeoShapeQueryTests extends GeoShapeQueryTestCase { // MULTIPOINT MultiPoint multiPoint = GeometryTestUtils.randomMultiPoint(false); - client().prepareIndex("geo_points_only") - .setId("1") + prepareIndex("geo_points_only").setId("1") .setSource(GeoJson.toXContent(multiPoint, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); // POINT Point point = GeometryTestUtils.randomPoint(false); - client().prepareIndex("geo_points_only") - .setId("2") + prepareIndex("geo_points_only").setId("2") .setSource(GeoJson.toXContent(point, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -125,8 +123,7 @@ public class LegacyGeoShapeQueryTests extends GeoShapeQueryTestCase { Geometry geometry = GeometryTestUtils.randomGeometry(false); try { - client().prepareIndex("geo_points_only") - .setId("1") + prepareIndex("geo_points_only").setId("1") .setSource(GeoJson.toXContent(geometry, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -161,8 +158,7 @@ public class LegacyGeoShapeQueryTests extends GeoShapeQueryTestCase { ensureGreen(); MultiPoint multiPoint = GeometryTestUtils.randomMultiPoint(false); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(GeoJson.toXContent(multiPoint, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); 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 3a7f9a1ca6eb..c6544bac2b13 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 @@ -106,14 +106,11 @@ public class RankFeaturesMapperIntegrationIT extends ESIntegTestCase { BulkResponse bulk = client().prepareBulk() .add( - client().prepareIndex(INDEX_NAME) - .setId("all") + prepareIndex(INDEX_NAME).setId("all") .setSource(Map.of("all_rank_features", Map.of(LOWER_RANKED_FEATURE, 10, HIGHER_RANKED_FEATURE, 20))) ) - .add(client().prepareIndex(INDEX_NAME).setId("lower").setSource(Map.of("all_rank_features", Map.of(LOWER_RANKED_FEATURE, 10)))) - .add( - client().prepareIndex(INDEX_NAME).setId("higher").setSource(Map.of("all_rank_features", Map.of(HIGHER_RANKED_FEATURE, 20))) - ) + .add(prepareIndex(INDEX_NAME).setId("lower").setSource(Map.of("all_rank_features", Map.of(LOWER_RANKED_FEATURE, 10)))) + .add(prepareIndex(INDEX_NAME).setId("higher").setSource(Map.of("all_rank_features", Map.of(HIGHER_RANKED_FEATURE, 20)))) .get(); assertFalse(bulk.buildFailureMessage(), bulk.hasFailures()); assertThat(refresh().getFailedShards(), equalTo(0)); 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 0bdfbc3d90ea..08a3d046b00f 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 @@ -176,7 +176,7 @@ public class TokenCountFieldMapperIntegrationIT extends ESIntegTestCase { } private IndexRequestBuilder prepareIndex(String id, String... texts) throws IOException { - return client().prepareIndex("test").setId(id).setSource("foo", texts); + return prepareIndex("test").setId(id).setSource("foo", texts); } private SearchRequestBuilder searchById(String id) { diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/BWCTemplateTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/BWCTemplateTests.java index 9ddbc72e8ff9..b4ee066a0e39 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/BWCTemplateTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/BWCTemplateTests.java @@ -34,8 +34,8 @@ public class BWCTemplateTests extends ESSingleNodeTestCase { indicesAdmin().preparePutTemplate("packetbeat").setSource(packetBeat, XContentType.JSON).get(); indicesAdmin().preparePutTemplate("filebeat").setSource(fileBeat, XContentType.JSON).get(); - client().prepareIndex("metricbeat-foo").setId("1").setSource("message", "foo").get(); - client().prepareIndex("packetbeat-foo").setId("1").setSource("message", "foo").get(); - client().prepareIndex("filebeat-foo").setId("1").setSource("message", "foo").get(); + prepareIndex("metricbeat-foo").setId("1").setSource("message", "foo").get(); + prepareIndex("packetbeat-foo").setId("1").setSource("message", "foo").get(); + prepareIndex("filebeat-foo").setId("1").setSource("message", "foo").get(); } } 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 4203eb446e2a..e433ce0b6059 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 @@ -511,7 +511,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "parent", "1", null, "p_field", 1).get(); createIndexRequest("test", "child", "2", "1", "c_field", 1).get(); - client().prepareIndex("test").setId("3").setSource("p_field", 1).get(); + prepareIndex("test").setId("3").setSource("p_field", 1).get(); refresh(); assertHitCountAndNoFailures( @@ -736,8 +736,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { 0L ); - client().prepareIndex("test") - .setSource(jsonBuilder().startObject().field("text", "value").endObject()) + prepareIndex("test").setSource(jsonBuilder().startObject().field("text", "value").endObject()) .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .get(); @@ -761,7 +760,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { createIndexRequest("test", "child", "2", "1", "c_field", 1).get(); indicesAdmin().prepareFlush("test").get(); - client().prepareIndex("test").setId("3").setSource("p_field", 2).get(); + prepareIndex("test").setId("3").setSource("p_field", 2).get(); refresh(); assertNoFailuresAndResponse( @@ -1303,7 +1302,7 @@ public class ChildQuerySearchIT extends ParentChildTestCase { ensureGreen(); String parentId = "p1"; - client().prepareIndex("test").setId(parentId).setSource("p_field", "1").get(); + prepareIndex("test").setId(parentId).setSource("p_field", "1").get(); refresh(); try { 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 02eaacba0b1d..f851678b6c9d 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 @@ -626,7 +626,7 @@ public class InnerHitsIT extends ParentChildTestCase { assertAcked(prepareCreate("index2")); createIndexRequest("index1", "parent_type", "1", null, "nested_type", Collections.singletonMap("key", "value")).get(); createIndexRequest("index1", "child_type", "2", "1").get(); - client().prepareIndex("index2").setId("3").setSource("key", "value").get(); + prepareIndex("index2").setId("3").setSource("key", "value").get(); refresh(); assertSearchHitsWithoutFailures( prepareSearch("index1", "index2").setQuery( diff --git a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ParentChildTestCase.java b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ParentChildTestCase.java index a67ebd4cbca2..02f24a67dda0 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ParentChildTestCase.java +++ b/modules/parent-join/src/internalClusterTest/java/org/elasticsearch/join/query/ParentChildTestCase.java @@ -100,7 +100,7 @@ public abstract class ParentChildTestCase extends ESIntegTestCase { String name = type; type = "doc"; - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(index).setId(id); + IndexRequestBuilder indexRequestBuilder = prepareIndex(index).setId(id); Map joinField = new HashMap<>(); if (parentId != null) { joinField.put("name", 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 bb7bf172820f..9c458a21286c 100644 --- a/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java @@ -80,16 +80,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .setMapping("id", "type=keyword", "field1", "type=keyword", "field2", "type=keyword", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchAllQuery()).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "value")).endObject()) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("id", "3") @@ -180,16 +177,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field1").from(10).to(12)).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field1").from(20).to(22)).endObject()) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("query", boolQuery().must(rangeQuery("field1").from(10).to(12)).must(rangeQuery("field1").from(12).to(14))) @@ -197,16 +191,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); indicesAdmin().prepareRefresh().get(); - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from(10).to(12)).endObject()) .get(); - client().prepareIndex("test") - .setId("5") + prepareIndex("test").setId("5") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from(20).to(22)).endObject()) .get(); - client().prepareIndex("test") - .setId("6") + prepareIndex("test").setId("6") .setSource( jsonBuilder().startObject() .field("query", boolQuery().must(rangeQuery("field2").from(10).to(12)).must(rangeQuery("field2").from(12).to(14))) @@ -214,16 +205,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); indicesAdmin().prepareRefresh().get(); - client().prepareIndex("test") - .setId("7") + prepareIndex("test").setId("7") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field3").from("192.168.1.0").to("192.168.1.5")).endObject()) .get(); - client().prepareIndex("test") - .setId("8") + prepareIndex("test").setId("8") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field3").from("192.168.1.20").to("192.168.1.30")).endObject()) .get(); - client().prepareIndex("test") - .setId("9") + prepareIndex("test").setId("9") .setSource( jsonBuilder().startObject() .field( @@ -234,8 +222,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("10") + prepareIndex("test").setId("10") .setSource( jsonBuilder().startObject() .field( @@ -303,8 +290,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { indicesAdmin().prepareCreate("test").setMapping("id", "type=keyword", "field1", "type=geo_point", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("query", geoDistanceQuery("field1").point(52.18, 4.38).distance(50, DistanceUnit.KILOMETERS)) @@ -313,8 +299,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("query", geoBoundingBoxQuery("field1").setCorners(52.3, 4.4, 52.1, 4.6)) @@ -323,8 +308,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field( @@ -360,16 +344,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .setMapping("id", "type=keyword", "field1", "type=keyword", "field2", "type=keyword", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchAllQuery()).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "value")).endObject()) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("id", "3") @@ -378,9 +359,9 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test").setId("4").setSource("{\"id\": \"4\"}", XContentType.JSON).get(); - client().prepareIndex("test").setId("5").setSource(XContentType.JSON, "id", "5", "field1", "value").get(); - client().prepareIndex("test").setId("6").setSource(XContentType.JSON, "id", "6", "field1", "value", "field2", "value").get(); + prepareIndex("test").setId("4").setSource("{\"id\": \"4\"}", XContentType.JSON).get(); + prepareIndex("test").setId("5").setSource(XContentType.JSON, "id", "5", "field1", "value").get(); + prepareIndex("test").setId("6").setSource(XContentType.JSON, "id", "6", "field1", "value", "field2", "value").get(); indicesAdmin().prepareRefresh().get(); logger.info("percolating empty doc"); @@ -417,9 +398,9 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .setMapping("_source", "enabled=false", "field1", "type=keyword", "query", "type=percolator") ); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("query", matchAllQuery()).endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("query", matchAllQuery()).endObject()).get(); - client().prepareIndex("test").setId("2").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("2").setSource("{}", XContentType.JSON).get(); indicesAdmin().prepareRefresh().get(); logger.info("percolating empty doc with source disabled"); @@ -435,8 +416,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .setMapping("id", "type=keyword", "field1", "type=text", "field2", "type=text", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("id", "1") @@ -444,8 +424,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("id", "2") @@ -460,8 +439,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .get(); indicesAdmin().prepareRefresh().get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("id", "3") @@ -481,8 +459,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .get(); // doesn't match - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource( jsonBuilder().startObject() .field("id", "4") @@ -533,24 +510,19 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { indicesAdmin().prepareCreate("test") .setMapping("id", "type=keyword", "field1", fieldMapping.toString(), "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchQuery("field1", "brown fox")).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "lazy dog")).endObject()) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource(jsonBuilder().startObject().field("id", "3").field("query", termQuery("field1", "jumps")).endObject()) .get(); - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource(jsonBuilder().startObject().field("id", "4").field("query", termQuery("field1", "dog")).endObject()) .get(); - client().prepareIndex("test") - .setId("5") + prepareIndex("test").setId("5") .setSource(jsonBuilder().startObject().field("id", "5").field("query", termQuery("field1", "fox")).endObject()) .get(); indicesAdmin().prepareRefresh().get(); @@ -784,12 +756,10 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { assertAcked( indicesAdmin().prepareCreate("test").setMapping("field", "type=text,position_increment_gap=5", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("query", new MatchPhraseQueryBuilder("field", "brown fox").slop(4)).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("query", new MatchPhraseQueryBuilder("field", "brown fox").slop(5)).endObject()) .get(); indicesAdmin().prepareRefresh().get(); @@ -863,12 +833,10 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ); // Acceptable: - client().prepareIndex("test1") - .setId("1") + prepareIndex("test1").setId("1") .setSource(jsonBuilder().startObject().field(queryFieldName, matchQuery("field", "value")).endObject()) .get(); - client().prepareIndex("test2") - .setId("1") + prepareIndex("test2").setId("1") .setSource( jsonBuilder().startObject() .startObject("object_field") @@ -901,8 +869,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { // Unacceptable: DocumentParsingException e = expectThrows(DocumentParsingException.class, () -> { - client().prepareIndex("test2") - .setId("1") + prepareIndex("test2").setId("1") .setSource( jsonBuilder().startObject() .startArray("object_field") @@ -945,8 +912,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .endObject() .endObject(); assertAcked(indicesAdmin().prepareCreate("test").setMapping(mapping)); - client().prepareIndex("test") - .setId("q1") + prepareIndex("test").setId("q1") .setSource( jsonBuilder().startObject() .field("id", "q1") @@ -962,8 +928,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) .get(); // this query should never match as it doesn't use nested query: - client().prepareIndex("test") - .setId("q2") + prepareIndex("test").setId("q2") .setSource( jsonBuilder().startObject() .field("id", "q2") @@ -973,8 +938,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { .get(); indicesAdmin().prepareRefresh().get(); - client().prepareIndex("test") - .setId("q3") + prepareIndex("test").setId("q3") .setSource(jsonBuilder().startObject().field("id", "q3").field("query", QueryBuilders.matchAllQuery()).endObject()) .get(); indicesAdmin().prepareRefresh().get(); @@ -1115,24 +1079,19 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { public void testPercolatorQueryViaMultiSearch() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "query", "type=percolator")); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "b")).field("a", "b").endObject()) .get(); - client().prepareIndex("test") - .setId("2") - .setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "c")).endObject()) - .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "c")).endObject()).get(); + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("query", boolQuery().must(matchQuery("field1", "b")).must(matchQuery("field1", "c"))) .endObject() ) .get(); - client().prepareIndex("test").setId("4").setSource(jsonBuilder().startObject().field("query", matchAllQuery()).endObject()).get(); - client().prepareIndex("test").setId("5").setSource(jsonBuilder().startObject().field("field1", "c").endObject()).get(); + prepareIndex("test").setId("4").setSource(jsonBuilder().startObject().field("query", matchAllQuery()).endObject()).get(); + prepareIndex("test").setId("5").setSource(jsonBuilder().startObject().field("field1", "c").endObject()).get(); indicesAdmin().prepareRefresh().get(); MultiSearchResponse response = client().prepareMultiSearch() @@ -1216,8 +1175,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { indicesAdmin().prepareCreate("test").setMapping("id", "type=keyword", "field1", "type=keyword", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchQuery("field1", "value")).endObject()) .get(); refresh(); @@ -1259,13 +1217,11 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setMapping("d", "type=date", "q", "type=percolator")); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("q", boolQuery().must(rangeQuery("d").gt("now"))).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("q", boolQuery().must(rangeQuery("d").lt("now"))).endObject()) .get(); @@ -1324,8 +1280,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("q_simple", simpleQueryStringQuery("yada").fields(Map.of("text*", 1f))) @@ -1403,8 +1358,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase { ensureGreen(); QueryBuilder knnVectorQueryBuilder = new KnnVectorQueryBuilder("my_vector", new float[] { 1, 1, 1, 1, 1 }, 10, null); - IndexRequestBuilder indexRequestBuilder = client().prepareIndex("index1") - .setId("knn_query1") + IndexRequestBuilder indexRequestBuilder = prepareIndex("index1").setId("knn_query1") .setSource(jsonBuilder().startObject().field("my_query", knnVectorQueryBuilder).endObject()); DocumentParsingException exception = expectThrows(DocumentParsingException.class, () -> indexRequestBuilder.get()); diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java index ad9a4e27207a..46b9e365fd0e 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java @@ -620,7 +620,7 @@ public class PercolatorFieldMapperTests extends ESSingleNodeTestCase { public void testQueryWithRewrite() throws Exception { addQueryFieldMappings(); - client().prepareIndex("remote").setId("1").setSource("field", "value").get(); + prepareIndex("remote").setId("1").setSource("field", "value").get(); QueryBuilder queryBuilder = termsLookupQuery("field", new TermsLookup("remote", "1", "field")); ParsedDocument doc = mapperService.documentMapper() .parse( diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchTests.java index d8d8e23a1629..5f3ff5264497 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchTests.java @@ -73,8 +73,7 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { public void testPercolateScriptQuery() throws IOException { indicesAdmin().prepareCreate("index").setMapping("query", "type=percolator").get(); - client().prepareIndex("index") - .setId("1") + prepareIndex("index").setId("1") .setSource( jsonBuilder().startObject() .field( @@ -125,8 +124,7 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { .setSettings(Settings.builder().put(BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING.getKey(), false)) .setMapping(mapping) ); - client().prepareIndex("test") - .setId("q1") + prepareIndex("test").setId("q1") .setSource( jsonBuilder().startObject() .field( @@ -214,8 +212,7 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { mapping.endObject(); createIndex("test", indicesAdmin().prepareCreate("test").setMapping(mapping)); Script script = new Script(ScriptType.INLINE, MockScriptPlugin.NAME, "use_fielddata_please", Collections.emptyMap()); - client().prepareIndex("test") - .setId("q1") + prepareIndex("test").setId("q1") .setSource( jsonBuilder().startObject() .field("query", QueryBuilders.nestedQuery("employees", QueryBuilders.scriptQuery(script), ScoreMode.Avg)) @@ -257,8 +254,7 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { public void testMapUnmappedFieldAsText() throws IOException { Settings.Builder settings = Settings.builder().put("index.percolator.map_unmapped_fields_as_text", true); createIndex("test", settings.build(), "query", "query", "type=percolator"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "value")).endObject()) .get(); indicesAdmin().prepareRefresh().get(); @@ -289,12 +285,10 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { "type=percolator" ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from("now-1h").to("now+1h")).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field( @@ -306,8 +300,7 @@ public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { .get(); Script script = new Script(ScriptType.INLINE, MockScriptPlugin.NAME, "1==1", Collections.emptyMap()); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("query", boolQuery().filter(scriptQuery(script)).filter(rangeQuery("field2").from("now-1h").to("now+1h"))) diff --git a/modules/rank-eval/src/internalClusterTest/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java index 7e879d9959f6..699cb307e331 100644 --- a/modules/rank-eval/src/internalClusterTest/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/internalClusterTest/java/org/elasticsearch/index/rankeval/RankEvalRequestIT.java @@ -49,18 +49,15 @@ public class RankEvalRequestIT extends ESIntegTestCase { createIndex(TEST_INDEX); ensureGreen(); - client().prepareIndex(TEST_INDEX) - .setId("1") - .setSource("id", 1, "text", "berlin", "title", "Berlin, Germany", "population", 3670622) - .get(); - client().prepareIndex(TEST_INDEX).setId("2").setSource("id", 2, "text", "amsterdam", "population", 851573).get(); - client().prepareIndex(TEST_INDEX).setId("3").setSource("id", 3, "text", "amsterdam", "population", 851573).get(); - client().prepareIndex(TEST_INDEX).setId("4").setSource("id", 4, "text", "amsterdam", "population", 851573).get(); - client().prepareIndex(TEST_INDEX).setId("5").setSource("id", 5, "text", "amsterdam", "population", 851573).get(); - client().prepareIndex(TEST_INDEX).setId("6").setSource("id", 6, "text", "amsterdam", "population", 851573).get(); + prepareIndex(TEST_INDEX).setId("1").setSource("id", 1, "text", "berlin", "title", "Berlin, Germany", "population", 3670622).get(); + prepareIndex(TEST_INDEX).setId("2").setSource("id", 2, "text", "amsterdam", "population", 851573).get(); + prepareIndex(TEST_INDEX).setId("3").setSource("id", 3, "text", "amsterdam", "population", 851573).get(); + prepareIndex(TEST_INDEX).setId("4").setSource("id", 4, "text", "amsterdam", "population", 851573).get(); + prepareIndex(TEST_INDEX).setId("5").setSource("id", 5, "text", "amsterdam", "population", 851573).get(); + prepareIndex(TEST_INDEX).setId("6").setSource("id", 6, "text", "amsterdam", "population", 851573).get(); // add another index for testing closed indices etc... - client().prepareIndex("test2").setId("7").setSource("id", 7, "text", "amsterdam", "population", 851573).get(); + prepareIndex("test2").setId("7").setSource("id", 7, "text", "amsterdam", "population", 851573).get(); refresh(); // set up an alias that can also be used in tests 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 50284008eef4..996fbde85e47 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 @@ -272,7 +272,7 @@ public class ReindexDocumentationIT extends ESIntegTestCase { false, true, IntStream.range(0, numDocs) - .mapToObj(i -> client().prepareIndex(INDEX_NAME).setId(Integer.toString(i)).setSource("n", Integer.toString(i))) + .mapToObj(i -> prepareIndex(INDEX_NAME).setId(Integer.toString(i)).setSource("n", Integer.toString(i))) .collect(Collectors.toList()) ); 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 8cb7c1467184..7dad062ab3bc 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 @@ -181,7 +181,7 @@ public class BulkByScrollUsesAllScrollDocumentsAfterConflictsIntegTests extends source.put(RETURN_NOOP_FIELD, true); noopDocs++; } - indexRequests.add(client().prepareIndex(sourceIndex).setId(Integer.toString(i)).setSource(source)); + indexRequests.add(prepareIndex(sourceIndex).setId(Integer.toString(i)).setSource(source)); } indexRandom(true, indexRequests); diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java index 2eed369a64d6..3bbc8e4b969e 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java +++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java @@ -192,7 +192,7 @@ public abstract class AbstractFeatureMigrationIntegTest extends ESIntegTestCase List docs = new ArrayList<>(INDEX_DOC_COUNT); for (int i = 0; i < INDEX_DOC_COUNT; i++) { - docs.add(ESIntegTestCase.client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("some_field", "words words")); + docs.add(ESIntegTestCase.prepareIndex(indexName).setId(Integer.toString(i)).setSource("some_field", "words words")); } indexRandom(true, docs); IndicesStatsResponse indexStats = ESIntegTestCase.indicesAdmin().prepareStats(indexName).setDocs(true).get(); 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 35ad5fe9532c..b211f7d92f51 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/CancelTests.java @@ -97,7 +97,7 @@ public class CancelTests extends ReindexTestCase { false, true, IntStream.range(0, numDocs) - .mapToObj(i -> client().prepareIndex().setIndex(INDEX).setId(String.valueOf(i)).setSource("n", i)) + .mapToObj(i -> prepareIndex(INDEX).setId(String.valueOf(i)).setSource("n", i)) .collect(Collectors.toList()) ); 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 2f2248e30498..fac18c4f6f54 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryBasicTests.java @@ -52,13 +52,13 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { public void testBasics() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("foo", "a"), - client().prepareIndex("test").setId("2").setSource("foo", "a"), - client().prepareIndex("test").setId("3").setSource("foo", "b"), - client().prepareIndex("test").setId("4").setSource("foo", "c"), - client().prepareIndex("test").setId("5").setSource("foo", "d"), - client().prepareIndex("test").setId("6").setSource("foo", "e"), - client().prepareIndex("test").setId("7").setSource("foo", "f") + prepareIndex("test").setId("1").setSource("foo", "a"), + prepareIndex("test").setId("2").setSource("foo", "a"), + prepareIndex("test").setId("3").setSource("foo", "b"), + prepareIndex("test").setId("4").setSource("foo", "c"), + prepareIndex("test").setId("5").setSource("foo", "d"), + prepareIndex("test").setId("6").setSource("foo", "e"), + prepareIndex("test").setId("7").setSource("foo", "f") ); assertHitCount(prepareSearch("test").setSize(0), 7); @@ -87,7 +87,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { - builders.add(client().prepareIndex("test").setId(String.valueOf(i)).setSource("fields1", 1)); + builders.add(prepareIndex("test").setId(String.valueOf(i)).setSource("fields1", 1)); } indexRandom(true, true, true, builders); @@ -112,7 +112,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { for (int j = 0; j < docs; j++) { boolean candidate = (j < candidates[i]); - builders.add(client().prepareIndex("test-" + i).setId(String.valueOf(j)).setSource("candidate", candidate)); + builders.add(prepareIndex("test-" + i).setId(String.valueOf(j)).setSource("candidate", candidate)); } } indexRandom(true, true, true, builders); @@ -129,7 +129,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { } public void testDeleteByQueryWithMissingIndex() throws Exception { - indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "a")); + indexRandom(true, prepareIndex("test").setId("1").setSource("foo", "a")); assertHitCount(prepareSearch().setSize(0), 1); try { @@ -149,7 +149,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { - builders.add(client().prepareIndex("test").setId(String.valueOf(i)).setRouting(String.valueOf(i)).setSource("field1", 1)); + builders.add(prepareIndex("test").setId(String.valueOf(i)).setRouting(String.valueOf(i)).setSource("field1", 1)); } indexRandom(true, true, true, builders); @@ -177,10 +177,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { builders.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setRouting(randomAlphaOfLengthBetween(1, 5)) - .setSource("foo", "bar") + prepareIndex("test").setId(Integer.toString(i)).setRouting(randomAlphaOfLengthBetween(1, 5)).setSource("foo", "bar") ); } indexRandom(true, true, true, builders); @@ -196,7 +193,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { } public void testDeleteByQueryWithDateMath() throws Exception { - indexRandom(true, client().prepareIndex("test").setId("1").setSource("d", "2013-01-01")); + indexRandom(true, prepareIndex("test").setId("1").setSource("d", "2013-01-01")); DeleteByQueryRequestBuilder delete = deleteByQuery().source("test").filter(rangeQuery("d").to("now-1h")); assertThat(delete.refresh(true).get(), matcher().deleted(1L)); @@ -210,7 +207,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { final int docs = randomIntBetween(1, 50); List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { - builders.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", 1)); + builders.add(prepareIndex("test").setId(Integer.toString(i)).setSource("field", 1)); } indexRandom(true, true, true, builders); @@ -233,7 +230,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { final int docs = randomIntBetween(1, 50); List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { - builders.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", 1)); + builders.add(prepareIndex("test").setId(Integer.toString(i)).setSource("field", 1)); } indexRandom(true, true, true, builders); @@ -289,13 +286,13 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { public void testSlices() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("foo", "a"), - client().prepareIndex("test").setId("2").setSource("foo", "a"), - client().prepareIndex("test").setId("3").setSource("foo", "b"), - client().prepareIndex("test").setId("4").setSource("foo", "c"), - client().prepareIndex("test").setId("5").setSource("foo", "d"), - client().prepareIndex("test").setId("6").setSource("foo", "e"), - client().prepareIndex("test").setId("7").setSource("foo", "f") + prepareIndex("test").setId("1").setSource("foo", "a"), + prepareIndex("test").setId("2").setSource("foo", "a"), + prepareIndex("test").setId("3").setSource("foo", "b"), + prepareIndex("test").setId("4").setSource("foo", "c"), + prepareIndex("test").setId("5").setSource("foo", "d"), + prepareIndex("test").setId("6").setSource("foo", "e"), + prepareIndex("test").setId("7").setSource("foo", "f") ); assertHitCount(prepareSearch("test").setSize(0), 7); @@ -326,7 +323,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase { docs.put(indexName, new ArrayList<>()); int numDocs = between(5, 15); for (int i = 0; i < numDocs; i++) { - docs.get(indexName).add(client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("foo", "a")); + docs.get(indexName).add(prepareIndex(indexName).setId(Integer.toString(i)).setSource("foo", "a")); } } 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 81d00d98b1fe..323b829fe93f 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java @@ -32,7 +32,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase { List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { for (int t = 0; t < threads.length; t++) { - builders.add(client().prepareIndex("test").setSource("field", t)); + builders.add(prepareIndex("test").setSource("field", t)); } } indexRandom(true, true, true, builders); @@ -73,7 +73,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase { List builders = new ArrayList<>(); for (int i = 0; i < docs; i++) { - builders.add(client().prepareIndex("test").setId(String.valueOf(i)).setSource("foo", "bar")); + builders.add(prepareIndex("test").setId(String.valueOf(i)).setSource("foo", "bar")); } indexRandom(true, true, true, builders); 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 45ca5a536f34..21f6427dcb63 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexBasicTests.java @@ -30,10 +30,10 @@ public class ReindexBasicTests extends ReindexTestCase { public void testFiltering() throws Exception { indexRandom( true, - client().prepareIndex("source").setId("1").setSource("foo", "a"), - client().prepareIndex("source").setId("2").setSource("foo", "a"), - client().prepareIndex("source").setId("3").setSource("foo", "b"), - client().prepareIndex("source").setId("4").setSource("foo", "c") + prepareIndex("source").setId("1").setSource("foo", "a"), + prepareIndex("source").setId("2").setSource("foo", "a"), + prepareIndex("source").setId("3").setSource("foo", "b"), + prepareIndex("source").setId("4").setSource("foo", "c") ); assertHitCount(prepareSearch("source").setSize(0), 4); @@ -63,7 +63,7 @@ public class ReindexBasicTests extends ReindexTestCase { List docs = new ArrayList<>(); int max = between(150, 500); for (int i = 0; i < max; i++) { - docs.add(client().prepareIndex("source").setId(Integer.toString(i)).setSource("foo", "a")); + docs.add(prepareIndex("source").setId(Integer.toString(i)).setSource("foo", "a")); } indexRandom(true, docs); @@ -90,7 +90,7 @@ public class ReindexBasicTests extends ReindexTestCase { List docs = new ArrayList<>(); int max = between(150, 500); for (int i = 0; i < max; i++) { - docs.add(client().prepareIndex("source").setId(Integer.toString(i)).setSource("foo", "a")); + docs.add(prepareIndex("source").setId(Integer.toString(i)).setSource("foo", "a")); } indexRandom(true, docs); @@ -127,7 +127,7 @@ public class ReindexBasicTests extends ReindexTestCase { docs.put(indexName, new ArrayList<>()); int numDocs = between(50, 200); for (int i = 0; i < numDocs; i++) { - docs.get(indexName).add(client().prepareIndex(indexName).setId("id_" + sourceIndex + "_" + i).setSource("foo", "a")); + docs.get(indexName).add(prepareIndex(indexName).setId("id_" + sourceIndex + "_" + i).setSource("foo", "a")); } } @@ -161,10 +161,10 @@ public class ReindexBasicTests extends ReindexTestCase { String destIndexName = ""; indexRandom( true, - client().prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"), - client().prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"), - client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), - client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") + prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"), + prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"), + prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), + prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") ); assertHitCount(prepareSearch(sourceIndexName).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 5e868598d165..1da998831ecc 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFailureTests.java @@ -37,7 +37,7 @@ public class ReindexFailureTests extends ReindexTestCase { * Create the destination index such that the copy will cause a mapping * conflict on every request. */ - indexRandom(true, client().prepareIndex("dest").setId("test").setSource("test", 10) /* Its a string in the source! */); + indexRandom(true, prepareIndex("dest").setId("test").setSource("test", 10) /* Its a string in the source! */); indexDocs(100); @@ -59,7 +59,7 @@ public class ReindexFailureTests extends ReindexTestCase { public void testAbortOnVersionConflict() throws Exception { // Just put something in the way of the copy. - indexRandom(true, client().prepareIndex("dest").setId("1").setSource("test", "test")); + indexRandom(true, prepareIndex("dest").setId("1").setSource("test", "test")); indexDocs(100); @@ -123,10 +123,10 @@ public class ReindexFailureTests extends ReindexTestCase { String destIndexName = ""; indexRandom( true, - client().prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"), - client().prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"), - client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), - client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") + prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"), + prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"), + prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"), + prepareIndex(sourceIndexName).setId("4").setSource("foo", "c") ); assertHitCount(prepareSearch(sourceIndexName).setSize(0), 4); @@ -140,7 +140,7 @@ public class ReindexFailureTests extends ReindexTestCase { private void indexDocs(int count) throws Exception { List docs = new ArrayList<>(count); for (int i = 0; i < count; i++) { - docs.add(client().prepareIndex("source").setId(Integer.toString(i)).setSource("test", "words words")); + docs.add(prepareIndex("source").setId(Integer.toString(i)).setSource("test", "words words")); } indexRandom(true, docs); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFromRemoteWithAuthTests.java index 5509e44b52a3..cf06a6d8dcb0 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexFromRemoteWithAuthTests.java @@ -81,7 +81,7 @@ public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase { @Before public void setupSourceIndex() { - client().prepareIndex("source").setSource("test", "test").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("source").setSource("test", "test").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); } @Before diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSingleNodeTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSingleNodeTests.java index 2df8caa4dd2e..0804cccd8b8f 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSingleNodeTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSingleNodeTests.java @@ -30,7 +30,7 @@ public class ReindexSingleNodeTests extends ESSingleNodeTestCase { public void testDeprecatedSort() { int max = between(2, 20); for (int i = 0; i < max; i++) { - client().prepareIndex("source").setId(Integer.toString(i)).setSource("foo", i).get(); + prepareIndex("source").setId(Integer.toString(i)).setSource("foo", i).get(); } indicesAdmin().prepareRefresh("source").get(); diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexVersioningTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexVersioningTests.java index 96f0ff50027a..8e42b29468b5 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexVersioningTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexVersioningTests.java @@ -105,7 +105,7 @@ public class ReindexVersioningTests extends ReindexTestCase { private void setupSourceAbsent() throws Exception { indexRandom( true, - client().prepareIndex("source").setId("test").setVersionType(EXTERNAL).setVersion(SOURCE_VERSION).setSource("foo", "source") + prepareIndex("source").setId("test").setVersionType(EXTERNAL).setVersion(SOURCE_VERSION).setSource("foo", "source") ); assertEquals(SOURCE_VERSION, client().prepareGet("source", "test").get().getVersion()); @@ -113,10 +113,7 @@ public class ReindexVersioningTests extends ReindexTestCase { private void setupDest(int version) throws Exception { setupSourceAbsent(); - indexRandom( - true, - client().prepareIndex("dest").setId("test").setVersionType(EXTERNAL).setVersion(version).setSource("foo", "dest") - ); + indexRandom(true, prepareIndex("dest").setId("test").setVersionType(EXTERNAL).setVersion(version).setSource("foo", "dest")); assertEquals(version, client().prepareGet("dest", "test").get().getVersion()); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/RethrottleTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/RethrottleTests.java index 5bbff9da85b2..5f1af0557158 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/RethrottleTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/RethrottleTests.java @@ -81,7 +81,7 @@ public class RethrottleTests extends ReindexTestCase { List docs = new ArrayList<>(); for (int i = 0; i < numSlices * 10; i++) { - docs.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("foo", "bar")); + docs.add(prepareIndex("test").setId(Integer.toString(i)).setSource("foo", "bar")); } indexRandom(true, docs); diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java index 91a1f386c736..36da25685a7b 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java @@ -181,7 +181,7 @@ public class RetryTests extends ESIntegTestCase { // Build the test data. Don't use indexRandom because that won't work consistently with such small thread pools. BulkRequestBuilder bulk = client().prepareBulk(); for (int i = 0; i < DOC_COUNT; i++) { - bulk.add(client().prepareIndex("source").setSource("foo", "bar " + i)); + bulk.add(prepareIndex("source").setSource("foo", "bar " + i)); } Retry retry = new Retry(BackoffPolicy.exponentialBackoff(), client().threadPool()); 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 f37c9b589141..6b1f3a21a1aa 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryBasicTests.java @@ -29,10 +29,10 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { public void testBasics() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("foo", "a"), - client().prepareIndex("test").setId("2").setSource("foo", "a"), - client().prepareIndex("test").setId("3").setSource("foo", "b"), - client().prepareIndex("test").setId("4").setSource("foo", "c") + prepareIndex("test").setId("1").setSource("foo", "a"), + prepareIndex("test").setId("2").setSource("foo", "a"), + prepareIndex("test").setId("3").setSource("foo", "b"), + prepareIndex("test").setId("4").setSource("foo", "c") ); assertHitCount(prepareSearch("test").setSize(0), 4); assertEquals(1, client().prepareGet("test", "1").get().getVersion()); @@ -69,10 +69,10 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { public void testSlices() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("foo", "a"), - client().prepareIndex("test").setId("2").setSource("foo", "a"), - client().prepareIndex("test").setId("3").setSource("foo", "b"), - client().prepareIndex("test").setId("4").setSource("foo", "c") + prepareIndex("test").setId("1").setSource("foo", "a"), + prepareIndex("test").setId("2").setSource("foo", "a"), + prepareIndex("test").setId("3").setSource("foo", "b"), + prepareIndex("test").setId("4").setSource("foo", "c") ); assertHitCount(prepareSearch("test").setSize(0), 4); assertEquals(1, client().prepareGet("test", "1").get().getVersion()); @@ -117,7 +117,7 @@ public class UpdateByQueryBasicTests extends ReindexTestCase { docs.put(indexName, new ArrayList<>()); int numDocs = between(5, 15); for (int i = 0; i < numDocs; i++) { - docs.get(indexName).add(client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("foo", "a")); + docs.get(indexName).add(prepareIndex(indexName).setId(Integer.toString(i)).setSource("foo", "a")); } } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryWhileModifyingTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryWhileModifyingTests.java index 11a4476dffa8..5c2e82f6d425 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryWhileModifyingTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/UpdateByQueryWhileModifyingTests.java @@ -32,7 +32,7 @@ public class UpdateByQueryWhileModifyingTests extends ReindexTestCase { public void testUpdateWhileReindexing() throws Exception { AtomicReference value = new AtomicReference<>(randomSimpleString(random())); - indexRandom(true, client().prepareIndex("test").setId("test").setSource("test", value.get())); + indexRandom(true, prepareIndex("test").setId("test").setSource("test", value.get())); AtomicReference failure = new AtomicReference<>(); AtomicBoolean keepUpdating = new AtomicBoolean(true); @@ -56,10 +56,7 @@ public class UpdateByQueryWhileModifyingTests extends ReindexTestCase { GetResponse get = client().prepareGet("test", "test").get(); assertEquals(value.get(), get.getSource().get("test")); value.set(randomSimpleString(random())); - IndexRequestBuilder index = client().prepareIndex("test") - .setId("test") - .setSource("test", value.get()) - .setRefreshPolicy(IMMEDIATE); + IndexRequestBuilder index = prepareIndex("test").setId("test").setSource("test", value.get()).setRefreshPolicy(IMMEDIATE); /* * Update by query changes the document so concurrent * indexes might get version conflict exceptions so we just diff --git a/plugins/analysis-icu/src/internalClusterTest/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java b/plugins/analysis-icu/src/internalClusterTest/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java index ae6a0cc71789..955bcaf8f035 100644 --- a/plugins/analysis-icu/src/internalClusterTest/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java +++ b/plugins/analysis-icu/src/internalClusterTest/java/org/elasticsearch/index/mapper/ICUCollationKeywordFieldMapperIT.java @@ -69,8 +69,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { // both values should collate to same value indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); // searching for either of the terms should return both results since they collate to the same value @@ -111,10 +111,9 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { // everything should be indexed fine, no exceptions indexRandom( true, - client().prepareIndex(index) - .setId("1") + prepareIndex(index).setId("1") .setSource("{\"id\":\"1\", \"collate\":[\"" + equivalent[0] + "\", \"" + equivalent[1] + "\"]}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[2] + "\"}", XContentType.JSON) + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[2] + "\"}", XContentType.JSON) ); // using sort mode = max, values B and C will be used for the sort @@ -176,8 +175,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); // searching for either of the terms should return both results since they collate to the same value @@ -222,8 +221,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest().indices(index) @@ -268,8 +267,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest().indices(index) @@ -314,9 +313,9 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"foo bar\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"foobar\"}", XContentType.JSON), - client().prepareIndex(index).setId("3").setSource("{\"id\":\"3\",\"collate\":\"foo-bar\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"foo bar\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"foobar\"}", XContentType.JSON), + prepareIndex(index).setId("3").setSource("{\"id\":\"3\",\"collate\":\"foo-bar\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest().indices(index) @@ -354,8 +353,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate(index).setMapping(builder)); - indexRandom(true, client().prepareIndex(index).setId("1").setSource(""" - {"collate":"foobar-10"}""", XContentType.JSON), client().prepareIndex(index).setId("2").setSource(""" + indexRandom(true, prepareIndex(index).setId("1").setSource(""" + {"collate":"foobar-10"}""", XContentType.JSON), prepareIndex(index).setId("2").setSource(""" {"collate":"foobar-9"}""", XContentType.JSON)); SearchRequest request = new SearchRequest().indices(index) @@ -392,10 +391,10 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate(index).setMapping(builder)); - indexRandom(true, client().prepareIndex(index).setId("1").setSource(""" - {"id":"1","collate":"résumé"}""", XContentType.JSON), client().prepareIndex(index).setId("2").setSource(""" - {"id":"2","collate":"Resume"}""", XContentType.JSON), client().prepareIndex(index).setId("3").setSource(""" - {"id":"3","collate":"resume"}""", XContentType.JSON), client().prepareIndex(index).setId("4").setSource(""" + indexRandom(true, prepareIndex(index).setId("1").setSource(""" + {"id":"1","collate":"résumé"}""", XContentType.JSON), prepareIndex(index).setId("2").setSource(""" + {"id":"2","collate":"Resume"}""", XContentType.JSON), prepareIndex(index).setId("3").setSource(""" + {"id":"3","collate":"resume"}""", XContentType.JSON), prepareIndex(index).setId("4").setSource(""" {"id":"4","collate":"Résumé"}""", XContentType.JSON)); SearchRequest request = new SearchRequest().indices(index) @@ -431,8 +430,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"collate\":\"resume\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"collate\":\"Resume\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"collate\":\"resume\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"collate\":\"Resume\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest().indices(index) @@ -480,8 +479,8 @@ public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), - client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) + prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"" + equivalent[0] + "\"}", XContentType.JSON), + prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON) ); SearchRequest request = new SearchRequest().indices(index) 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 026dabd64eb0..ee16153a98de 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 @@ -100,7 +100,7 @@ public class SizeMappingIT extends ESIntegTestCase { public void testBasic() throws Exception { 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)); + indexRandom(true, prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); GetResponse getResponse = client().prepareGet("test", "1").setStoredFields("_size").get(); assertNotNull(getResponse.getField("_size")); assertEquals(source.length(), (int) getResponse.getField("_size").getValue()); @@ -109,7 +109,7 @@ public class SizeMappingIT extends ESIntegTestCase { public void testGetWithFields() throws Exception { 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)); + indexRandom(true, prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); assertResponse( prepareSearch("test").addFetchField("_size"), response -> assertEquals( @@ -134,7 +134,7 @@ public class SizeMappingIT extends ESIntegTestCase { public void testWildCardWithFieldsWhenDisabled() throws Exception { 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)); + indexRandom(true, prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); assertResponse( prepareSearch("test").addFetchField("_size"), response -> assertNull(response.getHits().getHits()[0].getFields().get("_size")) @@ -154,7 +154,7 @@ public class SizeMappingIT extends ESIntegTestCase { public void testWildCardWithFieldsWhenNotProvided() throws Exception { assertAcked(prepareCreate("test")); final String source = "{\"f\":\"" + randomAlphaOfLengthBetween(1, 100) + "\"}"; - indexRandom(true, client().prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); + indexRandom(true, prepareIndex("test").setId("1").setSource(source, XContentType.JSON)); assertResponse( prepareSearch("test").addFetchField("_size"), response -> assertNull(response.getHits().getHits()[0].getFields().get("_size")) diff --git a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java index eaff760b41b7..16e8d2610f3f 100644 --- a/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java +++ b/plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java @@ -61,9 +61,9 @@ public class HdfsTests extends ESSingleNodeTestCase { logger.info("--> indexing some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); } client().admin().indices().prepareRefresh().get(); assertThat(count(client, "test-idx-1"), equalTo(100L)); diff --git a/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/SearchRestCancellationIT.java b/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/SearchRestCancellationIT.java index b3fe22d09fa8..798464bf6d2c 100644 --- a/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/SearchRestCancellationIT.java +++ b/qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/SearchRestCancellationIT.java @@ -186,7 +186,7 @@ public class SearchRestCancellationIT extends HttpSmokeTestCase { // Make sure we have a few segments BulkRequestBuilder bulkRequestBuilder = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); for (int j = 0; j < 20; j++) { - bulkRequestBuilder.add(client().prepareIndex("test").setId(Integer.toString(i * 5 + j)).setSource("field", "value")); + bulkRequestBuilder.add(prepareIndex("test").setId(Integer.toString(i * 5 + j)).setSource("field", "value")); } assertNoFailures(bulkRequestBuilder.get()); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java index 5df0e374ee9d..ea08f32d44e1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/IndicesRequestIT.java @@ -233,7 +233,7 @@ public class IndicesRequestIT extends ESIntegTestCase { interceptTransportActions(updateShardActions); String indexOrAlias = randomIndexOrAlias(); - client().prepareIndex(indexOrAlias).setId("id").setSource("field", "value").get(); + prepareIndex(indexOrAlias).setId("id").setSource("field", "value").get(); UpdateRequest updateRequest = new UpdateRequest(indexOrAlias, "id").doc(Requests.INDEX_CONTENT_TYPE, "field1", "value1"); UpdateResponse updateResponse = internalCluster().coordOnlyNodeClient().update(updateRequest).actionGet(); assertEquals(DocWriteResponse.Result.UPDATED, updateResponse.getResult()); @@ -263,7 +263,7 @@ public class IndicesRequestIT extends ESIntegTestCase { interceptTransportActions(updateShardActions); String indexOrAlias = randomIndexOrAlias(); - client().prepareIndex(indexOrAlias).setId("id").setSource("field", "value").get(); + prepareIndex(indexOrAlias).setId("id").setSource("field", "value").get(); UpdateRequest updateRequest = new UpdateRequest(indexOrAlias, "id").script( new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "ctx.op='delete'", Collections.emptyMap()) ); @@ -554,7 +554,7 @@ public class IndicesRequestIT extends ESIntegTestCase { String[] randomIndicesOrAliases = randomIndicesOrAliases(); for (int i = 0; i < randomIndicesOrAliases.length; i++) { - client().prepareIndex(randomIndicesOrAliases[i]).setId("id-" + i).setSource("field", "value").get(); + prepareIndex(randomIndicesOrAliases[i]).setId("id-" + i).setSource("field", "value").get(); } refresh(); @@ -584,7 +584,7 @@ public class IndicesRequestIT extends ESIntegTestCase { String[] randomIndicesOrAliases = randomIndicesOrAliases(); for (int i = 0; i < randomIndicesOrAliases.length; i++) { - client().prepareIndex(randomIndicesOrAliases[i]).setId("id-" + i).setSource("field", "value").get(); + prepareIndex(randomIndicesOrAliases[i]).setId("id-" + i).setSource("field", "value").get(); } refresh(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java index c7082f7979ed..a30d654900c2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/RejectionActionIT.java @@ -43,7 +43,7 @@ public class RejectionActionIT extends ESIntegTestCase { public void testSimulatedSearchRejectionLoad() throws Throwable { for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "1").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "1").get(); } int numberOfAsyncOps = randomIntBetween(200, 700); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/HotThreadsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/HotThreadsIT.java index 6a3a7ccfe221..05e3b81c3683 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/HotThreadsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/HotThreadsIT.java @@ -100,9 +100,9 @@ public class HotThreadsIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "value1"), - client().prepareIndex("test").setId("2").setSource("field1", "value2"), - client().prepareIndex("test").setId("3").setSource("field1", "value3") + prepareIndex("test").setId("1").setSource("field1", "value1"), + prepareIndex("test").setId("2").setSource("field1", "value2"), + prepareIndex("test").setId("3").setSource("field1", "value3") ); ensureSearchable(); while (latch.getCount() > 0) { 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 4e1bc5b48efe..b7789eca6b3f 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 @@ -304,7 +304,7 @@ public class TasksIT extends ESIntegTestCase { ensureGreen("test"); // Make sure all shards are allocated to catch replication tasks // ensures the mapping is available on all nodes so we won't retry the request (in case replicas don't have the right mapping). indicesAdmin().preparePutMapping("test").setSource("foo", "type=keyword").get(); - client().prepareBulk().add(client().prepareIndex("test").setId("test_id").setSource("{\"foo\": \"bar\"}", XContentType.JSON)).get(); + client().prepareBulk().add(prepareIndex("test").setId("test_id").setSource("{\"foo\": \"bar\"}", XContentType.JSON)).get(); // the bulk operation should produce one main task List topTask = findEvents(BulkAction.NAME, Tuple::v1); @@ -353,8 +353,7 @@ public class TasksIT extends ESIntegTestCase { registerTaskManagerListeners(SearchAction.NAME + "[*]"); // shard task createIndex("test"); ensureGreen("test"); // Make sure all shards are allocated to catch replication tasks - client().prepareIndex("test") - .setId("test_id") + prepareIndex("test").setId("test_id") .setSource("{\"foo\": \"bar\"}", XContentType.JSON) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -448,7 +447,7 @@ public class TasksIT extends ESIntegTestCase { } // Need to run the task in a separate thread because node client's .execute() is blocked by our task listener index = new Thread(() -> { - DocWriteResponse indexResponse = client().prepareIndex("test").setSource("test", "test").get(); + DocWriteResponse indexResponse = prepareIndex("test").setSource("test", "test").get(); assertArrayEquals(ReplicationResponse.NO_FAILURES, indexResponse.getShardInfo().getFailures()); }); index.start(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java index b2a22035fece..b6b0b2e54e69 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java @@ -46,11 +46,11 @@ public class SnapshotBlocksIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex(INDEX_NAME).setSource("test", "init").get(); + prepareIndex(INDEX_NAME).setSource("test", "init").get(); } docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex(OTHER_INDEX_NAME).setSource("test", "init").get(); + prepareIndex(OTHER_INDEX_NAME).setSource("test", "init").get(); } logger.info("--> register a repository"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java index 2c5c7a8c103b..c0d62ba54621 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java @@ -116,7 +116,7 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase { client().execute(AutoCreateAction.INSTANCE, request).get(); } - DocWriteResponse response = client().prepareIndex(INDEX_NAME).setSource("{\"foo\":\"bar\"}", XContentType.JSON).get(); + DocWriteResponse response = prepareIndex(INDEX_NAME).setSource("{\"foo\":\"bar\"}", XContentType.JSON).get(); assertThat(response.getResult(), equalTo(DocWriteResponse.Result.CREATED)); } @@ -135,7 +135,7 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase { client().execute(AutoCreateAction.INSTANCE, request).get(); } - DocWriteResponse response = client().prepareIndex(INDEX_NAME).setSource("{\"foo\":\"bar\"}", XContentType.JSON).get(); + DocWriteResponse response = prepareIndex(INDEX_NAME).setSource("{\"foo\":\"bar\"}", XContentType.JSON).get(); assertThat(response.getResult(), equalTo(DocWriteResponse.Result.CREATED)); } 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 93d12c686297..d006192579ea 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 @@ -39,7 +39,7 @@ public class CloneIndexIT extends ESIntegTestCase { ).get(); final int docs = randomIntBetween(0, 128); for (int i = 0; i < docs; i++) { - client().prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } internalCluster().ensureAtLeastNumDataNodes(2); // ensure all shards are allocated otherwise the ensure green below might not succeed since we require the merge node @@ -89,7 +89,7 @@ public class CloneIndexIT extends ESIntegTestCase { } for (int i = docs; i < 2 * docs; i++) { - client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); 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 24c091c6a503..b4d0286b7407 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 @@ -213,7 +213,7 @@ public class CreateIndexIT extends ESIntegTestCase { final CountDownLatch latch = new CountDownLatch(1); int numDocs = randomIntBetween(1, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setSource("index_version", indexVersion.get()).get(); + prepareIndex("test").setSource("index_version", indexVersion.get()).get(); } synchronized (indexVersionLock) { // not necessarily needed here but for completeness we lock here too indexVersion.incrementAndGet(); @@ -226,7 +226,7 @@ public class CreateIndexIT extends ESIntegTestCase { public void run() { try { // recreate that index - client().prepareIndex("test").setSource("index_version", indexVersion.get()).get(); + prepareIndex("test").setSource("index_version", indexVersion.get()).get(); synchronized (indexVersionLock) { // we sync here since we have to ensure that all indexing operations below for a given ID are done before // we increment the index version otherwise a doc that is in-flight could make it into an index that it @@ -252,10 +252,7 @@ public class CreateIndexIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { try { synchronized (indexVersionLock) { - client().prepareIndex("test") - .setSource("index_version", indexVersion.get()) - .setTimeout(TimeValue.timeValueSeconds(10)) - .get(); + prepareIndex("test").setSource("index_version", indexVersion.get()).setTimeout(TimeValue.timeValueSeconds(10)).get(); } } catch (IndexNotFoundException inf) { // fine 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 745fc04441d5..8f6026da835b 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 @@ -81,10 +81,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(2); prepareCreate("source").setSettings(Settings.builder().put(indexSettings()).put("number_of_shards", shardSplits[0])).get(); for (int i = 0; i < 20; i++) { - client().prepareIndex("source") - .setId(Integer.toString(i)) - .setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON) - .get(); + prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2); @@ -109,8 +106,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { 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") - .setId(Integer.toString(i)) + prepareIndex("first_shrink").setId(Integer.toString(i)) .setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON) .get(); } @@ -142,8 +138,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { 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") - .setId(Integer.toString(i)) + prepareIndex("second_shrink").setId(Integer.toString(i)) .setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON) .get(); } @@ -238,7 +233,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { ).get(); final int docs = randomIntBetween(0, 128); for (int i = 0; i < docs; i++) { - client().prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2); @@ -318,7 +313,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { } for (int i = docs; i < 2 * docs; i++) { - client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); @@ -344,7 +339,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { Settings.builder().put(indexSettings()).put("number_of_shards", randomIntBetween(2, 7)).put("number_of_replicas", 0) ).get(); for (int i = 0; i < 20; i++) { - client().prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2); @@ -424,10 +419,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { .put("number_of_replicas", 0) ).setMapping("id", "type=keyword,doc_values=true").get(); for (int i = 0; i < 20; i++) { - client().prepareIndex("source") - .setId(Integer.toString(i)) - .setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON) - .get(); + prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON).get(); } Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); assertTrue("at least 2 nodes but was: " + dataNodes.size(), dataNodes.size() >= 2); @@ -472,7 +464,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { // ... and that the index sort is also applied to updates for (int i = 20; i < 40; i++) { - client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); assertSortedSegments("target", expectedIndexSort); @@ -483,7 +475,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { Settings.builder().put(indexSettings()).put("index.number_of_replicas", 0).put("number_of_shards", 5) ).get(); for (int i = 0; i < 30; i++) { - client().prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } indicesAdmin().prepareFlush("source").get(); Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); 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 6349c8cff03e..56bbe135de66 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 @@ -128,8 +128,7 @@ public class SplitIndexIT extends ESIntegTestCase { BiFunction indexFunc = (index, id) -> { try { - return client().prepareIndex(index) - .setId(Integer.toString(id)) + return prepareIndex(index).setId(Integer.toString(id)) .setSource( jsonBuilder().startObject() .field("foo", "bar") @@ -344,7 +343,7 @@ public class SplitIndexIT extends ESIntegTestCase { ).get(); final int docs = randomIntBetween(0, 128); for (int i = 0; i < docs; i++) { - client().prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("source").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } internalCluster().ensureAtLeastNumDataNodes(2); // ensure all shards are allocated otherwise the ensure green below might not succeed since we require the merge node @@ -413,7 +412,7 @@ public class SplitIndexIT extends ESIntegTestCase { } for (int i = docs; i < 2 * docs; i++) { - client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); assertHitCount(prepareSearch("target").setSize(2 * size).setQuery(new TermsQueryBuilder("foo", "bar")), 2 * docs); @@ -446,10 +445,7 @@ public class SplitIndexIT extends ESIntegTestCase { .put("number_of_replicas", 0) ).setMapping("id", "type=keyword,doc_values=true").get(); for (int i = 0; i < 20; i++) { - client().prepareIndex("source") - .setId(Integer.toString(i)) - .setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON) - .get(); + prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON).get(); } // ensure all shards are allocated otherwise the ensure green below might not succeed since we require the merge node // if we change the setting too quickly we will end up with one replica unassigned which can't be assigned anymore due @@ -487,7 +483,7 @@ public class SplitIndexIT extends ESIntegTestCase { // ... and that the index sort is also applied to updates for (int i = 20; i < 40; i++) { - client().prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); + prepareIndex("target").setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get(); } flushAndRefresh(); assertSortedSegments("target", expectedIndexSort); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java index dc5cc49092f7..5df1ceea6bfc 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java @@ -44,15 +44,12 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase { public void testDeleteIndexOnIndexReadOnlyAllowDeleteSetting() { createIndex("test"); ensureGreen("test"); - client().prepareIndex().setIndex("test").setId("1").setSource("foo", "bar").get(); + prepareIndex("test").setId("1").setSource("foo", "bar").get(); refresh(); try { updateIndexSettings(Settings.builder().put(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE, true), "test"); assertSearchHits(prepareSearch(), "1"); - assertBlocked( - client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"), - IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK - ); + assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK); assertSearchHits(prepareSearch(), "1"); assertAcked(indicesAdmin().prepareDelete("test")); } finally { @@ -70,7 +67,7 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE, true), "test"); ClusterBlockException e = expectThrows( ClusterBlockException.class, - () -> client().prepareIndex().setIndex("test").setId("1").setSource("foo", "bar").get() + () -> prepareIndex("test").setId("1").setSource("foo", "bar").get() ); assertEquals( "index [test] blocked by: [TOO_MANY_REQUESTS/12/disk usage exceeded flood-stage watermark, " @@ -85,15 +82,12 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase { public void testDeleteIndexOnClusterReadOnlyAllowDeleteSetting() { createIndex("test"); ensureGreen("test"); - client().prepareIndex().setIndex("test").setId("1").setSource("foo", "bar").get(); + prepareIndex("test").setId("1").setSource("foo", "bar").get(); refresh(); try { updateClusterSettings(Settings.builder().put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), true)); assertSearchHits(prepareSearch(), "1"); - assertBlocked( - client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"), - Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK - ); + assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK); assertBlocked( indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 2)), Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerIT.java index 678d7b53d964..d6c337dec53b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerIT.java @@ -115,7 +115,7 @@ public class IndexDiskUsageAnalyzerIT extends ESIntegTestCase { .field("english_text", English.intToEnglish(value)) .field("value", value) .endObject(); - client().prepareIndex(index).setId("id-" + i).setSource(doc).get(); + prepareIndex(index).setId("id-" + i).setSource(doc).get(); } final boolean forceNorms = randomBoolean(); if (forceNorms) { @@ -123,7 +123,7 @@ public class IndexDiskUsageAnalyzerIT extends ESIntegTestCase { .startObject() .field("english_text", "A long sentence to make sure that norms is non-zero") .endObject(); - client().prepareIndex(index).setId("id").setSource(doc).get(); + prepareIndex(index).setId("id").setSource(doc).get(); } // Force merge to ensure that there are more than one numeric value to justify doc value. client().admin().indices().prepareForceMerge(index).setMaxNumSegments(1).get(); @@ -167,7 +167,7 @@ public class IndexDiskUsageAnalyzerIT extends ESIntegTestCase { .field("english_text", English.intToEnglish(value)) .field("value", value) .endObject(); - client().prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); + prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); } Index index = clusterService().state().metadata().index(indexName).getIndex(); List failedShards = randomSubsetOf( @@ -203,7 +203,7 @@ public class IndexDiskUsageAnalyzerIT extends ESIntegTestCase { .field("english_text", English.intToEnglish(value)) .field("value", value) .endObject(); - client().prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); + prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); } } @@ -237,7 +237,7 @@ public class IndexDiskUsageAnalyzerIT extends ESIntegTestCase { .field("english_text", English.intToEnglish(value)) .field("value", value) .endObject(); - client().prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); + prepareIndex(indexName).setId("id-" + i).setSource(doc).get(); } final Index index = resolveIndex(indexName); final List failingShards = randomSubsetOf( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java index 18be4586e704..69d4f7aaef32 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java @@ -31,7 +31,7 @@ public class FlushBlocksIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex("test").setId("" + i).setSource("test", "init").get(); + prepareIndex("test").setId("" + i).setSource("test", "init").get(); } // Request is not blocked diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java index dc0f5e9b97f5..a3474afc96c5 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeBlocksIT.java @@ -43,7 +43,7 @@ public class ForceMergeBlocksIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex("test").setId("" + i).setSource("test", "init").get(); + prepareIndex("test").setId("" + i).setSource("test", "init").get(); } // Request is not blocked diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java index aca5621be26f..0705e1216af4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java @@ -29,7 +29,7 @@ public class IndicesSegmentsBlocksIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex("test-blocks").setId("" + i).setSource("test", "init").get(); + prepareIndex("test-blocks").setId("" + i).setSource("test", "init").get(); } indicesAdmin().prepareFlush("test-blocks").get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java index e44f01f1861e..310f9394f60c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java @@ -200,7 +200,7 @@ public class IndicesShardStoreRequestIT extends ESIntegTestCase { int numDocs = scaledRandomIntBetween(10, 20); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(index).setSource("field", "value"); + builders[i] = prepareIndex(index).setSource("field", "value"); } indexRandom(true, builders); indicesAdmin().prepareFlush().setForce(true).get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java index 224db253675d..8bc9bac2543d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java @@ -159,8 +159,7 @@ public class BulkIntegrationIT extends ESIntegTestCase { while (stopped.get() == false && docID.get() < 5000) { String id = Integer.toString(docID.incrementAndGet()); try { - DocWriteResponse response = client().prepareIndex(index) - .setId(id) + DocWriteResponse response = prepareIndex(index).setId(id) .setSource(Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), XContentType.JSON) .get(); assertThat(response.getResult(), is(oneOf(CREATED, UPDATED))); 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 f1d4f6958f7f..6a2ab41fae5d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessor2RetryIT.java @@ -152,9 +152,7 @@ public class BulkProcessor2RetryIT extends ESIntegTestCase { private static void indexDocs(BulkProcessor2 processor, int numDocs) { for (int i = 1; i <= numDocs; i++) { processor.add( - client().prepareIndex() - .setIndex(INDEX_NAME) - .setId(Integer.toString(i)) + prepareIndex(INDEX_NAME).setId(Integer.toString(i)) .setSource("field", randomRealisticUnicodeOfLengthBetween(1, 30)) .request() ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java index 929ce026e32c..85b720a03478 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java @@ -31,9 +31,9 @@ public class BulkProcessorClusterSettingsIT extends ESIntegTestCase { clusterAdmin().prepareHealth("willwork").setWaitForGreenStatus().get(); BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); - bulkRequestBuilder.add(client().prepareIndex("willwork").setId("1").setSource("{\"foo\":1}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("wontwork").setId("2").setSource("{\"foo\":2}", XContentType.JSON)); - bulkRequestBuilder.add(client().prepareIndex("willwork").setId("3").setSource("{\"foo\":3}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("willwork").setId("1").setSource("{\"foo\":1}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("wontwork").setId("2").setSource("{\"foo\":2}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("willwork").setId("3").setSource("{\"foo\":3}", XContentType.JSON)); BulkResponse br = bulkRequestBuilder.get(); BulkItemResponse[] responses = br.getItems(); assertEquals(3, responses.length); @@ -52,7 +52,7 @@ public class BulkProcessorClusterSettingsIT extends ESIntegTestCase { public void testIndexWithDisabledAutoCreateIndex() { updateClusterSettings(Settings.builder().put(AutoCreateIndex.AUTO_CREATE_INDEX_SETTING.getKey(), randomFrom("-*", "+.*"))); final BulkItemResponse itemResponse = client().prepareBulk() - .add(client().prepareIndex("test-index").setSource("foo", "bar")) + .add(prepareIndex("test-index").setSource("foo", "bar")) .get() .getItems()[0]; assertThat(itemResponse.getFailure().getCause(), instanceOf(IndexNotFoundException.class)); 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 93f066d35bbc..8bd3a6cf0286 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorRetryIT.java @@ -157,9 +157,7 @@ public class BulkProcessorRetryIT extends ESIntegTestCase { private static void indexDocs(BulkProcessor processor, int numDocs) { for (int i = 1; i <= numDocs; i++) { processor.add( - client().prepareIndex() - .setIndex(INDEX_NAME) - .setId(Integer.toString(i)) + prepareIndex(INDEX_NAME).setId(Integer.toString(i)) .setSource("field", randomRealisticUnicodeOfLengthBetween(1, 30)) .request() ); 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 6b8ea38c7a81..00bd6ee7ee89 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkWithUpdatesIT.java @@ -102,11 +102,11 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { ensureGreen(); BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex().setIndex(indexOrAlias()).setId("1").setSource("field", 1)) - .add(client().prepareIndex().setIndex(indexOrAlias()).setId("2").setSource("field", 2).setCreate(true)) - .add(client().prepareIndex().setIndex(indexOrAlias()).setId("3").setSource("field", 3)) - .add(client().prepareIndex().setIndex(indexOrAlias()).setId("4").setSource("field", 4)) - .add(client().prepareIndex().setIndex(indexOrAlias()).setId("5").setSource("field", 5)) + .add(prepareIndex(indexOrAlias()).setId("1").setSource("field", 1)) + .add(prepareIndex(indexOrAlias()).setId("2").setSource("field", 2).setCreate(true)) + .add(prepareIndex(indexOrAlias()).setId("3").setSource("field", 3)) + .add(prepareIndex(indexOrAlias()).setId("4").setSource("field", 4)) + .add(prepareIndex(indexOrAlias()).setId("5").setSource("field", 5)) .get(); assertThat(bulkResponse.hasFailures(), equalTo(false)); @@ -235,9 +235,9 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { createIndex("test", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).build()); ensureGreen(); BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex("test").setId("1").setCreate(true).setSource("field", "1")) - .add(client().prepareIndex("test").setId("2").setCreate(true).setSource("field", "1")) - .add(client().prepareIndex("test").setId("1").setSource("field", "2")) + .add(prepareIndex("test").setId("1").setCreate(true).setSource("field", "1")) + .add(prepareIndex("test").setId("2").setCreate(true).setSource("field", "1")) + .add(prepareIndex("test").setId("1").setSource("field", "2")) .get(); assertEquals(DocWriteResponse.Result.CREATED, bulkResponse.getItems()[0].getResponse().getResult()); @@ -258,9 +258,9 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { assertThat(bulkResponse.getItems()[2].getResponse().getSeqNo(), equalTo(4L)); bulkResponse = client().prepareBulk() - .add(client().prepareIndex("test").setId("e1").setSource("field", "1").setVersion(10).setVersionType(VersionType.EXTERNAL)) - .add(client().prepareIndex("test").setId("e2").setSource("field", "1").setVersion(10).setVersionType(VersionType.EXTERNAL)) - .add(client().prepareIndex("test").setId("e1").setSource("field", "2").setVersion(12).setVersionType(VersionType.EXTERNAL)) + .add(prepareIndex("test").setId("e1").setSource("field", "1").setVersion(10).setVersionType(VersionType.EXTERNAL)) + .add(prepareIndex("test").setId("e2").setSource("field", "1").setVersion(10).setVersionType(VersionType.EXTERNAL)) + .add(prepareIndex("test").setId("e1").setSource("field", "2").setVersion(12).setVersionType(VersionType.EXTERNAL)) .get(); assertEquals(DocWriteResponse.Result.CREATED, bulkResponse.getItems()[0].getResponse().getResult()); @@ -284,9 +284,9 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { ensureGreen(); BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex().setIndex("test").setId("1").setSource("field", 1)) - .add(client().prepareIndex().setIndex("test").setId("2").setSource("field", 1)) - .add(client().prepareIndex().setIndex("test").setId("3").setSource("field", 1)) + .add(prepareIndex("test").setId("1").setSource("field", 1)) + .add(prepareIndex("test").setId("2").setSource("field", 1)) + .add(prepareIndex("test").setId("3").setSource("field", 1)) .get(); assertThat(bulkResponse.hasFailures(), equalTo(false)); @@ -500,7 +500,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { for (int i = 0; i < numDocs;) { final BulkRequestBuilder builder = client().prepareBulk(); for (int j = 0; j < bulk && i < numDocs; j++, i++) { - builder.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("val", i)); + builder.add(prepareIndex("test").setId(Integer.toString(i)).setSource("val", i)); } logger.info("bulk indexing {}-{}", i - bulk, i - 1); BulkResponse response = builder.get(); @@ -575,7 +575,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { } else { name = "test"; } - builder.add(client().prepareIndex().setIndex(name).setId("1").setSource("field", 1)); + builder.add(prepareIndex(name).setId("1").setSource("field", 1)); } BulkResponse bulkResponse = builder.get(); assertThat(bulkResponse.hasFailures(), is(expectFailure)); @@ -652,7 +652,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { public void testFailedRequestsOnClosedIndex() throws Exception { createIndex("bulkindex1"); - client().prepareIndex("bulkindex1").setId("1").setSource("text", "test").get(); + prepareIndex("bulkindex1").setId("1").setSource("text", "test").get(); assertBusy(() -> assertAcked(indicesAdmin().prepareClose("bulkindex1"))); BulkRequest bulkRequest = new BulkRequest().setRefreshPolicy(RefreshPolicy.IMMEDIATE); @@ -675,7 +675,7 @@ public class BulkWithUpdatesIT extends ESIntegTestCase { // issue 9821 public void testInvalidIndexNamesCorrectOpType() { BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex().setIndex("INVALID.NAME").setId("1").setSource(Requests.INDEX_CONTENT_TYPE, "field", 1)) + .add(prepareIndex("INVALID.NAME").setId("1").setSource(Requests.INDEX_CONTENT_TYPE, "field", 1)) .add(client().prepareUpdate().setIndex("INVALID.NAME").setId("1").setDoc(Requests.INDEX_CONTENT_TYPE, "field", randomInt())) .add(client().prepareDelete().setIndex("INVALID.NAME").setId("1")) .get(); 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 61f624c19f56..29a5e491dd3f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/WriteAckDelayIT.java @@ -35,7 +35,7 @@ public class WriteAckDelayIT extends ESIntegTestCase { logger.info("indexing [{}] docs", numOfDocs); List builders = new ArrayList<>(numOfDocs); for (int j = 0; j < numOfDocs; j++) { - builders.add(client().prepareIndex("test").setSource("field", "value_" + j)); + builders.add(prepareIndex("test").setSource("field", "value_" + j)); } indexRandom(true, builders); logger.info("verifying indexed content"); 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 7871a1426494..f2e0511ffb7a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/LookupRuntimeFieldIT.java @@ -40,7 +40,7 @@ public class LookupRuntimeFieldIT extends ESIntegTestCase { Map.of("author", "jack", "first_name", "Jack", "last_name", "Austin", "joined", "1999-11-03") ); for (Map author : authors) { - client().prepareIndex("authors").setSource(author).setRefreshPolicy(randomFrom(WriteRequest.RefreshPolicy.values())).get(); + prepareIndex("authors").setSource(author).setRefreshPolicy(randomFrom(WriteRequest.RefreshPolicy.values())).get(); } indicesAdmin().prepareRefresh("authors").get(); @@ -126,7 +126,7 @@ public class LookupRuntimeFieldIT extends ESIntegTestCase { Map.of("title", "the fifth book", "genre", "science", "author_id", "mike", "publisher_id", "p2", "published_date", "2021-06-30") ); for (Map book : books) { - client().prepareIndex("books").setSource(book).setRefreshPolicy(randomFrom(WriteRequest.RefreshPolicy.values())).get(); + prepareIndex("books").setSource(book).setRefreshPolicy(randomFrom(WriteRequest.RefreshPolicy.values())).get(); } indicesAdmin().prepareRefresh("books").get(); } 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 27100e925a0a..f517f82dcbe7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/PointInTimeIT.java @@ -79,7 +79,7 @@ public class PointInTimeIT extends ESIntegTestCase { int numDocs = randomIntBetween(10, 50); for (int i = 0; i < numDocs; i++) { String id = Integer.toString(i); - client().prepareIndex("test").setId(id).setSource("value", i).get(); + prepareIndex("test").setId(id).setSource("value", i).get(); } refresh("test"); String pitId = openPointInTime(new String[] { "test" }, TimeValue.timeValueMinutes(2)); @@ -122,7 +122,7 @@ public class PointInTimeIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { String id = Integer.toString(i); String index = "index-" + randomIntBetween(1, numIndices); - client().prepareIndex(index).setId(id).setSource("value", i).get(); + prepareIndex(index).setId(id).setSource("value", i).get(); } refresh(); String pitId = openPointInTime(new String[] { "*" }, TimeValue.timeValueMinutes(2)); @@ -136,7 +136,7 @@ public class PointInTimeIT extends ESIntegTestCase { for (int i = 0; i < moreDocs; i++) { String id = "more-" + i; String index = "index-" + randomIntBetween(1, numIndices); - client().prepareIndex(index).setId(id).setSource("value", i).get(); + prepareIndex(index).setId(id).setSource("value", i).get(); } refresh(); resp = prepareSearch().get(); @@ -208,7 +208,7 @@ public class PointInTimeIT extends ESIntegTestCase { ensureGreen("test"); int numDocs = randomIntBetween(10, 50); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("value", i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("value", i).get(); } refresh(); String pitId = openPointInTime(new String[] { "test" }, TimeValue.timeValueMinutes(2)); @@ -229,7 +229,7 @@ public class PointInTimeIT extends ESIntegTestCase { if (randomBoolean()) { int moreDocs = randomIntBetween(10, 50); for (int i = 0; i < moreDocs; i++) { - client().prepareIndex("test").setId("more-" + i).setSource("value", i).get(); + prepareIndex("test").setId("more-" + i).setSource("value", i).get(); } refresh(); } @@ -260,7 +260,7 @@ public class PointInTimeIT extends ESIntegTestCase { int index1 = randomIntBetween(10, 50); for (int i = 0; i < index1; i++) { String id = Integer.toString(i); - client().prepareIndex("index").setId(id).setSource("value", i).get(); + prepareIndex("index").setId(id).setSource("value", i).get(); } refresh(); String pit = openPointInTime(new String[] { "index" }, TimeValue.timeValueSeconds(5)); @@ -291,13 +291,13 @@ public class PointInTimeIT extends ESIntegTestCase { int index1 = randomIntBetween(10, 50); for (int i = 0; i < index1; i++) { String id = Integer.toString(i); - client().prepareIndex("index-1").setId(id).setSource("value", i).get(); + prepareIndex("index-1").setId(id).setSource("value", i).get(); } int index2 = randomIntBetween(10, 50); for (int i = 0; i < index2; i++) { String id = Integer.toString(i); - client().prepareIndex("index-2").setId(id).setSource("value", i).get(); + prepareIndex("index-2").setId(id).setSource("value", i).get(); } refresh(); String pit = openPointInTime(new String[] { "index-*" }, TimeValue.timeValueMinutes(2)); @@ -355,7 +355,7 @@ public class PointInTimeIT extends ESIntegTestCase { } } } - client().prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); + prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); SearchResponse resp = prepareSearch().setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) .setSearchType(SearchType.QUERY_THEN_FETCH) .setPreference(null) @@ -406,11 +406,11 @@ public class PointInTimeIT extends ESIntegTestCase { int numDocs1 = randomIntBetween(10, 50); for (int i = 0; i < numDocs1; i++) { - client().prepareIndex(randomFrom("test-1")).setId(Integer.toString(i)).setSource("value", i).get(); + prepareIndex(randomFrom("test-1")).setId(Integer.toString(i)).setSource("value", i).get(); } int numDocs2 = randomIntBetween(10, 50); for (int i = 0; i < numDocs2; i++) { - client().prepareIndex(randomFrom("test-2")).setId(Integer.toString(i)).setSource("value", i).get(); + prepareIndex(randomFrom("test-2")).setId(Integer.toString(i)).setSource("value", i).get(); } refresh(); String pitId = openPointInTime(new String[] { "test-*" }, TimeValue.timeValueMinutes(2)); @@ -442,7 +442,7 @@ public class PointInTimeIT extends ESIntegTestCase { createIndex(index, Settings.builder().put("index.number_of_shards", 1).build()); int numDocs = randomIntBetween(3, 20); for (int j = 0; j < numDocs; j++) { - client().prepareIndex(index).setSource("value", randomIntBetween(0, 2)).get(); + prepareIndex(index).setSource("value", randomIntBetween(0, 2)).get(); expectedNumDocs++; } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/search/SearchShardsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/search/SearchShardsIT.java index 68153e5e88c4..e1957c822288 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/SearchShardsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/SearchShardsIT.java @@ -47,7 +47,7 @@ public class SearchShardsIT extends ESIntegTestCase { ); int numDocs = randomIntBetween(1, 10); for (int j = 0; j < numDocs; j++) { - client().prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); + prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); } indicesAdmin().prepareRefresh(index).get(); } @@ -115,7 +115,7 @@ public class SearchShardsIT extends ESIntegTestCase { ); int numDocs = randomIntBetween(10, 1000); for (int j = 0; j < numDocs; j++) { - client().prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); + prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); } indicesAdmin().prepareRefresh(index).get(); } @@ -169,7 +169,7 @@ public class SearchShardsIT extends ESIntegTestCase { totalShards += numShards; int numDocs = randomIntBetween(10, 100); for (int j = 0; j < numDocs; j++) { - client().prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); + prepareIndex(index).setSource("value", i).setId(Integer.toString(i)).get(); } indicesAdmin().prepareRefresh(index).get(); } 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 d84d4270af24..31ffe560be01 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java @@ -419,9 +419,9 @@ public class TransportSearchIT extends ESIntegTestCase { } } }); - client().prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); - client().prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get(); - client().prepareIndex("test").setId("3").setSource("created_date", "2020-01-03").get(); + prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); + prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get(); + prepareIndex("test").setId("3").setSource("created_date", "2020-01-03").get(); assertBusy(() -> { SearchResponse resp = prepareSearch("test").setQuery(new RangeQueryBuilder("created_date").gte("2020-01-02").lte("2020-01-03")) .setPreFilterShardSize(randomIntBetween(1, 3)) @@ -546,7 +546,7 @@ public class TransportSearchIT extends ESIntegTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", numberOfShards).build()); for (int i = 0; i < numberOfDocs; i++) { - DocWriteResponse indexResponse = client().prepareIndex(indexName).setSource("number", randomInt()).get(); + DocWriteResponse indexResponse = prepareIndex(indexName).setSource("number", randomInt()).get(); assertEquals(RestStatus.CREATED, indexResponse.status()); } indicesAdmin().prepareRefresh(indexName).get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java index e489346c2438..6737d02434c0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java @@ -34,10 +34,9 @@ public class WaitActiveShardCountIT extends ESIntegTestCase { assertAcked(createIndexResponse); // indexing, by default, will work (waiting for one shard copy only) - client().prepareIndex("test").setId("1").setSource(source("1", "test"), XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource(source("1", "test"), XContentType.JSON).get(); try { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(source("1", "test"), XContentType.JSON) .setWaitForActiveShards(2) // wait for 2 active shard copies .setTimeout(timeValueMillis(100)) @@ -64,16 +63,14 @@ public class WaitActiveShardCountIT extends ESIntegTestCase { assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.YELLOW)); // this should work, since we now have two - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(source("1", "test"), XContentType.JSON) .setWaitForActiveShards(2) .setTimeout(timeValueSeconds(1)) .get(); try { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(source("1", "test"), XContentType.JSON) .setWaitForActiveShards(ActiveShardCount.ALL) .setTimeout(timeValueMillis(100)) @@ -103,8 +100,7 @@ public class WaitActiveShardCountIT extends ESIntegTestCase { assertThat(clusterHealth.getStatus(), equalTo(ClusterHealthStatus.GREEN)); // this should work, since we now have all shards started - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(source("1", "test"), XContentType.JSON) .setWaitForActiveShards(ActiveShardCount.ALL) .setTimeout(timeValueSeconds(1)) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java index 0e3967fc52c0..d98de846bd9d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java @@ -70,7 +70,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { .endObject(); assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setMapping(mapping)); - client().prepareIndex("test").setId("666").setSource("field", "foo bar").get(); + prepareIndex("test").setId("666").setSource("field", "foo bar").get(); refresh(); for (int i = 0; i < 20; i++) { ActionFuture termVector = client().termVectors(new TermVectorsRequest(indexOrAlias(), "" + i)); @@ -97,7 +97,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setMapping(mapping)); // when indexing a field that simply has a question mark, the term vectors will be null - client().prepareIndex("test").setId("0").setSource("existingfield", "?").get(); + prepareIndex("test").setId("0").setSource("existingfield", "?").get(); refresh(); ActionFuture termVector = client().termVectors( new TermVectorsRequest(indexOrAlias(), "0").selectedFields(new String[] { "existingfield" }) @@ -125,7 +125,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setMapping(mapping)); // when indexing a field that simply has a question mark, the term vectors will be null - client().prepareIndex("test").setId("0").setSource("anotherexistingfield", 1).get(); + prepareIndex("test").setId("0").setSource("anotherexistingfield", 1).get(); refresh(); ActionFuture termVectors = client().termVectors( new TermVectorsRequest(indexOrAlias(), "0").selectedFields(randomBoolean() ? new String[] { "existingfield" } : null) @@ -163,7 +163,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { List indexBuilders = new ArrayList<>(); for (int i = 0; i < 6; i++) { - indexBuilders.add(client().prepareIndex().setIndex("test").setId(String.valueOf(i)).setSource("field" + i, i)); + indexBuilders.add(prepareIndex("test").setId(String.valueOf(i)).setSource("field" + i, i)); } indexRandom(true, indexBuilders); @@ -205,8 +205,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ) ); for (int i = 0; i < 10; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("field", "the quick brown fox jumps over the lazy dog") @@ -307,8 +306,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ) ); for (int i = 0; i < 10; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("field", "the quick brown fox jumps over the lazy dog") @@ -468,7 +466,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ensureGreen(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource(source).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(source).get(); refresh(); } @@ -548,7 +546,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { List indexBuilders = new ArrayList<>(); for (String indexName : indexNames) { for (int id = 0; id < content.length; id++) { - indexBuilders.add(client().prepareIndex().setIndex(indexName).setId(String.valueOf(id)).setSource("field1", content[id])); + indexBuilders.add(prepareIndex(indexName).setId(String.valueOf(id)).setSource("field1", content[id])); } } indexRandom(true, indexBuilders); @@ -625,7 +623,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setMapping(mapping)); ensureGreen(); - client().prepareIndex("test").setId("0").setSource(source).get(); + prepareIndex("test").setId("0").setSource(source).get(); refresh(); TermVectorsResponse response = client().prepareTermVectors(indexOrAlias(), "0").setSelectedFields("field*").get(); @@ -649,7 +647,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { List indexBuilders = new ArrayList<>(); for (int i = 0; i < content.length; i++) { - indexBuilders.add(client().prepareIndex().setIndex("test").setId(String.valueOf(i)).setSource("field1", content[i])); + indexBuilders.add(prepareIndex("test").setId(String.valueOf(i)).setSource("field1", content[i])); } indexRandom(true, indexBuilders); @@ -737,7 +735,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ensureGreen(); // index a single document with prepared source - client().prepareIndex("test").setId("0").setSource(source).get(); + prepareIndex("test").setId("0").setSource(source).get(); refresh(); // create random per_field_analyzer and selected fields @@ -811,7 +809,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { assertThat(response.isExists(), equalTo(false)); logger.info("--> index doc 1"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); // From translog: @@ -857,7 +855,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { } logger.info("--> index doc 1 again, so increasing the version"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); // From translog: @@ -920,7 +918,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { } tags.add(tag); } - indexRandom(true, client().prepareIndex("test").setId("1").setSource("tags", tags)); + indexRandom(true, prepareIndex("test").setId("1").setSource("tags", tags)); logger.info("Checking best tags by longest to shortest size ..."); TermVectorsRequest.FilterSettings filterSettings = new TermVectorsRequest.FilterSettings(); @@ -956,7 +954,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { } uniqueTags.add(tag); } - indexRandom(true, client().prepareIndex("test").setId("1").setSource("tags", tags)); + indexRandom(true, prepareIndex("test").setId("1").setSource("tags", tags)); logger.info("Checking best tags by highest to lowest term freq ..."); TermVectorsRequest.FilterSettings filterSettings = new TermVectorsRequest.FilterSettings(); @@ -987,7 +985,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { List tags = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { tags.add("tag_" + i); - builders.add(client().prepareIndex("test").setId(i + "").setSource("tags", tags)); + builders.add(prepareIndex("test").setId(i + "").setSource("tags", tags)); } indexRandom(true, builders); @@ -1013,7 +1011,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ensureGreen(); // index document - indexRandom(true, client().prepareIndex("test").setId("1").setSource("field1", "random permutation")); + indexRandom(true, prepareIndex("test").setId("1").setSource("field1", "random permutation")); // Get search shards ClusterSearchShardsResponse searchShardsResponse = clusterAdmin().prepareSearchShards("test").get(); @@ -1049,7 +1047,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { ensureGreen(); // add a doc with a bad long field - indexRandom(true, client().prepareIndex("index").setId("1").setSource("{\"field\":\"foo\"}", XContentType.JSON)); + indexRandom(true, prepareIndex("index").setId("1").setSource("{\"field\":\"foo\"}", XContentType.JSON)); // do a tv request for all fields, _ignored should be returned TermVectorsResponse resp = client().prepareTermVectors("index", "1").setSelectedFields("*").get(); @@ -1086,10 +1084,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase { for (String indexName : indexNames) { for (int id = 0; id < content.length; id++) { indexBuilders.add( - client().prepareIndex() - .setIndex(indexName) - .setId(String.valueOf(id)) - .setSource("field1", content[id], "field2", content[id]) + prepareIndex(indexName).setId(String.valueOf(id)).setSource("field1", content[id], "field2", content[id]) ); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java index 839ead29ea25..9beffa7f964d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/MultiTermVectorsIT.java @@ -84,7 +84,7 @@ public class MultiTermVectorsIT extends AbstractTermVectorsTestCase { assertThat(response.getResponses()[0].getResponse().isExists(), equalTo(false)); for (int i = 0; i < 3; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } // Version from translog @@ -133,7 +133,7 @@ public class MultiTermVectorsIT extends AbstractTermVectorsTestCase { assertThat(response.getResponses()[2].getFailure().getCause().getCause(), instanceOf(VersionConflictEngineException.class)); for (int i = 0; i < 3; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } // Version from translog diff --git a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java index 98aa767bfde0..8ede5dc5ef29 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java @@ -1137,7 +1137,7 @@ public class IndexAliasesIT extends ESIntegTestCase { final int numDocs = scaledRandomIntBetween(5, 52); for (int i = 1; i <= numDocs; i++) { - client().prepareIndex("my-index").setSource("timestamp", "2016-12-12").get(); + prepareIndex("my-index").setSource("timestamp", "2016-12-12").get(); if (i % 2 == 0) { refresh(); assertHitCount(prepareSearch("filter1"), i); @@ -1233,7 +1233,7 @@ public class IndexAliasesIT extends ESIntegTestCase { public void testRemoveIndexAndReplaceWithAlias() throws InterruptedException, ExecutionException { assertAcked(indicesAdmin().prepareCreate("test")); - indexRandom(true, client().prepareIndex("test_2").setId("test").setSource("test", "test")); + indexRandom(true, prepareIndex("test_2").setId("test").setSource("test", "test")); assertAliasesVersionIncreases( "test_2", () -> assertAcked(indicesAdmin().prepareAliases().addAlias("test_2", "test").removeIndex("test")) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java index 9c4d18e3294f..6206f2357218 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java @@ -125,7 +125,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { private void canIndexDocument(String index) { try { - IndexRequestBuilder builder = client().prepareIndex(index); + IndexRequestBuilder builder = prepareIndex(index); builder.setSource("foo", "bar"); DocWriteResponse r = builder.get(); assertThat(r, notNullValue()); @@ -136,7 +136,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { private void canNotIndexDocument(String index) { try { - IndexRequestBuilder builder = client().prepareIndex(index); + IndexRequestBuilder builder = prepareIndex(index); builder.setSource("foo", "bar"); builder.get(); fail(); @@ -250,9 +250,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) - .collect(toList()) + IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList()) ); final APIBlock block = randomAddableBlock(); @@ -278,7 +276,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { false, randomBoolean(), IntStream.range(0, randomIntBetween(1, 10)) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) + .mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) .collect(toList()) ); } @@ -323,9 +321,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) - .collect(toList()) + IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList()) ); ensureYellowAndNoInitializingShards(indexName); @@ -404,7 +400,7 @@ public class SimpleBlocksIT extends ESIntegTestCase { false, randomBoolean(), IntStream.range(0, 10) - .mapToObj(n -> client().prepareIndex(indexName).setId(String.valueOf(n)).setSource("num", n)) + .mapToObj(n -> prepareIndex(indexName).setId(String.valueOf(n)).setSource("num", n)) .collect(toList()) ); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java index 19b7212b7302..746ddc56870a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java @@ -93,7 +93,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase { NumShards numShards = getNumShards("test"); logger.info("--> indexing some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); } // make sure that all shards recovered before trying to flush assertThat( @@ -237,7 +237,7 @@ public class MinimumMasterNodesIT extends ESIntegTestCase { NumShards numShards = getNumShards("test"); logger.info("--> indexing some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); } ensureGreen(); // make sure that all shards recovered before trying to flush diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java index 4a8fa894cb42..23c13a3dbf57 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/NoMasterNodeIT.java @@ -224,8 +224,8 @@ public class NoMasterNodeIT extends ESIntegTestCase { prepareCreate("test1").setSettings(indexSettings(1, 2)).get(); prepareCreate("test2").setSettings(indexSettings(3, 0)).get(); clusterAdmin().prepareHealth("_all").setWaitForGreenStatus().get(); - client().prepareIndex("test1").setId("1").setSource("field", "value1").get(); - client().prepareIndex("test2").setId("1").setSource("field", "value1").get(); + prepareIndex("test1").setId("1").setSource("field", "value1").get(); + prepareIndex("test2").setId("1").setSource("field", "value1").get(); refresh(); ensureSearchable("test1", "test2"); @@ -300,7 +300,7 @@ public class NoMasterNodeIT extends ESIntegTestCase { prepareCreate("test1").setSettings(indexSettings(1, 1)).get(); clusterAdmin().prepareHealth("_all").setWaitForGreenStatus().get(); - client().prepareIndex("test1").setId("1").setSource("field", "value1").get(); + prepareIndex("test1").setId("1").setSource("field", "value1").get(); refresh(); ensureGreen("test1"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java index 53e8c290cc1e..3b9d3e133b63 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java @@ -277,7 +277,7 @@ public class ClusterRerouteIT extends ESIntegTestCase { ); if (closed == false) { - client().prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); } final Index index = resolveIndex("test"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java index 2d542a27c167..04fba1f46074 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java @@ -48,7 +48,7 @@ public class FilteringAllocationIT extends ESIntegTestCase { ensureGreen("test"); logger.info("--> index some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } indicesAdmin().prepareRefresh().get(); assertThat(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(100L)); @@ -129,7 +129,7 @@ public class FilteringAllocationIT extends ESIntegTestCase { logger.info("--> index some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } indicesAdmin().prepareRefresh().get(); assertThat(prepareSearch().setSize(0).setQuery(QueryBuilders.matchAllQuery()).get().getHits().getTotalHits().value, equalTo(100L)); 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 80bba57270aa..3869952bf3b7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java @@ -284,7 +284,7 @@ public class RareClusterStateIT extends ESIntegTestCase { // this request does not change the cluster state, because mapping is already created, // we don't await and cancel committed publication - ActionFuture docIndexResponse = client().prepareIndex("index").setId("1").setSource("field", 42).execute(); + ActionFuture docIndexResponse = prepareIndex("index").setId("1").setSource("field", 42).execute(); // Wait a bit to make sure that the reason why we did not get a response // is that cluster state processing is blocked and not just that it takes @@ -373,7 +373,7 @@ public class RareClusterStateIT extends ESIntegTestCase { assertEquals(minVersion, maxVersion); }); - final ActionFuture docIndexResponse = client().prepareIndex("index").setId("1").setSource("field", 42).execute(); + final ActionFuture docIndexResponse = prepareIndex("index").setId("1").setSource("field", 42).execute(); assertBusy(() -> assertTrue(client().prepareGet("index", "1").get().isExists())); @@ -383,7 +383,7 @@ public class RareClusterStateIT extends ESIntegTestCase { // this request does not change the cluster state, because the mapping is dynamic, // we need to await and cancel committed publication ActionFuture dynamicMappingsFut = executeAndCancelCommittedPublication( - client().prepareIndex("index").setId("2").setSource("field2", 42) + prepareIndex("index").setId("2").setSource("field2", 42) ); // ...and wait for second mapping to be available on master diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java index ae8662dc5517..012cb826a440 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/AllocationIdIT.java @@ -154,7 +154,7 @@ public class AllocationIdIT extends ESIntegTestCase { final int numExtraDocs = between(10, 100); IndexRequestBuilder[] builders = new IndexRequestBuilder[numExtraDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource(source); + builders[i] = prepareIndex(indexName).setSource(source); } indexRandom(true, false, true, Arrays.asList(builders)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java index 609a47815b07..543b0be8ae48 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java @@ -138,7 +138,7 @@ public class DelayedAllocationIT extends ESIntegTestCase { int numDocs = scaledRandomIntBetween(100, 1000); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } // we want to test both full divergent copies of the shard in terms of segments, and // a case where they are the same (using sync flush), index Random does all this goodness diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java index a33a22934877..b65e715b454d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java @@ -91,7 +91,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { ensureGreen(); BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex().setIndex("test").setId("1").setSource("field1", "value1")) + .add(prepareIndex("test").setId("1").setSource("field1", "value1")) .add(client().prepareUpdate().setIndex("test").setId("1").setDoc("field2", "value2")) .get(); @@ -112,7 +112,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { // returns data paths settings of in-sync shard copy private Settings createStaleReplicaScenario(String master) throws Exception { - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); refresh(); ClusterState state = clusterAdmin().prepareState().all().get().getState(); List shards = state.routingTable().allShards("test"); @@ -436,7 +436,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { ensureYellow("test"); assertEquals(2, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size()); logger.info("--> indexing..."); - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); assertEquals(1, clusterAdmin().prepareState().get().getState().metadata().index("test").inSyncAllocationIds(0).size()); internalCluster().restartRandomDataNode(new InternalTestCluster.RestartCallback() { @Override @@ -463,7 +463,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { logger.info("--> creating index with 1 primary and 2 replicas"); createIndex("test", randomIntBetween(1, 3), 2); ensureGreen("test"); - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); logger.info("--> removing 2 nodes from cluster"); internalCluster().stopNode(nodes.get(1)); internalCluster().stopNode(nodes.get(2)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java index 3e38ef22834d..31e45e64d8af 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java @@ -60,10 +60,7 @@ public class DiskThresholdMonitorIT extends DiskUsageIntegTestCase { getTestFileStore(dataNodeName).setTotalSpace(1L); refreshClusterInfo(); assertBusy(() -> { - assertBlocked( - client().prepareIndex().setIndex(indexName).setId("1").setSource("f", "g"), - IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK - ); + assertBlocked(prepareIndex(indexName).setId("1").setSource("f", "g"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK); assertThat(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE), equalTo("true")); }); @@ -115,10 +112,7 @@ public class DiskThresholdMonitorIT extends DiskUsageIntegTestCase { getTestFileStore(dataNodeName).setTotalSpace(1L); refreshClusterInfo(); assertBusy(() -> { - assertBlocked( - client().prepareIndex().setIndex(indexName).setId("1").setSource("f", "g"), - IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK - ); + assertBlocked(prepareIndex(indexName).setId("1").setSource("f", "g"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK); assertThat(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE), equalTo("true")); }); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java index ead474e6eea2..b1ac5b02f7dd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java @@ -182,7 +182,7 @@ public class DiskThresholdDeciderIT extends DiskUsageIntegTestCase { while (true) { final IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[scaledRandomIntBetween(100, 10000)]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex(indexName).setSource("field", randomAlphaOfLength(10)); + indexRequestBuilders[i] = prepareIndex(indexName).setSource("field", randomAlphaOfLength(10)); } indexRandom(true, indexRequestBuilders); forceMerge(); 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 965674b77299..fd5e54631fd7 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 @@ -194,7 +194,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase { assertThat("node2 has 2 shards", shardCountByNodeId.get(nodeIds.get(2)), equalTo(2)); } - client().prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); 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 @@ -208,19 +208,13 @@ public class MockDiskUsagesIT extends ESIntegTestCase { ); assertBusy( - () -> assertBlocked( - client().prepareIndex().setIndex("test").setId("1").setSource("foo", "bar"), - IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK - ) + () -> assertBlocked(prepareIndex("test").setId("1").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK) ); assertFalse(clusterAdmin().prepareHealth("test").setWaitForEvents(Priority.LANGUID).get().isTimedOut()); // Cannot add further documents - assertBlocked( - client().prepareIndex().setIndex("test").setId("2").setSource("foo", "bar"), - IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK - ); + assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK); assertSearchHits(prepareSearch("test"), "1"); logger.info("--> index is confirmed read-only, releasing disk space"); @@ -231,11 +225,7 @@ public class MockDiskUsagesIT extends ESIntegTestCase { // Attempt to create a new document until DiskUsageMonitor unblocks the index assertBusy(() -> { try { - client().prepareIndex("test") - .setId("3") - .setSource("foo", "bar") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("test").setId("3").setSource("foo", "bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); } catch (ClusterBlockException e) { throw new AssertionError("retrying", e); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java index 168d87a17f9a..d52498043366 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java @@ -115,7 +115,7 @@ public class ClusterSearchShardsIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex("test-blocks").setId("" + i).setSource("test", "init").get(); + prepareIndex("test-blocks").setId("" + i).setSource("test", "init").get(); } ensureGreen("test-blocks"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java index 2561799b475a..5ea78a6b1e3a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionCleanSettingsIT.java @@ -57,7 +57,7 @@ public class ClusterDisruptionCleanSettingsIT extends ESIntegTestCase { final String node_2 = internalCluster().startDataOnlyNode(); List indexRequestBuilderList = new ArrayList<>(); for (int i = 0; i < 100; i++) { - indexRequestBuilderList.add(client().prepareIndex().setIndex("test").setSource("{\"int_field\":1}", XContentType.JSON)); + indexRequestBuilderList.add(prepareIndex("test").setSource("{\"int_field\":1}", XContentType.JSON)); } indexRandom(true, indexRequestBuilderList); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java index 586e95484afa..4aabf0ac66a3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java @@ -482,8 +482,7 @@ public class ClusterDisruptionIT extends AbstractDisruptionTestCase { while (stopped.get() == false && docID.get() < 5000) { String id = Integer.toString(docID.incrementAndGet()); try { - DocWriteResponse response = client().prepareIndex(index) - .setId(id) + DocWriteResponse response = prepareIndex(index).setId(id) .setSource(Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), XContentType.JSON) .get(); assertThat(response.getResult(), is(oneOf(CREATED, UPDATED))); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java index 8a83dcf80800..af254d42ec3e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java @@ -240,9 +240,9 @@ public class MasterDisruptionIT extends AbstractDisruptionTestCase { disruption.startDisrupting(); BulkRequestBuilder bulk = client().prepareBulk(); - bulk.add(client().prepareIndex("test").setId("2").setSource("{ \"f\": 1 }", XContentType.JSON)); - bulk.add(client().prepareIndex("test").setId("3").setSource("{ \"g\": 1 }", XContentType.JSON)); - bulk.add(client().prepareIndex("test").setId("4").setSource("{ \"f\": 1 }", XContentType.JSON)); + bulk.add(prepareIndex("test").setId("2").setSource("{ \"f\": 1 }", XContentType.JSON)); + bulk.add(prepareIndex("test").setId("3").setSource("{ \"g\": 1 }", XContentType.JSON)); + bulk.add(prepareIndex("test").setId("4").setSource("{ \"f\": 1 }", XContentType.JSON)); BulkResponse bulkResponse = bulk.get(); assertTrue(bulkResponse.hasFailures()); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java index bf5970f5ea40..526921fdc95b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/SnapshotDisruptionIT.java @@ -222,7 +222,7 @@ public class SnapshotDisruptionIT extends AbstractSnapshotIntegTestCase { final String indexName = "index-one"; createIndex(indexName); - client().prepareIndex(indexName).setSource("foo", "bar").get(); + prepareIndex(indexName).setSource("foo", "bar").get(); blockDataNode(repoName, dataNode); @@ -272,7 +272,7 @@ public class SnapshotDisruptionIT extends AbstractSnapshotIntegTestCase { final int numdocs = randomIntBetween(10, 100); IndexRequestBuilder[] builders = new IndexRequestBuilder[numdocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(idxName).setId(Integer.toString(i)).setSource("field1", "bar " + i); + builders[i] = prepareIndex(idxName).setId(Integer.toString(i)).setSource("field1", "bar " + i); } indexRandom(true, builders); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java index 7b918fb51a8a..adf50264922e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/document/DocumentActionsIT.java @@ -56,9 +56,7 @@ public class DocumentActionsIT extends ESIntegTestCase { logger.info("Running Cluster Health"); ensureGreen(); logger.info("Indexing [type1/1]"); - DocWriteResponse indexResponse = client().prepareIndex() - .setIndex("test") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("test").setId("1") .setSource(source("1", "test")) .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .get(); @@ -181,12 +179,12 @@ public class DocumentActionsIT extends ESIntegTestCase { ensureGreen(); BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex().setIndex("test").setId("1").setSource(source("1", "test"))) - .add(client().prepareIndex().setIndex("test").setId("2").setSource(source("2", "test")).setCreate(true)) - .add(client().prepareIndex().setIndex("test").setSource(source("3", "test"))) - .add(client().prepareIndex().setIndex("test").setCreate(true).setSource(source("4", "test"))) + .add(prepareIndex("test").setId("1").setSource(source("1", "test"))) + .add(prepareIndex("test").setId("2").setSource(source("2", "test")).setCreate(true)) + .add(prepareIndex("test").setSource(source("3", "test"))) + .add(prepareIndex("test").setCreate(true).setSource(source("4", "test"))) .add(client().prepareDelete().setIndex("test").setId("1")) - .add(client().prepareIndex().setIndex("test").setSource("{ xxx }", XContentType.JSON)) // failure + .add(prepareIndex("test").setSource("{ xxx }", XContentType.JSON)) // failure .get(); assertThat(bulkResponse.hasFailures(), equalTo(true)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java index 6571b9a6c928..3aa97f79a82d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java @@ -33,7 +33,7 @@ public class ShardInfoIT extends ESIntegTestCase { public void testIndexAndDelete() throws Exception { prepareIndex(1); - DocWriteResponse indexResponse = client().prepareIndex("idx").setSource("{}", XContentType.JSON).get(); + DocWriteResponse indexResponse = prepareIndex("idx").setSource("{}", XContentType.JSON).get(); assertShardInfo(indexResponse); DeleteResponse deleteResponse = client().prepareDelete("idx", indexResponse.getId()).get(); assertShardInfo(deleteResponse); @@ -49,7 +49,7 @@ public class ShardInfoIT extends ESIntegTestCase { prepareIndex(1); BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); for (int i = 0; i < 10; i++) { - bulkRequestBuilder.add(client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + bulkRequestBuilder.add(prepareIndex("idx").setSource("{}", XContentType.JSON)); } BulkResponse bulkResponse = bulkRequestBuilder.get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java index 30940c1e154b..8c6abc3e14cd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeEnvironmentIT.java @@ -84,7 +84,7 @@ public class NodeEnvironmentIT extends ESIntegTestCase { internalCluster().startNode(dataPathSettings); logger.info("--> indexing a simple document"); - client().prepareIndex(indexName).setId("1").setSource("field1", "value1").get(); + prepareIndex(indexName).setId("1").setSource("field1", "value1").get(); logger.info("--> restarting the node without the data role"); ex = expectThrows( @@ -152,7 +152,7 @@ public class NodeEnvironmentIT extends ESIntegTestCase { public void testUpgradeDataFolder() throws IOException, InterruptedException { String node = internalCluster().startNode(); prepareCreate("test").get(); - indexRandom(true, client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("test").setId("1").setSource("{}", XContentType.JSON)); String nodeId = clusterAdmin().prepareState().get().getState().nodes().getMasterNodeId(); final Settings dataPathSettings = internalCluster().dataPathSettings(node); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeRepurposeCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeRepurposeCommandIT.java index 06bb86b8e072..2a5295caf31b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/env/NodeRepurposeCommandIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/env/NodeRepurposeCommandIT.java @@ -35,7 +35,7 @@ public class NodeRepurposeCommandIT extends ESIntegTestCase { prepareCreate(indexName, indexSettings(1, 0)).get(); logger.info("--> indexing a simple document"); - client().prepareIndex(indexName).setId("1").setSource("field1", "value1").get(); + prepareIndex(indexName).setId("1").setSource("field1", "value1").get(); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/explain/ExplainActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/explain/ExplainActionIT.java index efb1096fac01..943d4aad55ec 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/explain/ExplainActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/explain/ExplainActionIT.java @@ -42,7 +42,7 @@ public class ExplainActionIT extends ESIntegTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setSettings(Settings.builder().put("index.refresh_interval", -1))); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("field", "value1").get(); + prepareIndex("test").setId("1").setSource("field", "value1").get(); ExplainResponse response = client().prepareExplain(indexOrAlias(), "1").setQuery(QueryBuilders.matchAllQuery()).get(); assertNotNull(response); @@ -99,8 +99,7 @@ public class ExplainActionIT extends ESIntegTestCase { ); ensureGreen("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().startObject("obj1").field("field1", "value1").field("field2", "value2").endObject().endObject() ) @@ -158,8 +157,7 @@ public class ExplainActionIT extends ESIntegTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias"))); ensureGreen("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().startObject("obj1").field("field1", "value1").field("field2", "value2").endObject().endObject() ) @@ -196,7 +194,7 @@ public class ExplainActionIT extends ESIntegTestCase { ); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").get(); refresh(); ExplainResponse response = client().prepareExplain("alias1", "1").setQuery(QueryBuilders.matchAllQuery()).get(); @@ -213,7 +211,7 @@ public class ExplainActionIT extends ESIntegTestCase { ); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").get(); refresh(); ExplainResponse response = client().prepareExplain("alias1", "1") @@ -240,7 +238,7 @@ public class ExplainActionIT extends ESIntegTestCase { String aMonthAgo = DateTimeFormatter.ISO_LOCAL_DATE.format(now.minusMonths(1)); String aMonthFromNow = DateTimeFormatter.ISO_LOCAL_DATE.format(now.plusMonths(1)); - client().prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); + prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); refresh(); @@ -290,8 +288,8 @@ public class ExplainActionIT extends ESIntegTestCase { .get(); ensureGreen("twitter"); - client().prepareIndex("twitter").setId("1").setSource("user", "user1", "followers", new String[] { "user2", "user3" }).get(); - client().prepareIndex("twitter").setId("2").setSource("user", "user2", "followers", new String[] { "user1" }).get(); + prepareIndex("twitter").setId("1").setSource("user", "user1", "followers", new String[] { "user2", "user3" }).get(); + prepareIndex("twitter").setId("2").setSource("user", "user2", "followers", new String[] { "user1" }).get(); refresh(); TermsQueryBuilder termsLookupQuery = QueryBuilders.termsLookupQuery("user", new TermsLookup("twitter", "2", "followers")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java index dce2016f822b..600219da3d90 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/GatewayIndexStateIT.java @@ -127,7 +127,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { ); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); logger.info("--> closing test index..."); assertAcked(indicesAdmin().prepareClose("test")); @@ -141,14 +141,14 @@ public class GatewayIndexStateIT extends ESIntegTestCase { logger.info("--> trying to index into a closed index ..."); try { - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); fail(); } catch (IndexClosedException e) { // all is well } logger.info("--> creating another index (test2) by indexing into it"); - client().prepareIndex("test2").setId("1").setSource("field1", "value1").get(); + prepareIndex("test2").setId("1").setSource("field1", "value1").get(); logger.info("--> verifying that the state is green"); ensureGreen(); @@ -187,7 +187,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { logger.info("--> trying to index into a closed index ..."); try { - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); fail(); } catch (IndexClosedException e) { // all is well @@ -212,7 +212,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { assertThat(getResponse.isExists(), equalTo(true)); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("2").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field1", "value1").get(); } public void testJustMasterNode() throws Exception { @@ -251,7 +251,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { logger.info("--> create an index"); indicesAdmin().prepareCreate("test").get(); - client().prepareIndex("test").setSource("field1", "value1").get(); + prepareIndex("test").setSource("field1", "value1").get(); } public void testTwoNodesSingleDoc() throws Exception { @@ -261,7 +261,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { internalCluster().startNodes(2); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); logger.info("--> waiting for green status"); ClusterHealthResponse health = clusterAdmin().prepareHealth() @@ -365,7 +365,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { logger.info("--> starting one node"); internalCluster().startNode(); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); logger.info("--> waiting for green status"); if (usually()) { ensureYellow(); @@ -442,7 +442,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { } }""").get(); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value one").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value one").setRefreshPolicy(IMMEDIATE).get(); logger.info("--> waiting for green status"); if (usually()) { ensureYellow(); @@ -490,7 +490,7 @@ public class GatewayIndexStateIT extends ESIntegTestCase { public void testArchiveBrokenClusterSettings() throws Exception { logger.info("--> starting one node"); internalCluster().startNode(); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); logger.info("--> waiting for green status"); if (usually()) { ensureYellow(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java index a77201e1e141..15a72e3534b5 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/QuorumGatewayIT.java @@ -42,11 +42,11 @@ public class QuorumGatewayIT extends ESIntegTestCase { final NumShards test = getNumShards("test"); logger.info("--> indexing..."); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); // We don't check for failures in the flush response: if we do we might get the following: // FlushNotAllowedEngineException[[test][1] recovery is in progress, flush [COMMIT_TRANSLOG] is not allowed] flush(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); refresh(); for (int i = 0; i < 10; i++) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java index a7ca45cd92a2..f05a83e861e5 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java @@ -96,24 +96,19 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { ); assertAcked(prepareCreate("test").setMapping(mapping)); - client().prepareIndex("test") - .setId("10990239") + prepareIndex("test").setId("10990239") .setSource(jsonBuilder().startObject().startArray("appAccountIds").value(14).value(179).endArray().endObject()) .get(); - client().prepareIndex("test") - .setId("10990473") + prepareIndex("test").setId("10990473") .setSource(jsonBuilder().startObject().startArray("appAccountIds").value(14).endArray().endObject()) .get(); - client().prepareIndex("test") - .setId("10990513") + prepareIndex("test").setId("10990513") .setSource(jsonBuilder().startObject().startArray("appAccountIds").value(14).value(179).endArray().endObject()) .get(); - client().prepareIndex("test") - .setId("10990695") + prepareIndex("test").setId("10990695") .setSource(jsonBuilder().startObject().startArray("appAccountIds").value(14).endArray().endObject()) .get(); - client().prepareIndex("test") - .setId("11026351") + prepareIndex("test").setId("11026351") .setSource(jsonBuilder().startObject().startArray("appAccountIds").value(14).endArray().endObject()) .get(); @@ -270,9 +265,9 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { public void testSingleNodeWithFlush() throws Exception { internalCluster().startNode(); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); flush(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); refresh(); assertHitCount(prepareSearch().setSize(0).setQuery(matchAllQuery()), 2); @@ -307,9 +302,9 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { final String firstNode = internalCluster().startNode(); internalCluster().startNode(); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); flush(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); refresh(); logger.info("Running Cluster Health (wait for the shards to startup)"); @@ -357,9 +352,9 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { Settings node2DataPathSettings = internalCluster().dataPathSettings(nodes.get(1)); assertAcked(indicesAdmin().prepareCreate("test")); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "value1").endObject()).get(); indicesAdmin().prepareFlush().get(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("field", "value2").endObject()).get(); indicesAdmin().prepareRefresh().get(); logger.info("--> running cluster_health (wait for the shards to startup)"); @@ -376,7 +371,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { internalCluster().stopRandomDataNode(); logger.info("--> one node is closed - start indexing data into the second one"); - client().prepareIndex("test").setId("3").setSource(jsonBuilder().startObject().field("field", "value3").endObject()).get(); + prepareIndex("test").setId("3").setSource(jsonBuilder().startObject().field("field", "value3").endObject()).get(); // TODO: remove once refresh doesn't fail immediately if there a master block: // https://github.com/elastic/elasticsearch/issues/9997 // clusterAdmin().prepareHealth("test").setWaitForYellowStatus().get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java index 8cbce0cc098e..e7988d447571 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java @@ -89,7 +89,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(100, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(100, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); indicesAdmin().prepareFlush(indexName).get(); if (randomBoolean()) { @@ -97,7 +97,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(0, 80)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(0, 80)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); } ensureActivePeerRecoveryRetentionLeasesAdvanced(indexName); @@ -152,7 +152,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(10, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(10, 100)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); internalCluster().stopNode(nodeWithReplica); if (randomBoolean()) { @@ -160,7 +160,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(10, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(10, 100)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); } CountDownLatch blockRecovery = new CountDownLatch(1); @@ -184,7 +184,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(50, 200)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(50, 200)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); indicesAdmin().prepareFlush(indexName).get(); assertBusy(() -> { @@ -235,14 +235,14 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(200, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(200, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); indicesAdmin().prepareFlush(indexName).get(); indexRandom( randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(0, 80)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(0, 80)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); if (randomBoolean()) { indicesAdmin().prepareForceMerge(indexName).get(); @@ -281,7 +281,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(200, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(200, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); indicesAdmin().prepareFlush(indexName).get(); String nodeWithLowerMatching = randomFrom(internalCluster().nodesInclude(indexName)); @@ -293,7 +293,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(1, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(1, 100)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); ensureActivePeerRecoveryRetentionLeasesAdvanced(indexName); String nodeWithHigherMatching = randomFrom(internalCluster().nodesInclude(indexName)); @@ -304,7 +304,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(1, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(1, 100)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); } @@ -338,7 +338,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(200, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(200, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); indicesAdmin().prepareFlush(indexName).get(); String brokenNode = internalCluster().startDataOnlyNode(); @@ -384,7 +384,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(1, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).toList() + IntStream.range(0, randomIntBetween(1, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).toList() ); ensureActivePeerRecoveryRetentionLeasesAdvanced(indexName); assertAcked(indicesAdmin().prepareClose(indexName)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java index 313d1e686e1f..4993d583d105 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java @@ -170,7 +170,7 @@ public class ReplicaShardAllocatorSyncIdIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(100, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(100, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); if (randomBoolean()) { indicesAdmin().prepareFlush(indexName).get(); @@ -227,7 +227,7 @@ public class ReplicaShardAllocatorSyncIdIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(200, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(200, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); if (randomBoolean()) { indicesAdmin().prepareFlush(indexName).get(); @@ -265,7 +265,7 @@ public class ReplicaShardAllocatorSyncIdIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(200, 500)).mapToObj(n -> client().prepareIndex(indexName).setSource("f", "v")).toList() + IntStream.range(0, between(200, 500)).mapToObj(n -> prepareIndex(indexName).setSource("f", "v")).toList() ); } if (randomBoolean()) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/get/GetActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/get/GetActionIT.java index 129b83f66492..ac67b63ed160 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/get/GetActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/get/GetActionIT.java @@ -81,7 +81,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.isExists(), equalTo(false)); logger.info("--> index doc 1"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); logger.info("--> non realtime get 1"); response = client().prepareGet(indexOrAlias(), "1").setRealtime(false).get(); @@ -168,7 +168,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.getField("field2"), nullValue()); logger.info("--> update doc 1"); - client().prepareIndex("test").setId("1").setSource("field1", "value1_1", "field2", "value2_1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1_1", "field2", "value2_1").get(); logger.info("--> realtime get 1"); response = client().prepareGet(indexOrAlias(), "1").get(); @@ -178,7 +178,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.getSourceAsMap().get("field2").toString(), equalTo("value2_1")); logger.info("--> update doc 1 again"); - client().prepareIndex("test").setId("1").setSource("field1", "value1_2", "field2", "value2_2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1_2", "field2", "value2_2").get(); response = client().prepareGet(indexOrAlias(), "1").get(); assertThat(response.isExists(), equalTo(true)); @@ -202,10 +202,7 @@ public class GetActionIT extends ESIntegTestCase { } else { indicesAdmin().prepareCreate("index3").addAlias(new Alias("alias1").indexRouting("1").writeIndex(true)).get(); } - DocWriteResponse indexResponse = client().prepareIndex("index1") - .setId("id") - .setSource(Collections.singletonMap("foo", "bar")) - .get(); + DocWriteResponse indexResponse = prepareIndex("index1").setId("id").setSource(Collections.singletonMap("foo", "bar")).get(); assertThat(indexResponse.status().getStatus(), equalTo(RestStatus.CREATED.getStatus())); IllegalArgumentException exception = expectThrows( @@ -232,7 +229,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.getResponses()[0].getResponse().isExists(), equalTo(false)); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } response = client().prepareMultiGet() @@ -294,7 +291,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.isExists(), equalTo(false)); assertThat(response.isExists(), equalTo(false)); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().array("field", "1", "2").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().array("field", "1", "2").endObject()).get(); response = client().prepareGet("test", "1").setStoredFields("field").get(); assertThat(response.isExists(), equalTo(true)); @@ -325,7 +322,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.isExists(), equalTo(false)); logger.info("--> index doc 1"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); // From translog: @@ -369,7 +366,7 @@ public class GetActionIT extends ESIntegTestCase { } logger.info("--> index doc 1 again, so increasing the version"); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); // From translog: @@ -424,7 +421,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.getResponses()[0].getResponse().isExists(), equalTo(false)); for (int i = 0; i < 3; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } // Version from translog @@ -474,7 +471,7 @@ public class GetActionIT extends ESIntegTestCase { assertThat(response.getResponses()[2].getFailure().getFailure(), instanceOf(VersionConflictEngineException.class)); for (int i = 0; i < 3; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } // Version from translog @@ -547,8 +544,7 @@ public class GetActionIT extends ESIntegTestCase { .setSettings(Settings.builder().put("index.refresh_interval", -1)) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().startObject("field1").field("field2", "value1").endObject().endObject()) .get(); @@ -625,7 +621,7 @@ public class GetActionIT extends ESIntegTestCase { logger.info("indexing documents"); - client().prepareIndex("my-index").setId("1").setSource(source, XContentType.JSON).get(); + prepareIndex("my-index").setId("1").setSource(source, XContentType.JSON).get(); logger.info("checking real time retrieval"); @@ -720,7 +716,7 @@ public class GetActionIT extends ESIntegTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("alias")).setSource(createIndexSource, XContentType.JSON)); ensureGreen(); - client().prepareIndex("test").setId("1").setRouting("routingValue").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setRouting("routingValue").setId("1").setSource("{}", XContentType.JSON).get(); String[] fieldsList = { "_routing" }; // before refresh - document is only in translog @@ -749,7 +745,7 @@ public class GetActionIT extends ESIntegTestCase { "text": "some text." } """; - client().prepareIndex("test").setId("1").setSource(doc, XContentType.JSON).setRouting("1").get(); + prepareIndex("test").setId("1").setSource(doc, XContentType.JSON).setRouting("1").get(); String[] fieldsList = { "_routing" }; // before refresh - document is only in translog assertGetFieldsAlwaysWorks(indexOrAlias(), "1", fieldsList, "1"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/get/GetFromTranslogActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/get/GetFromTranslogActionIT.java index 33038a0fb32a..c9432ede0491 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/get/GetFromTranslogActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/get/GetFromTranslogActionIT.java @@ -44,11 +44,7 @@ public class GetFromTranslogActionIT extends ESIntegTestCase { // There hasn't been any switches from unsafe to safe map assertThat(response.segmentGeneration(), equalTo(-1L)); - var indexResponse = client().prepareIndex("test") - .setId("1") - .setSource("field1", "value1") - .setRefreshPolicy(RefreshPolicy.NONE) - .get(); + var indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(RefreshPolicy.NONE).get(); response = getFromTranslog(indexOrAlias(), "1"); assertNotNull(response.getResult()); assertThat(response.getResult().isExists(), equalTo(true)); @@ -61,7 +57,7 @@ public class GetFromTranslogActionIT extends ESIntegTestCase { assertThat(response.getResult().isExists(), equalTo(false)); assertThat(response.segmentGeneration(), equalTo(-1L)); - indexResponse = client().prepareIndex("test").setSource("field1", "value2").get(); + indexResponse = prepareIndex("test").setSource("field1", "value2").get(); response = getFromTranslog(indexOrAlias(), indexResponse.getId()); assertNotNull(response.getResult()); assertThat(response.getResult().isExists(), equalTo(true)); @@ -74,11 +70,11 @@ public class GetFromTranslogActionIT extends ESIntegTestCase { assertThat(response.segmentGeneration(), equalTo(-1L)); // After two refreshes the LiveVersionMap switches back to append-only and stops tracking IDs // Refreshing with empty LiveVersionMap doesn't cause the switch, see {@link LiveVersionMap.Maps#shouldInheritSafeAccess()}. - client().prepareIndex("test").setSource("field1", "value3").get(); + prepareIndex("test").setSource("field1", "value3").get(); refresh("test"); refresh("test"); // An optimized index operation marks the maps as unsafe - client().prepareIndex("test").setSource("field1", "value4").get(); + prepareIndex("test").setSource("field1", "value4").get(); response = getFromTranslog(indexOrAlias(), "non-existent"); assertNull(response.getResult()); assertThat(response.segmentGeneration(), greaterThan(0L)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/get/ShardMultiGetFomTranslogActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/get/ShardMultiGetFomTranslogActionIT.java index fd14b18bb8a3..2d8a48cf4866 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/get/ShardMultiGetFomTranslogActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/get/ShardMultiGetFomTranslogActionIT.java @@ -48,7 +48,7 @@ public class ShardMultiGetFomTranslogActionIT extends ESIntegTestCase { // Do a single get to enable storing locations in translog. Otherwise, we could get unwanted refreshes that // prune the LiveVersionMap and would make the test fail/flaky. - var indexResponse = client().prepareIndex("test").setId("0").setSource("field1", "value2").get(); + var indexResponse = prepareIndex("test").setId("0").setSource("field1", "value2").get(); client().prepareGet("test", indexResponse.getId()).get(); var mgetIds = List.of("1", "2", "3"); @@ -107,7 +107,7 @@ public class ShardMultiGetFomTranslogActionIT extends ESIntegTestCase { } assertThat(response.segmentGeneration(), equalTo(-1L)); - indexResponse = client().prepareIndex("test").setSource("field1", "value2").get(); + indexResponse = prepareIndex("test").setSource("field1", "value2").get(); response = getFromTranslog(indexOrAlias(), List.of(indexResponse.getId())); multiGetShardResponse = response.multiGetShardResponse(); assertThat(getLocations(multiGetShardResponse).size(), equalTo(1)); @@ -131,11 +131,11 @@ public class ShardMultiGetFomTranslogActionIT extends ESIntegTestCase { assertThat(response.segmentGeneration(), equalTo(-1L)); // After two refreshes the LiveVersionMap switches back to append-only and stops tracking IDs // Refreshing with empty LiveVersionMap doesn't cause the switch, see {@link LiveVersionMap.Maps#shouldInheritSafeAccess()}. - client().prepareIndex("test").setSource("field1", "value3").get(); + prepareIndex("test").setSource("field1", "value3").get(); refresh("test"); refresh("test"); // An optimized index operation marks the maps as unsafe - client().prepareIndex("test").setSource("field1", "value4").get(); + prepareIndex("test").setSource("field1", "value4").get(); response = getFromTranslog(indexOrAlias(), List.of("non-existent")); multiGetShardResponse = response.multiGetShardResponse(); assertThat(getLocations(multiGetShardResponse).size(), equalTo(1)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java index 24372978834c..dbf73b4ceeed 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/FinalPipelineIT.java @@ -73,7 +73,7 @@ public class FinalPipelineIT extends ESIntegTestCase { final IllegalStateException e = expectThrows( IllegalStateException.class, - () -> client().prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() + () -> prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() ); assertThat( e, @@ -93,7 +93,7 @@ public class FinalPipelineIT extends ESIntegTestCase { final IllegalStateException e = expectThrows( IllegalStateException.class, - () -> client().prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() + () -> prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() ); assertThat( e, @@ -118,8 +118,7 @@ public class FinalPipelineIT extends ESIntegTestCase { {"processors": [{"final": {"exists":"no_such_field"}}]}"""); clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet(); - DocWriteResponse indexResponse = client().prepareIndex("index") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("index").setId("1") .setSource(Map.of("field", "value")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -144,8 +143,7 @@ public class FinalPipelineIT extends ESIntegTestCase { {"processors": [{"final": {}}]}"""); clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet(); - DocWriteResponse indexResponse = client().prepareIndex("index") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("index").setId("1") .setSource(Map.of("field", "value")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -170,8 +168,7 @@ public class FinalPipelineIT extends ESIntegTestCase { {"processors": [{"final": {}}]}"""); clusterAdmin().putPipeline(new PutPipelineRequest("target_default_pipeline", targetPipeline, XContentType.JSON)).actionGet(); - DocWriteResponse indexResponse = client().prepareIndex("index") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("index").setId("1") .setSource(Map.of("field", "value")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -196,8 +193,7 @@ public class FinalPipelineIT extends ESIntegTestCase { {"processors": [{"final": {}}]}"""); clusterAdmin().putPipeline(new PutPipelineRequest("target_default_pipeline", targetPipeline, XContentType.JSON)).actionGet(); - DocWriteResponse indexResponse = client().prepareIndex("index") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("index").setId("1") .setSource(Map.of("field", "value")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -224,8 +220,7 @@ public class FinalPipelineIT extends ESIntegTestCase { IllegalStateException exception = expectThrows( IllegalStateException.class, - () -> client().prepareIndex("index") - .setId("1") + () -> prepareIndex("index").setId("1") .setSource(Map.of("dest", "index")) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get() @@ -243,7 +238,7 @@ public class FinalPipelineIT extends ESIntegTestCase { // this asserts that the final_pipeline was used, without us having to actually create the pipeline etc. final IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() + () -> prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() ); assertThat(e, hasToString(containsString("pipeline with id [final_pipeline] does not exist"))); } @@ -257,7 +252,7 @@ public class FinalPipelineIT extends ESIntegTestCase { clusterAdmin().putPipeline(new PutPipelineRequest("final_pipeline", finalPipelineBody, XContentType.JSON)).actionGet(); final Settings settings = Settings.builder().put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline").build(); createIndex("index", settings); - final IndexRequestBuilder index = client().prepareIndex("index").setId("1"); + final IndexRequestBuilder index = prepareIndex("index").setId("1"); index.setSource(Map.of("field", "value")); index.setPipeline("request_pipeline"); index.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); @@ -285,7 +280,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .put(IndexSettings.FINAL_PIPELINE.getKey(), "final_pipeline") .build(); createIndex("index", settings); - final IndexRequestBuilder index = client().prepareIndex("index").setId("1"); + final IndexRequestBuilder index = prepareIndex("index").setId("1"); index.setSource(Map.of("field", "value")); index.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); final DocWriteResponse response = index.get(); @@ -332,7 +327,7 @@ public class FinalPipelineIT extends ESIntegTestCase { .setOrder(finalPipelineOrder) .setSettings(finalPipelineSettings) .get(); - final IndexRequestBuilder index = client().prepareIndex("index").setId("1"); + final IndexRequestBuilder index = prepareIndex("index").setId("1"); index.setSource(Map.of("field", "value")); index.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); final DocWriteResponse response = index.get(); @@ -370,7 +365,7 @@ public class FinalPipelineIT extends ESIntegTestCase { // this asserts that the high_order_final_pipeline was selected, without us having to actually create the pipeline etc. final IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> client().prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() + () -> prepareIndex("index").setId("1").setSource(Map.of("field", "value")).get() ); assertThat(e, hasToString(containsString("pipeline with id [high_order_final_pipeline] does not exist"))); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java index 41bdf944edd5..a844e878d0ed 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java @@ -37,7 +37,7 @@ public class HiddenIndexIT extends ESIntegTestCase { public void testHiddenIndexSearch() { 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(); + prepareIndex("hidden-index").setSource("foo", "bar").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); // default not visible to wildcard expansion SearchResponse searchResponse = prepareSearch(randomFrom("*", "_all", "h*", "*index")).setSize(1000) @@ -61,7 +61,7 @@ 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(); + prepareIndex(".hidden-index").setSource("foo", "bar").setRefreshPolicy(RefreshPolicy.IMMEDIATE).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); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java index 31368a3cfb8f..71f0c75efa02 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexRequestBuilderIT.java @@ -28,13 +28,12 @@ public class IndexRequestBuilderIT extends ESIntegTestCase { Map map = new HashMap<>(); map.put("test_field", "foobar"); IndexRequestBuilder[] builders = new IndexRequestBuilder[] { - client().prepareIndex("test").setSource((Object) "test_field", (Object) "foobar"), - client().prepareIndex("test").setSource("{\"test_field\" : \"foobar\"}", XContentType.JSON), - client().prepareIndex("test").setSource(new BytesArray("{\"test_field\" : \"foobar\"}"), XContentType.JSON), - client().prepareIndex("test").setSource(new BytesArray("{\"test_field\" : \"foobar\"}"), XContentType.JSON), - client().prepareIndex("test") - .setSource(BytesReference.toBytes(new BytesArray("{\"test_field\" : \"foobar\"}")), XContentType.JSON), - client().prepareIndex("test").setSource(map) }; + prepareIndex("test").setSource((Object) "test_field", (Object) "foobar"), + prepareIndex("test").setSource("{\"test_field\" : \"foobar\"}", XContentType.JSON), + prepareIndex("test").setSource(new BytesArray("{\"test_field\" : \"foobar\"}"), XContentType.JSON), + prepareIndex("test").setSource(new BytesArray("{\"test_field\" : \"foobar\"}"), XContentType.JSON), + prepareIndex("test").setSource(BytesReference.toBytes(new BytesArray("{\"test_field\" : \"foobar\"}")), XContentType.JSON), + prepareIndex("test").setSource(map) }; indexRandom(true, builders); ElasticsearchAssertions.assertHitCount( prepareSearch("test").setQuery(QueryBuilders.termQuery("test_field", "foobar")), @@ -44,7 +43,7 @@ public class IndexRequestBuilderIT extends ESIntegTestCase { public void testOddNumberOfSourceObjects() { try { - client().prepareIndex("test").setSource("test_field", "foobar", new Object()); + prepareIndex("test").setSource("test_field", "foobar", new Object()); fail("Expected IllegalArgumentException"); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), containsString("The number of object passed must be even but was [3]")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexSortIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexSortIT.java index 9d94b9d0b41b..fae08f8d5577 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexSortIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexSortIT.java @@ -70,8 +70,7 @@ public class IndexSortIT extends ESIntegTestCase { .putList("index.sort.field", "date", "numeric_dv", "keyword_dv") ).setMapping(TEST_MAPPING).get(); for (int i = 0; i < 20; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource("numeric_dv", randomInt(), "keyword_dv", randomAlphaOfLengthBetween(10, 20)) .get(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java index 79587dc10967..ca2d2c60e23e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/WaitUntilRefreshIT.java @@ -56,11 +56,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { } public void testIndex() { - DocWriteResponse index = client().prepareIndex("test") - .setId("1") - .setSource("foo", "bar") - .setRefreshPolicy(RefreshPolicy.WAIT_UNTIL) - .get(); + DocWriteResponse index = prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy(RefreshPolicy.WAIT_UNTIL).get(); assertEquals(RestStatus.CREATED, index.status()); assertFalse("request shouldn't have forced a refresh", index.forcedRefresh()); assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); @@ -68,7 +64,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { public void testDelete() throws InterruptedException, ExecutionException { // Index normally - indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "bar")); + indexRandom(true, prepareIndex("test").setId("1").setSource("foo", "bar")); assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); // Now delete with blockUntilRefresh @@ -80,7 +76,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { public void testUpdate() throws InterruptedException, ExecutionException { // Index normally - indexRandom(true, client().prepareIndex("test").setId("1").setSource("foo", "bar")); + indexRandom(true, prepareIndex("test").setId("1").setSource("foo", "bar")); assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); // Update with RefreshPolicy.WAIT_UNTIL @@ -115,7 +111,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { public void testBulk() { // Index by bulk with RefreshPolicy.WAIT_UNTIL BulkRequestBuilder bulk = client().prepareBulk().setRefreshPolicy(RefreshPolicy.WAIT_UNTIL); - bulk.add(client().prepareIndex("test").setId("1").setSource("foo", "bar")); + bulk.add(prepareIndex("test").setId("1").setSource("foo", "bar")); assertBulkSuccess(bulk.get()); assertSearchHits(prepareSearch("test").setQuery(matchQuery("foo", "bar")), "1"); @@ -143,8 +139,7 @@ public class WaitUntilRefreshIT extends ESIntegTestCase { */ public void testNoRefreshInterval() throws InterruptedException, ExecutionException { updateIndexSettings(Settings.builder().put("index.refresh_interval", -1), "test"); - ActionFuture index = client().prepareIndex("test") - .setId("1") + ActionFuture index = prepareIndex("test").setId("1") .setSource("foo", "bar") .setRefreshPolicy(RefreshPolicy.WAIT_UNTIL) .execute(); 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 f297b61e7087..1d256ddb3038 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java @@ -173,7 +173,7 @@ public class MaxDocsLimitIT extends ESIntegTestCase { phaser.arriveAndAwaitAdvance(); while (completedRequests.incrementAndGet() <= numRequests) { try { - final DocWriteResponse resp = client().prepareIndex("test").setSource("{}", XContentType.JSON).get(); + final DocWriteResponse resp = prepareIndex("test").setSource("{}", XContentType.JSON).get(); numSuccess.incrementAndGet(); assertThat(resp.status(), equalTo(RestStatus.CREATED)); } catch (IllegalArgumentException e) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java index 334462f3b757..55e90d439820 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java @@ -35,7 +35,7 @@ public class FieldDataLoadingIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("name", "name").get(); + prepareIndex("test").setId("1").setSource("name", "name").get(); indicesAdmin().prepareRefresh("test").get(); ClusterStatsResponse response = clusterAdmin().prepareClusterStats().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 6040e1b0fb31..89bd60dc4683 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java @@ -32,7 +32,7 @@ public class CopyToMapperIntegrationIT extends ESIntegTestCase { int recordCount = between(1, 200); for (int i = 0; i < recordCount * 2; i++) { - client().prepareIndex("test-idx").setId(Integer.toString(i)).setSource("test_field", "test " + i, "even", i % 2 == 0).get(); + prepareIndex("test-idx").setId(Integer.toString(i)).setSource("test_field", "test " + i, "even", i % 2 == 0).get(); } indicesAdmin().prepareRefresh("test-idx").get(); @@ -64,7 +64,7 @@ public class CopyToMapperIntegrationIT extends ESIntegTestCase { .endObject() ); assertAcked(indicesAdmin().prepareCreate("test-idx").setMapping(mapping)); - client().prepareIndex("test-idx").setId("1").setSource("foo", "bar").get(); + prepareIndex("test-idx").setId("1").setSource("foo", "bar").get(); indicesAdmin().prepareRefresh("test-idx").get(); assertHitCount(prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("root.top.child", "bar")), 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 38349e14bdf0..868540ac3e3f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java @@ -64,9 +64,9 @@ public class DynamicMappingIT extends ESIntegTestCase { public void testConflictingDynamicMappings() { // we don't use indexRandom because the order of requests is important here createIndex("index"); - client().prepareIndex("index").setId("1").setSource("foo", 3).get(); + prepareIndex("index").setId("1").setSource("foo", 3).get(); try { - client().prepareIndex("index").setId("2").setSource("foo", "bar").get(); + prepareIndex("index").setId("2").setSource("foo", "bar").get(); fail("Indexing request should have failed!"); } catch (DocumentParsingException e) { // general case, the parsing code complains that it can't parse "bar" as a "long" @@ -82,10 +82,10 @@ public class DynamicMappingIT extends ESIntegTestCase { public void testConflictingDynamicMappingsBulk() { // we don't use indexRandom because the order of requests is important here createIndex("index"); - client().prepareIndex("index").setId("1").setSource("foo", 3).get(); - BulkResponse bulkResponse = client().prepareBulk().add(client().prepareIndex("index").setId("1").setSource("foo", 3)).get(); + prepareIndex("index").setId("1").setSource("foo", 3).get(); + BulkResponse bulkResponse = client().prepareBulk().add(prepareIndex("index").setId("1").setSource("foo", 3)).get(); assertFalse(bulkResponse.hasFailures()); - bulkResponse = client().prepareBulk().add(client().prepareIndex("index").setId("2").setSource("foo", "bar")).get(); + bulkResponse = client().prepareBulk().add(prepareIndex("index").setId("2").setSource("foo", "bar")).get(); assertTrue(bulkResponse.hasFailures()); } @@ -112,7 +112,7 @@ public class DynamicMappingIT extends ESIntegTestCase { startLatch.await(); assertEquals( DocWriteResponse.Result.CREATED, - client().prepareIndex("index").setId(id).setSource("field" + id, "bar").get().getResult() + prepareIndex("index").setId(id).setSource("field" + id, "bar").get().getResult() ); } catch (Exception e) { error.compareAndSet(null, e); @@ -163,7 +163,7 @@ public class DynamicMappingIT extends ESIntegTestCase { XContentType.JSON ) .get(); - client().prepareIndex("index").setId("1").setSource("nested1", Map.of("foo", "bar"), "nested2", Map.of("foo", "bar")).get(); + prepareIndex("index").setId("1").setSource("nested1", Map.of("foo", "bar"), "nested2", Map.of("foo", "bar")).get(); final CountDownLatch masterBlockedLatch = new CountDownLatch(1); final CountDownLatch indexingCompletedLatch = new CountDownLatch(1); @@ -184,9 +184,7 @@ public class DynamicMappingIT extends ESIntegTestCase { }); masterBlockedLatch.await(); - final IndexRequestBuilder indexRequestBuilder = client().prepareIndex("index") - .setId("2") - .setSource("nested3", Map.of("foo", "bar")); + final IndexRequestBuilder indexRequestBuilder = prepareIndex("index").setId("2").setSource("nested3", Map.of("foo", "bar")); try { assertThat( expectThrows(IllegalArgumentException.class, () -> indexRequestBuilder.get(TimeValue.timeValueSeconds(10))).getMessage(), @@ -200,7 +198,7 @@ public class DynamicMappingIT extends ESIntegTestCase { public void testTotalFieldsLimitForDynamicMappingsUpdateCheckedAtDocumentParseTime() throws InterruptedException { createIndex("index", Settings.builder().put(INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), 2).build()); ensureGreen("index"); - client().prepareIndex("index").setId("1").setSource("field1", "value1").get(); + prepareIndex("index").setId("1").setSource("field1", "value1").get(); final CountDownLatch masterBlockedLatch = new CountDownLatch(1); final CountDownLatch indexingCompletedLatch = new CountDownLatch(1); @@ -221,7 +219,7 @@ public class DynamicMappingIT extends ESIntegTestCase { }); masterBlockedLatch.await(); - final IndexRequestBuilder indexRequestBuilder = client().prepareIndex("index").setId("2").setSource("field2", "value2"); + final IndexRequestBuilder indexRequestBuilder = prepareIndex("index").setId("2").setSource("field2", "value2"); try { Exception e = expectThrows(DocumentParsingException.class, () -> indexRequestBuilder.get(TimeValue.timeValueSeconds(10))); assertThat(e.getMessage(), Matchers.containsString("failed to parse")); @@ -265,8 +263,7 @@ public class DynamicMappingIT extends ESIntegTestCase { { // introduction of a new object with 2 new sub-fields fails - final IndexRequestBuilder indexRequestBuilder = client().prepareIndex("index1") - .setId("1") + final IndexRequestBuilder indexRequestBuilder = prepareIndex("index1").setId("1") .setSource("field3", "value3", "my_object2", Map.of("new_field1", "value1", "new_field2", "value2")); Exception exc = expectThrows(DocumentParsingException.class, () -> indexRequestBuilder.get(TimeValue.timeValueSeconds(10))); assertThat(exc.getMessage(), Matchers.containsString("failed to parse")); @@ -279,7 +276,7 @@ public class DynamicMappingIT extends ESIntegTestCase { { // introduction of a new single field succeeds - client().prepareIndex("index1").setId("2").setSource("field3", "value3", "new_field4", 100).get(); + prepareIndex("index1").setId("2").setSource("field3", "value3", "new_field4", 100).get(); } { @@ -294,8 +291,7 @@ public class DynamicMappingIT extends ESIntegTestCase { """, XContentType.JSON)); // introduction of a new object with 2 new sub-fields succeeds - client().prepareIndex("index1") - .setId("1") + prepareIndex("index1").setId("1") .setSource("field3", "value3", "my_object2", Map.of("new_field1", "value1", "new_field2", "value2")); } } @@ -304,7 +300,7 @@ public class DynamicMappingIT extends ESIntegTestCase { createIndex("test"); final ClusterService clusterService = internalCluster().clusterService(); final long previousVersion = clusterService.state().metadata().index("test").getMappingVersion(); - client().prepareIndex("test").setId("1").setSource("field", "text").get(); + prepareIndex("test").setId("1").setSource("field", "text").get(); assertBusy(() -> assertThat(clusterService.state().metadata().index("test").getMappingVersion(), equalTo(1 + previousVersion))); } @@ -507,7 +503,7 @@ public class DynamicMappingIT extends ESIntegTestCase { Exception exception = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex("test").setSource("obj.runtime", "value").get() + () -> prepareIndex("test").setSource("obj.runtime", "value").get() ); assertThat( exception.getMessage(), @@ -539,8 +535,7 @@ public class DynamicMappingIT extends ESIntegTestCase { // target the same shard where we are sure the mapping update has been applied assertEquals( RestStatus.CREATED, - client().prepareIndex("test") - .setSource("obj.runtime.dynamic.number", 1) + prepareIndex("test").setSource("obj.runtime.dynamic.number", 1) .setId("id") .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get() @@ -552,7 +547,7 @@ public class DynamicMappingIT extends ESIntegTestCase { // a doc with the same field but a different type causes a conflict Exception e = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex("test").setId("id").setSource("obj.runtime.dynamic.number", "string").get() + () -> prepareIndex("test").setId("id").setSource("obj.runtime.dynamic.number", "string").get() ); assertThat( e.getMessage(), 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 25c33ee66bad..8e94502cfb63 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java @@ -46,7 +46,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(titleFields.get("not_analyzed"), notNullValue()); assertThat(((Map) titleFields.get("not_analyzed")).get("type").toString(), equalTo("keyword")); - client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title", "multi")), 1); assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title.not_analyzed", "Multi fields")), 1); @@ -65,7 +65,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(titleFields.get("uncased"), notNullValue()); assertThat(((Map) titleFields.get("uncased")).get("analyzer").toString(), equalTo("whitespace")); - client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get(); assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title.uncased", "Multi")), 1); } @@ -89,7 +89,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(bField.get("type").toString(), equalTo("keyword")); GeoPoint point = new GeoPoint(51, 19); - client().prepareIndex("my-index").setId("1").setSource("a", point.toString()).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("my-index").setId("1").setSource("a", point.toString()).setRefreshPolicy(IMMEDIATE).get(); SearchResponse countResponse = prepareSearch("my-index").setSize(0) .setQuery(constantScoreQuery(geoDistanceQuery("a").point(51, 19).distance(50, DistanceUnit.KILOMETERS))) .get(); @@ -115,7 +115,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(bField.size(), equalTo(1)); assertThat(bField.get("type").toString(), equalTo("keyword")); - client().prepareIndex("my-index").setId("1").setSource("a", "complete me").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("my-index").setId("1").setSource("a", "complete me").setRefreshPolicy(IMMEDIATE).get(); SearchResponse countResponse = prepareSearch("my-index").setSize(0).setQuery(matchQuery("a.b", "complete me")).get(); assertThat(countResponse.getHits().getTotalHits().value, equalTo(1L)); } @@ -137,7 +137,7 @@ public class MultiFieldsIntegrationIT extends ESIntegTestCase { assertThat(bField.size(), equalTo(1)); assertThat(bField.get("type").toString(), equalTo("keyword")); - client().prepareIndex("my-index").setId("1").setSource("a", "127.0.0.1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("my-index").setId("1").setSource("a", "127.0.0.1").setRefreshPolicy(IMMEDIATE).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 bb20ddd321d7..66a35328954e 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 @@ -32,7 +32,7 @@ public class CustomQueryParserIT extends ESIntegTestCase { super.setUp(); createIndex("test"); ensureGreen(); - client().prepareIndex("index").setId("1").setSource("field", "value").get(); + prepareIndex("index").setId("1").setSource("field", "value").get(); refresh(); } 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 7751d5e7783b..70983e5abfb9 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/search/MatchPhraseQueryIT.java @@ -55,8 +55,8 @@ public class MatchPhraseQueryIT extends ESIntegTestCase { private List getIndexRequests() { List requests = new ArrayList<>(); - requests.add(client().prepareIndex(INDEX).setSource("name", "the beatles")); - requests.add(client().prepareIndex(INDEX).setSource("name", "led zeppelin")); + requests.add(prepareIndex(INDEX).setSource("name", "the beatles")); + requests.add(prepareIndex(INDEX).setSource("name", "led zeppelin")); return requests; } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java index d1122004ccce..9c4473297ba7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncIT.java @@ -57,7 +57,7 @@ public class GlobalCheckpointSyncIT extends ESIntegTestCase { for (int j = 0; j < 10; j++) { final String id = Integer.toString(j); - client().prepareIndex("test").setId(id).setSource("{\"foo\": " + id + "}", XContentType.JSON).get(); + prepareIndex("test").setId(id).setSource("{\"foo\": " + id + "}", XContentType.JSON).get(); } assertBusy(() -> { @@ -157,7 +157,7 @@ public class GlobalCheckpointSyncIT extends ESIntegTestCase { } for (int j = 0; j < numberOfDocuments; j++) { final String id = Integer.toString(index * numberOfDocuments + j); - client().prepareIndex("test").setId(id).setSource("{\"foo\": " + id + "}", XContentType.JSON).get(); + prepareIndex("test").setId(id).setSource("{\"foo\": " + id + "}", XContentType.JSON).get(); } try { barrier.await(); @@ -223,7 +223,7 @@ public class GlobalCheckpointSyncIT extends ESIntegTestCase { } int numDocs = randomIntBetween(1, 20); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } ensureGreen("test"); assertBusy(() -> { @@ -252,7 +252,7 @@ public class GlobalCheckpointSyncIT extends ESIntegTestCase { logger.info("numDocs {}", numDocs); long maxSeqNo = 0; for (int i = 0; i < numDocs; i++) { - maxSeqNo = client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get().getSeqNo(); + maxSeqNo = prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get().getSeqNo(); logger.info("got {}", maxSeqNo); } for (IndicesService indicesService : internalCluster().getDataNodeInstances(IndicesService.class)) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/GlobalCheckpointListenersIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/GlobalCheckpointListenersIT.java index 70adc7557443..b38198a98b5a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/GlobalCheckpointListenersIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/GlobalCheckpointListenersIT.java @@ -63,7 +63,7 @@ public class GlobalCheckpointListenersIT extends ESSingleNodeTestCase { } }, null); - client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); assertBusy(() -> assertThat(globalCheckpoint.get(), equalTo((long) index))); // adding a listener expecting a lower global checkpoint should fire immediately final AtomicLong immediateGlobalCheckpint = new AtomicLong(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java index f473015f864d..52bb5159c9b7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -146,7 +146,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { public void testDurableFlagHasEffect() { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); IndicesService indicesService = getInstanceFromNode(IndicesService.class); IndexService test = indicesService.indexService(resolveIndex("test")); IndexShard shard = test.getShardOrNull(0); @@ -169,7 +169,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { setDurability(shard, Translog.Durability.REQUEST); assertFalse(needsSync.test(translog)); setDurability(shard, Translog.Durability.ASYNC); - client().prepareIndex("test").setId("2").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("2").setSource("{}", XContentType.JSON).get(); assertTrue(needsSync.test(translog)); setDurability(shard, Translog.Durability.REQUEST); client().prepareDelete("test", "1").get(); @@ -181,7 +181,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { setDurability(shard, Translog.Durability.REQUEST); assertNoFailures( client().prepareBulk() - .add(client().prepareIndex("test").setId("3").setSource("{}", XContentType.JSON)) + .add(prepareIndex("test").setId("3").setSource("{}", XContentType.JSON)) .add(client().prepareDelete("test", "1")) .get() ); @@ -190,7 +190,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { setDurability(shard, Translog.Durability.ASYNC); assertNoFailures( client().prepareBulk() - .add(client().prepareIndex("test").setId("4").setSource("{}", XContentType.JSON)) + .add(prepareIndex("test").setId("4").setSource("{}", XContentType.JSON)) .add(client().prepareDelete("test", "3")) .get() ); @@ -220,7 +220,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { Settings idxSettings = Settings.builder().put(IndexMetadata.SETTING_DATA_PATH, idxPath).build(); createIndex("test", idxSettings); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); assertHitCount(client().prepareSearch("test"), 1L); indicesAdmin().prepareDelete("test").get(); assertAllIndicesRemovedAndDeletionCompleted(Collections.singleton(getInstanceFromNode(IndicesService.class))); @@ -230,7 +230,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { public void testExpectedShardSizeIsPresent() throws InterruptedException { assertAcked(indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 0))); for (int i = 0; i < 50; i++) { - client().prepareIndex("test").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setSource("{}", XContentType.JSON).get(); } ensureGreen("test"); InternalClusterInfoService clusterInfoService = (InternalClusterInfoService) getInstanceFromNode(ClusterInfoService.class); @@ -253,7 +253,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { logger.info("--> creating index [{}] with data_path [{}]", index, indexDataPath); createIndex(index, Settings.builder().put(IndexMetadata.SETTING_DATA_PATH, indexDataPath.toAbsolutePath().toString()).build()); - client().prepareIndex(index).setId("1").setSource("foo", "bar").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(index).setId("1").setSource("foo", "bar").setRefreshPolicy(IMMEDIATE).get(); ensureGreen(index); assertHitCount(client().prepareSearch(index).setSize(0), 1L); @@ -328,11 +328,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { .build() ) .get(); - client().prepareIndex("test") - .setId("0") - .setSource("{}", XContentType.JSON) - .setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE) - .get(); + prepareIndex("test").setId("0").setSource("{}", XContentType.JSON).setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE).get(); assertFalse(shard.shouldPeriodicallyFlush()); shard.applyIndexOperationOnPrimary( Versions.MATCH_ANY, @@ -347,11 +343,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { final Translog translog = getTranslog(shard); assertEquals(2, translog.stats().getUncommittedOperations()); assertThat(shard.flushStats().getTotal(), equalTo(0L)); - client().prepareIndex("test") - .setId("2") - .setSource("{}", XContentType.JSON) - .setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE) - .get(); + prepareIndex("test").setId("2").setSource("{}", XContentType.JSON).setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE).get(); assertThat(shard.getLastKnownGlobalCheckpoint(), equalTo(2L)); assertBusy(() -> { // this is async assertFalse(shard.shouldPeriodicallyFlush()); @@ -454,11 +446,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { settings = Settings.builder().put("index.translog.generation_threshold_size", "117b").build(); } indicesAdmin().prepareUpdateSettings("test").setSettings(settings).get(); - client().prepareIndex("test") - .setId("0") - .setSource("{}", XContentType.JSON) - .setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE) - .get(); + prepareIndex("test").setId("0").setSource("{}", XContentType.JSON).setRefreshPolicy(randomBoolean() ? IMMEDIATE : NONE).get(); assertFalse(shard.shouldPeriodicallyFlush()); final AtomicBoolean running = new AtomicBoolean(true); final int numThreads = randomIntBetween(2, 4); @@ -481,7 +469,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { final CheckedRunnable check; if (flush) { final FlushStats initialStats = shard.flushStats(); - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); check = () -> { assertFalse(shard.shouldPeriodicallyFlush()); final FlushStats currentStats = shard.flushStats(); @@ -506,7 +494,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { }; } else { final long generation = getTranslog(shard).currentFileGeneration(); - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); check = () -> { assertFalse(shard.shouldRollTranslogGeneration()); assertEquals(generation + 1, getTranslog(shard).currentFileGeneration()); @@ -527,7 +515,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { indicesAdmin().prepareUpdateSettings("test").setSettings(settings).get(); final int numDocs = between(10, 100); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } // A flush stats may include the new total count but the old period count - assert eventually. assertBusy(() -> { @@ -538,7 +526,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { settings = Settings.builder().put("index.translog.flush_threshold_size", (String) null).build(); indicesAdmin().prepareUpdateSettings("test").setSettings(settings).get(); - client().prepareIndex("test").setId(UUIDs.randomBase64UUID()).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(UUIDs.randomBase64UUID()).setSource("{}", XContentType.JSON).get(); indicesAdmin().prepareFlush("test").setForce(randomBoolean()).setWaitIfOngoing(true).get(); final FlushStats flushStats = indicesAdmin().prepareStats("test").clear().setFlush(true).get().getTotal().flush; assertThat(flushStats.getTotal(), greaterThan(flushStats.getPeriodic())); @@ -550,9 +538,9 @@ public class IndexShardIT extends ESSingleNodeTestCase { IndicesService indicesService = getInstanceFromNode(IndicesService.class); IndexService indexService = indicesService.indexService(resolveIndex("test")); IndexShard shard = indexService.getShardOrNull(0); - client().prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); client().prepareDelete("test", "0").get(); - client().prepareIndex("test").setId("1").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); CheckedFunction wrapper = directoryReader -> directoryReader; shard.close("simon says", false); @@ -666,7 +654,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { final SearchRequest countRequest = new SearchRequest("test").source(new SearchSourceBuilder().size(0)); final long numDocs = between(10, 20); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); if (randomBoolean()) { shard.refresh("test"); } @@ -688,7 +676,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { final long moreDocs = between(10, 20); for (int i = 0; i < moreDocs; i++) { - client().prepareIndex("test").setId(Long.toString(i + numDocs)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Long.toString(i + numDocs)).setSource("{}", XContentType.JSON).get(); if (randomBoolean()) { shard.refresh("test"); } @@ -712,7 +700,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { int numOps = between(1, 10); for (int i = 0; i < numOps; i++) { if (randomBoolean()) { - client().prepareIndex("index").setId(randomFrom("1", "2")).setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId(randomFrom("1", "2")).setSource("{}", XContentType.JSON).get(); } else { client().prepareDelete("index", randomFrom("1", "2")).get(); } 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 d57cbe50074a..6c691c0a1444 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java @@ -119,7 +119,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { final int numExtraDocs = between(10, 100); IndexRequestBuilder[] builders = new IndexRequestBuilder[numExtraDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("foo", "bar"); + builders[i] = prepareIndex(indexName).setSource("foo", "bar"); } numDocs += numExtraDocs; @@ -282,7 +282,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { logger.info("--> indexing [{}] docs to be kept", numDocsToKeep); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocsToKeep]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("foo", "bar"); + builders[i] = prepareIndex(indexName).setSource("foo", "bar"); } indexRandom(false, false, false, Arrays.asList(builders)); flush(indexName); @@ -293,7 +293,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { logger.info("--> indexing [{}] more doc to be truncated", numDocsToTruncate); builders = new IndexRequestBuilder[numDocsToTruncate]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("foo", "bar"); + builders[i] = prepareIndex(indexName).setSource("foo", "bar"); } indexRandom(false, false, false, Arrays.asList(builders)); @@ -472,7 +472,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { logger.info("--> indexing [{}] docs to be kept", numDocsToKeep); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocsToKeep]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("foo", "bar"); + builders[i] = prepareIndex(indexName).setSource("foo", "bar"); } indexRandom(false, false, false, Arrays.asList(builders)); flush(indexName); @@ -482,7 +482,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { logger.info("--> indexing [{}] more docs to be truncated", numDocsToTruncate); builders = new IndexRequestBuilder[numDocsToTruncate]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("foo", "bar"); + builders[i] = prepareIndex(indexName).setSource("foo", "bar"); } indexRandom(false, false, false, Arrays.asList(builders)); final int totalDocs = numDocsToKeep + numDocsToTruncate; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java index 13569d4d7d1a..09b91813d6cb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/SearchIdleIT.java @@ -92,7 +92,7 @@ public class SearchIdleIT extends ESSingleNodeTestCase { int numDocs = scaledRandomIntBetween(25, 100); totalNumDocs.set(numDocs); CountDownLatch indexingDone = new CountDownLatch(numDocs); - client().prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); indexingDone.countDown(); // one doc is indexed above blocking IndexShard shard = indexService.getShard(0); PlainActionFuture future = new PlainActionFuture<>(); @@ -125,7 +125,7 @@ public class SearchIdleIT extends ESSingleNodeTestCase { started.await(); assertThat(count.applyAsLong(totalNumDocs.get()), equalTo(1L)); for (int i = 1; i < numDocs; i++) { - client().prepareIndex("test").setId("" + i).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).execute(new ActionListener<>() { + prepareIndex("test").setId("" + i).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).execute(new ActionListener<>() { @Override public void onResponse(DocWriteResponse indexResponse) { indexingDone.countDown(); @@ -154,7 +154,7 @@ public class SearchIdleIT extends ESSingleNodeTestCase { IndexService indexService = createIndex("test", builder.build()); assertFalse(indexService.getIndexSettings().isExplicitRefresh()); ensureGreen(); - client().prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("0").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); IndexShard shard = indexService.getShard(0); scheduleRefresh(shard, false); assertTrue(shard.isSearchIdle()); @@ -162,7 +162,7 @@ public class SearchIdleIT extends ESSingleNodeTestCase { // async on purpose to make sure it happens concurrently indicesAdmin().prepareRefresh().execute(ActionListener.running(refreshLatch::countDown)); assertHitCount(client().prepareSearch(), 1); - client().prepareIndex("test").setId("1").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); scheduleRefresh(shard, false); assertTrue(shard.hasRefreshPending()); @@ -179,7 +179,7 @@ public class SearchIdleIT extends ESSingleNodeTestCase { // We need to ensure a `scheduledRefresh` triggered by the internal refresh setting update is executed before we index a new doc; // otherwise, it will compete to call `Engine#maybeRefresh` with the `scheduledRefresh` that we are going to verify. ensureNoPendingScheduledRefresh(indexService.getThreadPool()); - client().prepareIndex("test").setId("2").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("2").setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); scheduleRefresh(shard, true); assertFalse(shard.hasRefreshPending()); assertTrue(shard.isSearchIdle()); @@ -279,15 +279,13 @@ public class SearchIdleIT extends ESSingleNodeTestCase { assertEquals( RestStatus.CREATED, - client().prepareIndex(idleIndex) - .setSource("keyword", "idle", "@timestamp", "2021-05-10T19:00:03.765Z", "routing_field", "aaa") + prepareIndex(idleIndex).setSource("keyword", "idle", "@timestamp", "2021-05-10T19:00:03.765Z", "routing_field", "aaa") .get() .status() ); assertEquals( RestStatus.CREATED, - client().prepareIndex(activeIndex) - .setSource("keyword", "active", "@timestamp", "2021-05-12T20:07:12.112Z", "routing_field", "aaa") + prepareIndex(activeIndex).setSource("keyword", "active", "@timestamp", "2021-05-12T20:07:12.112Z", "routing_field", "aaa") .get() .status() ); @@ -351,11 +349,8 @@ public class SearchIdleIT extends ESSingleNodeTestCase { "type=keyword" ); - assertEquals(RestStatus.CREATED, client().prepareIndex(idleIndex).setSource("keyword", "idle").get().status()); - assertEquals( - RestStatus.CREATED, - client().prepareIndex(activeIndex).setSource("keyword", "active", "unmapped", "bbb").get().status() - ); + assertEquals(RestStatus.CREATED, prepareIndex(idleIndex).setSource("keyword", "idle").get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(activeIndex).setSource("keyword", "active", "unmapped", "bbb").get().status()); assertEquals(RestStatus.OK, indicesAdmin().prepareRefresh(idleIndex, activeIndex).get().getStatus()); waitUntil( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java index a2f2f23d54cc..ec79b53ccd17 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java @@ -158,7 +158,7 @@ public class CorruptedFileIT extends ESIntegTestCase { disableAllocation("test"); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); ensureGreen(); @@ -269,7 +269,7 @@ public class CorruptedFileIT extends ESIntegTestCase { ensureGreen(); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); ensureGreen(); @@ -402,7 +402,7 @@ public class CorruptedFileIT extends ESIntegTestCase { ensureGreen(); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); ensureGreen(); @@ -541,7 +541,7 @@ public class CorruptedFileIT extends ESIntegTestCase { ensureGreen(); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); ensureGreen(); @@ -608,7 +608,7 @@ public class CorruptedFileIT extends ESIntegTestCase { ensureGreen(); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); ensureGreen(); 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 b8ecbc2e750a..d8d9ef47d445 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java @@ -59,7 +59,7 @@ public class CorruptedTranslogIT extends ESIntegTestCase { IndexRequestBuilder[] builders = new IndexRequestBuilder[scaledRandomIntBetween(100, 1000)]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("foo", "bar"); + builders[i] = prepareIndex("test").setSource("foo", "bar"); } indexRandom(false, false, false, Arrays.asList(builders)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java index 98562e2c84ff..8007eb4d5f6e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indexing/IndexActionIT.java @@ -47,7 +47,7 @@ public class IndexActionIT extends ESIntegTestCase { logger.info("indexing [{}] docs", numOfDocs); List builders = new ArrayList<>(numOfDocs); for (int j = 0; j < numOfDocs; j++) { - builders.add(client().prepareIndex("test").setSource("field", "value_" + j)); + builders.add(prepareIndex("test").setSource("field", "value_" + j)); } indexRandom(true, builders); logger.info("verifying indexed content"); @@ -103,15 +103,15 @@ public class IndexActionIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult()); - indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); + indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); assertEquals(DocWriteResponse.Result.UPDATED, indexResponse.getResult()); client().prepareDelete("test", "1").get(); - indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); + indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult()); } @@ -120,14 +120,14 @@ public class IndexActionIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult()); client().prepareDelete("test", "1").get(); flush(); - indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); + indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_2").get(); assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult()); } @@ -169,8 +169,7 @@ public class IndexActionIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(123) .setVersionType(VersionType.EXTERNAL) @@ -182,9 +181,7 @@ public class IndexActionIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex("test").setId("1").setSource("field1", "value1_1")) - .get(); + BulkResponse bulkResponse = client().prepareBulk().add(prepareIndex("test").setId("1").setSource("field1", "value1_1")).get(); assertThat(bulkResponse.hasFailures(), equalTo(false)); assertThat(bulkResponse.getItems().length, equalTo(1)); IndexResponse indexResponse = bulkResponse.getItems()[0].getResponse(); @@ -206,7 +203,7 @@ public class IndexActionIT extends ESIntegTestCase { } try { - client().prepareIndex(randomAlphaOfLengthBetween(min, max).toLowerCase(Locale.ROOT)).setSource("foo", "bar").get(); + prepareIndex(randomAlphaOfLengthBetween(min, max).toLowerCase(Locale.ROOT)).setSource("foo", "bar").get(); fail("exception should have been thrown on too-long index name"); } catch (InvalidIndexNameException e) { assertThat( @@ -218,7 +215,7 @@ public class IndexActionIT extends ESIntegTestCase { try { // Catch chars that are more than a single byte - client().prepareIndex( + prepareIndex( randomAlphaOfLength(MetadataCreateIndexService.MAX_INDEX_NAME_BYTES - 1).toLowerCase(Locale.ROOT) + "Ϟ".toLowerCase( Locale.ROOT ) @@ -261,9 +258,7 @@ public class IndexActionIT extends ESIntegTestCase { } public void testDocumentWithBlankFieldName() { - Exception e = expectThrows(DocumentParsingException.class, () -> { - client().prepareIndex("test").setId("1").setSource("", "value1_2").get(); - }); + Exception e = expectThrows(DocumentParsingException.class, () -> prepareIndex("test").setId("1").setSource("", "value1_2").get()); assertThat(e.getMessage(), containsString("failed to parse")); assertThat(e.getCause().getMessage(), containsString("field name cannot be an empty string")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java index 211e34c99ec2..d9b7602aacb1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java @@ -82,9 +82,9 @@ public class DateMathIndexExpressionsIntegrationIT extends ESIntegTestCase { String dateMathExp1 = "<.marvel-{now/d}>"; String dateMathExp2 = "<.marvel-{now/d-1d}>"; String dateMathExp3 = "<.marvel-{now/d-2d}>"; - client().prepareIndex(dateMathExp1).setId("1").setSource("{}", XContentType.JSON).get(); - client().prepareIndex(dateMathExp2).setId("2").setSource("{}", XContentType.JSON).get(); - client().prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp1).setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp2).setId("2").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get(); refresh(); SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3)); @@ -139,9 +139,9 @@ public class DateMathIndexExpressionsIntegrationIT extends ESIntegTestCase { String dateMathExp1 = "<.marvel-{now/d}>"; String dateMathExp2 = "<.marvel-{now/d-1d}>"; String dateMathExp3 = "<.marvel-{now/d-2d}>"; - client().prepareIndex(dateMathExp1).setId("1").setSource("{}", XContentType.JSON).get(); - client().prepareIndex(dateMathExp2).setId("2").setSource("{}", XContentType.JSON).get(); - client().prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp1).setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp2).setId("2").setSource("{}", XContentType.JSON).get(); + prepareIndex(dateMathExp3).setId("3").setSource("{}", XContentType.JSON).get(); refresh(); SearchResponse searchResponse = dateSensitiveGet(prepareSearch(dateMathExp1, dateMathExp2, dateMathExp3)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndexingMemoryControllerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndexingMemoryControllerIT.java index ebdc50a4fd0f..3dd9feff9ce2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndexingMemoryControllerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndexingMemoryControllerIT.java @@ -96,7 +96,7 @@ public class IndexingMemoryControllerIT extends ESSingleNodeTestCase { IndexService indexService = createIndex("index", indexSettings(1, 0).put("index.refresh_interval", -1).build()); IndexShard shard = indexService.getShard(0); for (int i = 0; i < 100; i++) { - client().prepareIndex("index").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("index").setId(Integer.toString(i)).setSource("field", "value").get(); } // Force merge so we know all merges are done before we start deleting: ForceMergeResponse r = client().admin().indices().prepareForceMerge().setMaxNumSegments(1).get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java index 52862c5cd030..4aa89ed6d32f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java @@ -308,7 +308,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { verify(getSettings(indices).setIndicesOptions(options), false); assertAcked(prepareCreate("foobar")); - client().prepareIndex("foobar").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("foobar").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get(); // Verify defaults for wildcards, with one wildcard expression and one existing index indices = new String[] { "foo*" }; @@ -394,7 +394,7 @@ public class IndicesOptionsIntegrationIT extends ESIntegTestCase { public void testAllMissingLenient() throws Exception { createIndex("test1"); - client().prepareIndex("test1").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test1").setId("1").setSource("k", "v").setRefreshPolicy(IMMEDIATE).get(); assertHitCount(prepareSearch("test2").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setQuery(matchAllQuery()), 0L); assertHitCount(prepareSearch("test2", "test3").setQuery(matchAllQuery()).setIndicesOptions(IndicesOptions.lenientExpandOpen()), 0L); // you should still be able to run empty searches without things blowing up diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java index 70234d81fead..1d41641d027a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java @@ -49,7 +49,7 @@ public class FlushIT extends ESIntegTestCase { final int numIters = scaledRandomIntBetween(10, 30); for (int i = 0; i < numIters; i++) { for (int j = 0; j < 10; j++) { - client().prepareIndex("test").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setSource("{}", XContentType.JSON).get(); } final CountDownLatch latch = new CountDownLatch(10); final CopyOnWriteArrayList errors = new CopyOnWriteArrayList<>(); @@ -87,7 +87,7 @@ public class FlushIT extends ESIntegTestCase { createIndex("test"); int numDocs = randomIntBetween(0, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setSource("{}", XContentType.JSON).get(); } assertThat( expectThrows( @@ -124,7 +124,7 @@ public class FlushIT extends ESIntegTestCase { ensureGreen(indexName); int numDocs = randomIntBetween(1, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex(indexName).setSource("f", "v").get(); + prepareIndex(indexName).setSource("f", "v").get(); } if (randomBoolean()) { internalCluster().restartNode(randomFrom(dataNodes)); 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 7541bce29fbe..ec5d9876b770 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java @@ -58,21 +58,18 @@ public class ConcurrentDynamicTemplateIT extends ESIntegTestCase { for (int j = 0; j < numDocs; j++) { Map source = new HashMap<>(); source.put(fieldName, "test-user"); - client().prepareIndex("test") - .setId(Integer.toString(currentID++)) - .setSource(source) - .execute(new ActionListener() { - @Override - public void onResponse(DocWriteResponse response) { - latch.countDown(); - } + prepareIndex("test").setId(Integer.toString(currentID++)).setSource(source).execute(new ActionListener() { + @Override + public void onResponse(DocWriteResponse response) { + latch.countDown(); + } - @Override - public void onFailure(Exception e) { - throwable.add(e); - latch.countDown(); - } - }); + @Override + public void onFailure(Exception e) { + throwable.add(e); + latch.countDown(); + } + }); } latch.await(); assertThat(throwable, emptyIterable()); 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 7a9aa7a47215..8d7311e4f761 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java @@ -58,7 +58,7 @@ public class MalformedDynamicTemplateIT extends ESIntegTestCase { .put("index.version.created", IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0)) ).setMapping(mapping) ); - client().prepareIndex(indexName).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); + prepareIndex(indexName).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get(); assertNoFailures((indicesAdmin().prepareRefresh(indexName)).get()); assertHitCount(prepareSearch(indexName), 1); 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 7459f61b1be4..0bd8f4c032b1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java @@ -74,8 +74,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase { String type = "type"; String fieldName = "field_" + type + "_" + rec; indexRequests.add( - client().prepareIndex("test") - .setId(Integer.toString(rec)) + prepareIndex("test").setId(Integer.toString(rec)) .setTimeout(TimeValue.timeValueMinutes(5)) .setSource(fieldName, "some_value") ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java index 329034a8d795..6a52159c71ab 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java @@ -126,8 +126,7 @@ public class RandomExceptionCircuitBreakerIT extends ESIntegTestCase { } for (int i = 0; i < numDocs; i++) { try { - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) .setTimeout(TimeValue.timeValueSeconds(1)) .setSource("test-str", randomUnicodeOfLengthBetween(5, 25), "test-num", i) .get(); 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 a1321865c210..0fe5845e9ed3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexPrimaryRelocationIT.java @@ -40,11 +40,11 @@ public class IndexPrimaryRelocationIT extends ESIntegTestCase { @Override public void run() { while (finished.get() == false && numAutoGenDocs.get() < 10_000) { - DocWriteResponse indexResponse = client().prepareIndex("test").setId("id").setSource("field", "value").get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("id").setSource("field", "value").get(); assertEquals(DocWriteResponse.Result.CREATED, indexResponse.getResult()); DeleteResponse deleteResponse = client().prepareDelete("test", "id").get(); assertEquals(DocWriteResponse.Result.DELETED, deleteResponse.getResult()); - client().prepareIndex("test").setSource("auto", true).get(); + prepareIndex("test").setSource("auto", true).get(); numAutoGenDocs.incrementAndGet(); } } 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 49a7112a310b..762bbdda77df 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java @@ -457,8 +457,14 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { int numDocs = randomIntBetween(10, 200); final IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex(INDEX_NAME) - .setSource("foo-int", randomInt(), "foo-string", randomAlphaOfLength(32), "foo-float", randomFloat()); + docs[i] = prepareIndex(INDEX_NAME).setSource( + "foo-int", + randomInt(), + "foo-string", + randomAlphaOfLength(32), + "foo-float", + randomFloat() + ); } indexRandom(randomBoolean(), docs); @@ -915,8 +921,14 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { final IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex(name) - .setSource("foo-int", randomInt(), "foo-string", randomAlphaOfLength(32), "foo-float", randomFloat()); + docs[i] = prepareIndex(name).setSource( + "foo-int", + randomInt(), + "foo-string", + randomAlphaOfLength(32), + "foo-float", + randomFloat() + ); } indexRandom(true, docs); @@ -981,7 +993,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { final List requests = new ArrayList<>(); final int replicatedDocCount = scaledRandomIntBetween(25, 250); while (requests.size() < replicatedDocCount) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); if (randomBoolean()) { @@ -1003,7 +1015,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { final int numNewDocs = scaledRandomIntBetween(25, 250); for (int i = 0; i < numNewDocs; i++) { - client().prepareIndex(indexName).setSource("{}", XContentType.JSON).setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex(indexName).setSource("{}", XContentType.JSON).setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); } // Flush twice to update the safe commit's local checkpoint assertThat(indicesAdmin().prepareFlush(indexName).setForce(true).execute().get().getFailedShards(), equalTo(0)); @@ -1035,10 +1047,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { indicesAdmin().preparePutMapping("test").setSource("test_field", "type=text,analyzer=test_analyzer").get(); int numDocs = between(1, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test") - .setId("u" + i) - .setSource(singletonMap("test_field", Integer.toString(i)), XContentType.JSON) - .get(); + prepareIndex("test").setId("u" + i).setSource(singletonMap("test_field", Integer.toString(i)), XContentType.JSON).get(); } Semaphore recoveryBlocked = new Semaphore(1); for (DiscoveryNode node : clusterService().state().nodes()) { @@ -1138,7 +1147,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, numDocs).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, numDocs).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); indicesAdmin().prepareRefresh(indexName).get(); // avoid refresh when we are failing a shard String failingNode = randomFrom(nodes); @@ -1229,7 +1238,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(0, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, between(0, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); @@ -1293,7 +1302,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(0, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, between(0, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); @@ -1324,9 +1333,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(1, 100)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, between(1, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); // We do not guarantee that the replica can recover locally all the way to its own global checkpoint before starting @@ -1379,7 +1386,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, between(0, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, between(0, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); @@ -1460,9 +1467,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, newDocCount) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, newDocCount).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); flush(indexName); @@ -1504,7 +1509,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(0, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, between(0, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); final ShardId shardId = new ShardId(resolveIndex(indexName), 0); @@ -1523,7 +1528,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, between(0, 100)).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).collect(toList()) + IntStream.range(0, between(0, 100)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); setReplicaCount(1, indexName); @@ -1580,9 +1585,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, randomIntBetween(0, 10)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 10)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); assertThat(indicesAdmin().prepareFlush(indexName).get().getFailedShards(), equalTo(0)); @@ -1610,9 +1613,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, randomIntBetween(0, 10)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 10)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); logger.info("--> add replicas again"); @@ -1630,7 +1631,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { .setSettings(indexSettings(1, 1).put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), randomBoolean())) ); final List indexRequests = IntStream.range(0, between(10, 500)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("foo", "bar")) + .mapToObj(n -> prepareIndex(indexName).setSource("foo", "bar")) .toList(); indexRandom(randomBoolean(), true, true, indexRequests); ensureGreen(); @@ -1676,9 +1677,10 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { indexers[i] = new Thread(() -> { while (stopped.get() == false) { try { - DocWriteResponse response = client().prepareIndex(indexName) - .setSource(Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), XContentType.JSON) - .get(); + DocWriteResponse response = prepareIndex(indexName).setSource( + Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), + XContentType.JSON + ).get(); assertThat(response.getResult(), is(oneOf(CREATED, UPDATED))); } catch (ElasticsearchException ignored) {} } @@ -1721,7 +1723,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { createIndex(indexName, indexSettings(1, 0).put("index.routing.allocation.include._name", String.join(",", dataNodes)).build()); ensureGreen(indexName); final List indexRequests = IntStream.range(0, between(10, 500)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("foo", "bar")) + .mapToObj(n -> prepareIndex(indexName).setSource("foo", "bar")) .toList(); indexRandom(randomBoolean(), true, true, indexRequests); assertThat(indicesAdmin().prepareFlush(indexName).get().getFailedShards(), equalTo(0)); @@ -1795,7 +1797,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { createIndex(indexName, indexSettings(1, 0).build()); ensureGreen(indexName); final List indexRequests = IntStream.range(0, between(10, 500)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("foo", "bar")) + .mapToObj(n -> prepareIndex(indexName).setSource("foo", "bar")) .toList(); indexRandom(randomBoolean(), true, true, indexRequests); assertThat(indicesAdmin().prepareFlush(indexName).get().getFailedShards(), equalTo(0)); @@ -1865,7 +1867,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { createIndex(indexName, indexSettings(1, 0).build()); ensureGreen(indexName); final List indexRequests = IntStream.range(0, between(10, 500)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("foo", "bar")) + .mapToObj(n -> prepareIndex(indexName).setSource("foo", "bar")) .toList(); indexRandom(randomBoolean(), true, true, indexRequests); assertThat(indicesAdmin().prepareFlush(indexName).get().getFailedShards(), equalTo(0)); @@ -1895,7 +1897,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { // Process the TRANSLOG_OPS response on the replica (avoiding failing it due to a concurrent delete) but // before sending the response back send another document to the primary, advancing the GCP to prevent the replica // being marked as in-sync (NB below we delay the replica write until after the index is deleted) - client().prepareIndex(indexName).setSource("foo", "baz").execute(ActionListener.noop()); + prepareIndex(indexName).setSource("foo", "baz").execute(ActionListener.noop()); primaryIndexShard.addGlobalCheckpointListener( globalCheckpointBeforeRecovery + 1, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java index 0497a4d3a765..56fffa682a36 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java @@ -52,8 +52,7 @@ public class UpdateNumberOfReplicasIT extends ESIntegTestCase { assertThat(clusterHealth.getIndices().get("test").getActiveShards(), equalTo(numShards.totalNumShards)); for (int i = 0; i < 10; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource(jsonBuilder().startObject().field("value", "test" + i).endObject()) .get(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java index d6c539c6ce4a..563e6e0761cb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java @@ -381,11 +381,11 @@ public class UpdateSettingsIT extends ESIntegTestCase { public void testEngineGCDeletesSetting() throws Exception { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("f", 1).setVersionType(VersionType.EXTERNAL).setVersion(1).get(); + prepareIndex("test").setId("1").setSource("f", 1).setVersionType(VersionType.EXTERNAL).setVersion(1).get(); client().prepareDelete("test", "1").setVersionType(VersionType.EXTERNAL).setVersion(2).get(); // delete is still in cache this should fail assertRequestBuilderThrows( - client().prepareIndex("test").setId("1").setSource("f", 3).setVersionType(VersionType.EXTERNAL).setVersion(1), + prepareIndex("test").setId("1").setSource("f", 3).setVersionType(VersionType.EXTERNAL).setVersion(1), VersionConflictEngineException.class ); @@ -400,7 +400,7 @@ public class UpdateSettingsIT extends ESIntegTestCase { } // delete should not be in cache - client().prepareIndex("test").setId("1").setSource("f", 2).setVersionType(VersionType.EXTERNAL).setVersion(1); + prepareIndex("test").setId("1").setSource("f", 2).setVersionType(VersionType.EXTERNAL).setVersion(1); } public void testUpdateSettingsWithBlocks() { 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 91425067bd81..2ef7dc560b76 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java @@ -123,9 +123,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) - .collect(toList()) + IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList()) ); assertBusy(() -> closeIndices(indexName)); @@ -145,7 +143,7 @@ public class CloseIndexIT extends ESIntegTestCase { false, randomBoolean(), IntStream.range(0, randomIntBetween(1, 10)) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) + .mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) .collect(toList()) ); } @@ -187,9 +185,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) - .collect(toList()) + IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList()) ); ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(indexName) @@ -258,7 +254,7 @@ public class CloseIndexIT extends ESIntegTestCase { false, randomBoolean(), IntStream.range(0, 10) - .mapToObj(n -> client().prepareIndex(indexName).setId(String.valueOf(n)).setSource("num", n)) + .mapToObj(n -> prepareIndex(indexName).setId(String.valueOf(n)).setSource("num", n)) .collect(toList()) ); } @@ -361,9 +357,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), false, randomBoolean(), - IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)) - .collect(toList()) + IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList()) ); ensureGreen(indexName); @@ -388,9 +382,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); @@ -425,9 +417,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); indicesAdmin().prepareFlush(indexName).get(); @@ -468,9 +458,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); assertAcked(indicesAdmin().prepareClose(indexName)); // move single shard to second node @@ -489,9 +477,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); assertAcked(indicesAdmin().prepareClose(indexName)); @@ -520,9 +506,7 @@ public class CloseIndexIT extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); assertAcked(indicesAdmin().prepareClose(indexName)); 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 53d3e6210953..77d38410d1ea 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseWhileRelocatingShardsIT.java @@ -94,7 +94,7 @@ public class CloseWhileRelocatingShardsIT extends ESIntegTestCase { createIndex(indexName); indexRandom( randomBoolean(), - IntStream.range(0, nbDocs).mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)).toList() + IntStream.range(0, nbDocs).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).toList() ); } default -> { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java index 7890e66c6628..24ab74682a76 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java @@ -263,7 +263,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase { int docs = between(10, 100); IndexRequestBuilder[] builder = new IndexRequestBuilder[docs]; for (int i = 0; i < docs; i++) { - builder[i] = client().prepareIndex("test").setId("" + i).setSource("test", "init"); + builder[i] = prepareIndex("test").setId("" + i).setSource("test", "init"); } indexRandom(true, builder); if (randomBoolean()) { @@ -285,7 +285,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase { int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex("test").setId("" + i).setSource("test", "init").get(); + prepareIndex("test").setId("" + i).setSource("test", "init").get(); } for (String blockSetting : Arrays.asList(SETTING_BLOCKS_READ, SETTING_BLOCKS_WRITE)) { @@ -341,7 +341,7 @@ public class OpenCloseIndexIT extends ESIntegTestCase { final int nbDocs = randomIntBetween(0, 50); int uncommittedOps = 0; for (long i = 0; i < nbDocs; i++) { - final DocWriteResponse indexResponse = client().prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); + final DocWriteResponse indexResponse = prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); assertThat(indexResponse.status(), is(RestStatus.CREATED)); if (rarely()) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java index dd22f50ab420..b5448498f0ce 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java @@ -43,7 +43,7 @@ public class SimpleIndexStateIT extends ESIntegTestCase { ); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); logger.info("--> closing test index..."); assertAcked(indicesAdmin().prepareClose("test")); @@ -54,7 +54,7 @@ public class SimpleIndexStateIT extends ESIntegTestCase { logger.info("--> trying to index into a closed index ..."); try { - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); fail(); } catch (IndexClosedException e) { // all is well @@ -76,7 +76,7 @@ public class SimpleIndexStateIT extends ESIntegTestCase { ); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); } public void testFastCloseAfterCreateContinuesCreateAfterOpen() { @@ -111,7 +111,7 @@ public class SimpleIndexStateIT extends ESIntegTestCase { ); logger.info("--> indexing a simple document"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); } public void testConsistencyAfterIndexCreationFailure() { 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 7fe779f5edc2..ec62a1cbbd9b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java @@ -133,8 +133,8 @@ public class IndexStatsIT extends ESIntegTestCase { .setMapping("field", "type=text,fielddata=true", "field2", "type=text,fielddata=true") ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "value1", "field2", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field", "value2", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field", "value1", "field2", "value1").get(); + prepareIndex("test").setId("2").setSource("field", "value2", "field2", "value2").get(); indicesAdmin().prepareRefresh().get(); NodesStatsResponse nodesStats = clusterAdmin().prepareNodesStats("data:true").setIndices(true).get(); @@ -237,8 +237,8 @@ public class IndexStatsIT extends ESIntegTestCase { ); ensureGreen(); clusterAdmin().prepareHealth().setWaitForGreenStatus().get(); - client().prepareIndex("test").setId("1").setSource("field", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field", "value2").get(); + prepareIndex("test").setId("1").setSource("field", "value1").get(); + prepareIndex("test").setId("2").setSource("field", "value2").get(); indicesAdmin().prepareRefresh().get(); NodesStatsResponse nodesStats = clusterAdmin().prepareNodesStats("data:true").setIndices(true).get(); @@ -329,8 +329,7 @@ public class IndexStatsIT extends ESIntegTestCase { while (true) { IndexRequestBuilder[] builders = new IndexRequestBuilder[pageDocs]; for (int i = 0; i < pageDocs; ++i) { - builders[i] = client().prepareIndex("idx") - .setId(Integer.toString(counter++)) + builders[i] = prepareIndex("idx").setId(Integer.toString(counter++)) .setSource(jsonBuilder().startObject().field("common", "field").field("str_value", "s" + i).endObject()); } indexRandom(true, builders); @@ -377,8 +376,7 @@ public class IndexStatsIT extends ESIntegTestCase { // index the data again... IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; ++i) { - builders[i] = client().prepareIndex("idx") - .setId(Integer.toString(i)) + builders[i] = prepareIndex("idx").setId(Integer.toString(i)) .setSource(jsonBuilder().startObject().field("common", "field").field("str_value", "s" + i).endObject()); } indexRandom(true, builders); @@ -488,7 +486,7 @@ public class IndexStatsIT extends ESIntegTestCase { sb.append(termUpto++); sb.append(" some random text that keeps repeating over and over again hambone"); } - client().prepareIndex("test").setId("" + termUpto).setSource("field" + (i % 10), sb.toString()).get(); + prepareIndex("test").setId("" + termUpto).setSource("field" + (i % 10), sb.toString()).get(); } refresh(); stats = indicesAdmin().prepareStats().get(); @@ -524,7 +522,7 @@ public class IndexStatsIT extends ESIntegTestCase { sb.append(' '); sb.append(termUpto++); } - client().prepareIndex("test").setId("" + termUpto).setSource("field" + (i % 10), sb.toString()).get(); + prepareIndex("test").setId("" + termUpto).setSource("field" + (i % 10), sb.toString()).get(); if (i % 2 == 0) { refresh(); } @@ -550,9 +548,9 @@ public class IndexStatsIT extends ESIntegTestCase { createIndex("test1", "test2"); ensureGreen(); - client().prepareIndex("test1").setId(Integer.toString(1)).setSource("field", "value").get(); - client().prepareIndex("test1").setId(Integer.toString(2)).setSource("field", "value").get(); - client().prepareIndex("test2").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test1").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test1").setId(Integer.toString(2)).setSource("field", "value").get(); + prepareIndex("test2").setId(Integer.toString(1)).setSource("field", "value").get(); refresh(); NumShards test1 = getNumShards("test1"); @@ -641,8 +639,7 @@ public class IndexStatsIT extends ESIntegTestCase { // index failed try { - client().prepareIndex("test1") - .setId(Integer.toString(1)) + prepareIndex("test1").setId(Integer.toString(1)) .setSource("field", "value") .setVersion(1) .setVersionType(VersionType.EXTERNAL) @@ -650,8 +647,7 @@ public class IndexStatsIT extends ESIntegTestCase { fail("Expected a version conflict"); } catch (VersionConflictEngineException e) {} try { - client().prepareIndex("test2") - .setId(Integer.toString(1)) + prepareIndex("test2").setId(Integer.toString(1)) .setSource("field", "value") .setVersion(1) .setVersionType(VersionType.EXTERNAL) @@ -659,8 +655,7 @@ public class IndexStatsIT extends ESIntegTestCase { fail("Expected a version conflict"); } catch (VersionConflictEngineException e) {} try { - client().prepareIndex("test2") - .setId(Integer.toString(1)) + prepareIndex("test2").setId(Integer.toString(1)) .setSource("field", "value") .setVersion(1) .setVersionType(VersionType.EXTERNAL) @@ -696,7 +691,7 @@ public class IndexStatsIT extends ESIntegTestCase { assertThat(stats.getTotal().getSearch(), nullValue()); for (int i = 0; i < 20; i++) { - client().prepareIndex("test_index").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test_index").setId(Integer.toString(i)).setSource("field", "value").get(); indicesAdmin().prepareFlush().get(); } indicesAdmin().prepareForceMerge().setMaxNumSegments(1).get(); @@ -754,9 +749,9 @@ public class IndexStatsIT extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("test_index").setId(Integer.toString(1)).setSource("field", "value").get(); - client().prepareIndex("test_index").setId(Integer.toString(2)).setSource("field", "value").get(); - client().prepareIndex("test_index_2").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test_index").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test_index").setId(Integer.toString(2)).setSource("field", "value").get(); + prepareIndex("test_index_2").setId(Integer.toString(1)).setSource("field", "value").get(); indicesAdmin().prepareRefresh().get(); IndicesStatsRequestBuilder builder = indicesAdmin().prepareStats(); @@ -885,9 +880,9 @@ public class IndexStatsIT extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("test1").setId(Integer.toString(1)).setSource("field", "value").get(); - client().prepareIndex("test1").setId(Integer.toString(2)).setSource("field", "value").get(); - client().prepareIndex("test2").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test1").setId(Integer.toString(1)).setSource("field", "value").get(); + prepareIndex("test1").setId(Integer.toString(2)).setSource("field", "value").get(); + prepareIndex("test2").setId(Integer.toString(1)).setSource("field", "value").get(); refresh(); int numShards1 = getNumShards("test1").totalNumShards; @@ -942,7 +937,7 @@ public class IndexStatsIT extends ESIntegTestCase { }""")); ensureGreen(); - client().prepareIndex("test1").setId(Integer.toString(1)).setSource(""" + prepareIndex("test1").setId(Integer.toString(1)).setSource(""" {"bar":"bar","baz":"baz"}""", XContentType.JSON).get(); refresh(); @@ -985,7 +980,7 @@ public class IndexStatsIT extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("test1").setId(Integer.toString(1)).setSource("foo", "bar").get(); + prepareIndex("test1").setId(Integer.toString(1)).setSource("foo", "bar").get(); refresh(); prepareSearch("_all").setStats("bar", "baz").get(); @@ -1124,8 +1119,8 @@ public class IndexStatsIT extends ESIntegTestCase { indexRandom( false, true, - client().prepareIndex("index").setId("1").setSource("foo", "bar"), - client().prepareIndex("index").setId("2").setSource("foo", "baz") + prepareIndex("index").setId("1").setSource("foo", "bar"), + prepareIndex("index").setId("2").setSource("foo", "baz") ); persistGlobalCheckpoint("index"); // Need to persist the global checkpoint for the soft-deletes retention MP. refresh(); @@ -1190,8 +1185,8 @@ public class IndexStatsIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("index").setId("1").setSource("foo", "bar"), - client().prepareIndex("index").setId("2").setSource("foo", "baz") + prepareIndex("index").setId("1").setSource("foo", "bar"), + prepareIndex("index").setId("2").setSource("foo", "baz") ); assertBusy(() -> { @@ -1288,7 +1283,7 @@ public class IndexStatsIT extends ESIntegTestCase { } while (stop.get() == false) { final String id = Integer.toString(idGenerator.incrementAndGet()); - final DocWriteResponse response = client().prepareIndex("test").setId(id).setSource("{}", XContentType.JSON).get(); + final DocWriteResponse response = prepareIndex("test").setId(id).setSource("{}", XContentType.JSON).get(); assertThat(response.getResult(), equalTo(DocWriteResponse.Result.CREATED)); } }); @@ -1360,8 +1355,7 @@ public class IndexStatsIT extends ESIntegTestCase { final List> indexRequestFutures = new ArrayList<>(numDocs); for (int i = 0; i < numDocs; i++) { indexRequestFutures.add( - client().prepareIndex(indexName) - .setId(Integer.toString(idGenerator.incrementAndGet())) + prepareIndex(indexName).setId(Integer.toString(idGenerator.incrementAndGet())) .setSource("{}", XContentType.JSON) .execute() ); 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 74d2a4dbe4f2..a498a820e9e9 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java @@ -149,7 +149,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { assertThat(response.getIndexTemplates(), hasSize(2)); // index something into test_index, will match on both templates - client().prepareIndex("test_index").setId("1").setSource("field1", "value1", "field2", "value 2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test_index").setId("1").setSource("field1", "value1", "field2", "value 2").setRefreshPolicy(IMMEDIATE).get(); ensureGreen(); SearchResponse searchResponse = prepareSearch("test_index").setQuery(termQuery("field1", "value1")) @@ -162,7 +162,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { // field2 is not stored. assertThat(searchResponse.getHits().getAt(0).field("field2"), nullValue()); - client().prepareIndex("text_index").setId("1").setSource("field1", "value1", "field2", "value 2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("text_index").setId("1").setSource("field1", "value1", "field2", "value 2").setRefreshPolicy(IMMEDIATE).get(); ensureGreen(); // now only match on one template (template_1) @@ -486,11 +486,11 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { assertAcked(prepareCreate("test_index")); ensureGreen(); - client().prepareIndex("test_index").setId("1").setSource("type", "type1", "field", "A value").get(); - client().prepareIndex("test_index").setId("2").setSource("type", "type2", "field", "B value").get(); - client().prepareIndex("test_index").setId("3").setSource("type", "typeX", "field", "C value").get(); - client().prepareIndex("test_index").setId("4").setSource("type", "typeY", "field", "D value").get(); - client().prepareIndex("test_index").setId("5").setSource("type", "typeZ", "field", "E value").get(); + prepareIndex("test_index").setId("1").setSource("type", "type1", "field", "A value").get(); + prepareIndex("test_index").setId("2").setSource("type", "type2", "field", "B value").get(); + prepareIndex("test_index").setId("3").setSource("type", "typeX", "field", "C value").get(); + prepareIndex("test_index").setId("4").setSource("type", "typeY", "field", "D value").get(); + prepareIndex("test_index").setId("5").setSource("type", "typeZ", "field", "E value").get(); GetAliasesResponse getAliasesResponse = indicesAdmin().prepareGetAliases().setIndices("test_index").get(); assertThat(getAliasesResponse.getAliases().size(), equalTo(1)); @@ -540,8 +540,8 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { assertThat(getAliasesResponse.getAliases().size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("test_index").size(), equalTo(1)); - client().prepareIndex("test_index").setId("1").setSource("field", "value1").get(); - client().prepareIndex("test_index").setId("2").setSource("field", "value2").get(); + prepareIndex("test_index").setId("1").setSource("field", "value1").get(); + prepareIndex("test_index").setId("2").setSource("field", "value2").get(); refresh(); assertHitCount(prepareSearch("test_index"), 2L); @@ -575,8 +575,8 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { assertThat(getAliasesResponse.getAliases().size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("test_index").size(), equalTo(3)); - client().prepareIndex("test_index").setId("1").setSource("field", "value1").get(); - client().prepareIndex("test_index").setId("2").setSource("field", "value2").get(); + prepareIndex("test_index").setId("1").setSource("field", "value1").get(); + prepareIndex("test_index").setId("2").setSource("field", "value2").get(); refresh(); assertHitCount(prepareSearch("test_index"), 2L); @@ -711,7 +711,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { .addAlias(new Alias("alias4").filter(termQuery("field", "value"))) .get(); - client().prepareIndex("a1").setId("test").setSource("{}", XContentType.JSON).get(); + prepareIndex("a1").setId("test").setSource("{}", XContentType.JSON).get(); BulkResponse response = client().prepareBulk().add(new IndexRequest("a2").id("test").source("{}", XContentType.JSON)).get(); assertThat(response.hasFailures(), is(false)); assertThat(response.getItems()[0].isFailed(), equalTo(false)); @@ -727,7 +727,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { // So the aliases defined in the index template for this index will not fail // even though the fields in the alias fields don't exist yet and indexing into // an index that doesn't exist yet will succeed - client().prepareIndex("b1").setId("test").setSource("{}", XContentType.JSON).get(); + prepareIndex("b1").setId("test").setSource("{}", XContentType.JSON).get(); response = client().prepareBulk().add(new IndexRequest("b2").id("test").source("{}", XContentType.JSON)).get(); assertThat(response.hasFailures(), is(false)); @@ -830,9 +830,9 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("ax").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("ax").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("bx").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("bx").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); ensureGreen(); @@ -981,7 +981,7 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase { """, XContentType.JSON) .get(); - client().prepareIndex("test").setSource().get(); + prepareIndex("test").setSource().get(); FieldCapabilitiesResponse fieldCapabilitiesResponse = client().prepareFieldCaps("test").setFields("*location").get(); { Map field = fieldCapabilitiesResponse.getField("kwm.source.geo.location"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java index 04194238bd9f..afc39cd6b4d7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/ingest/IngestClientIT.java @@ -230,15 +230,13 @@ public class IngestClientIT extends ESIntegTestCase { assertThat(getResponse.pipelines().size(), equalTo(1)); assertThat(getResponse.pipelines().get(0).getId(), equalTo("_id")); - client().prepareIndex("test").setId("1").setPipeline("_id").setSource("field", "value", "fail", false).get(); + prepareIndex("test").setId("1").setPipeline("_id").setSource("field", "value", "fail", false).get(); Map doc = client().prepareGet("test", "1").get().getSourceAsMap(); assertThat(doc.get("field"), equalTo("value")); assertThat(doc.get("processed"), equalTo(true)); - client().prepareBulk() - .add(client().prepareIndex("test").setId("2").setSource("field", "value2", "fail", false).setPipeline("_id")) - .get(); + client().prepareBulk().add(prepareIndex("test").setId("2").setSource("field", "value2", "fail", false).setPipeline("_id")).get(); doc = client().prepareGet("test", "2").get().getSourceAsMap(); assertThat(doc.get("field"), equalTo("value2")); assertThat(doc.get("processed"), equalTo(true)); @@ -290,7 +288,7 @@ public class IngestClientIT extends ESIntegTestCase { clusterAdmin().putPipeline(putPipelineRequest).get(); BulkItemResponse item = client(masterOnlyNode).prepareBulk() - .add(client().prepareIndex("test").setSource("field", "value2", "drop", true).setPipeline("_id")) + .add(prepareIndex("test").setSource("field", "value2", "drop", true).setPipeline("_id")) .get() .getItems()[0]; assertFalse(item.isFailed()); @@ -422,7 +420,7 @@ public class IngestClientIT extends ESIntegTestCase { clusterAdmin().putPipeline(putPipelineRequest).get(); } - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).setPipeline("1").get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).setPipeline("1").get(); Map inserted = client().prepareGet("test", "1").get().getSourceAsMap(); assertThat(inserted.get("readme"), equalTo("pipeline with id [3] is a bad pipeline")); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/mget/SimpleMgetIT.java b/server/src/internalClusterTest/java/org/elasticsearch/mget/SimpleMgetIT.java index 6c6d59844d48..0ea1d8243c09 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/mget/SimpleMgetIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/mget/SimpleMgetIT.java @@ -37,8 +37,7 @@ public class SimpleMgetIT extends ESIntegTestCase { public void testThatMgetShouldWorkWithOneIndexMissing() throws IOException { createIndex("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("foo", "bar").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -75,8 +74,7 @@ public class SimpleMgetIT extends ESIntegTestCase { assertAcked(prepareCreate("test").addAlias(new Alias("multiIndexAlias"))); assertAcked(prepareCreate("test2").addAlias(new Alias("multiIndexAlias"))); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("foo", "bar").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -115,8 +113,7 @@ public class SimpleMgetIT extends ESIntegTestCase { ) ); - client().prepareIndex("alias1") - .setId("1") + prepareIndex("alias1").setId("1") .setSource(jsonBuilder().startObject().field("foo", "bar").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -142,7 +139,7 @@ public class SimpleMgetIT extends ESIntegTestCase { .endObject() ); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource(sourceBytesRef, XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(sourceBytesRef, XContentType.JSON).get(); } MultiGetRequestBuilder request = client().prepareMultiGet(); @@ -189,8 +186,7 @@ public class SimpleMgetIT extends ESIntegTestCase { final String id = routingKeyForShard("test", 0); final String routingOtherShard = routingKeyForShard("test", 1); - client().prepareIndex("test") - .setId(id) + prepareIndex("test").setId(id) .setRefreshPolicy(IMMEDIATE) .setRouting(routingOtherShard) .setSource(jsonBuilder().startObject().field("foo", "bar").endObject()) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java index 5067d49f3b34..1e67a38c7601 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java @@ -49,11 +49,11 @@ public class FullRollingRestartIT extends ESIntegTestCase { final String healthTimeout = "1m"; for (int i = 0; i < 1000; i++) { - client().prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); + prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); } flush(); for (int i = 1000; i < 2000; i++) { - client().prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); + prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); } logger.info("--> now start adding nodes"); @@ -165,7 +165,7 @@ public class FullRollingRestartIT extends ESIntegTestCase { ).get(); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); + prepareIndex("test").setId(Long.toString(i)).setSource(Map.of("test", "value" + i)).get(); } ensureGreen(); ClusterState state = clusterAdmin().prepareState().get().getState(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java index c9064517793f..82afa574aace 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java @@ -122,13 +122,13 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> index 10 docs"); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } logger.info("--> flush so we have an actual index"); indicesAdmin().prepareFlush().get(); logger.info("--> index more docs so we have something in the translog"); for (int i = 10; i < 20; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } logger.info("--> verifying count"); @@ -328,12 +328,12 @@ public class RelocationIT extends ESIntegTestCase { List builders1 = new ArrayList<>(); for (int numDocs = randomIntBetween(10, 30); numDocs > 0; numDocs--) { - builders1.add(client().prepareIndex("test").setSource("{}", XContentType.JSON)); + builders1.add(prepareIndex("test").setSource("{}", XContentType.JSON)); } List builders2 = new ArrayList<>(); for (int numDocs = randomIntBetween(10, 30); numDocs > 0; numDocs--) { - builders2.add(client().prepareIndex("test").setSource("{}", XContentType.JSON)); + builders2.add(prepareIndex("test").setSource("{}", XContentType.JSON)); } logger.info("--> START relocate the shard from {} to {}", nodes[fromNode], nodes[toNode]); @@ -388,7 +388,7 @@ public class RelocationIT extends ESIntegTestCase { List requests = new ArrayList<>(); int numDocs = scaledRandomIntBetween(25, 250); for (int i = 0; i < numDocs; i++) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); assertFalse(clusterAdmin().prepareHealth().setWaitForNodes("3").setWaitForGreenStatus().get().isTimedOut()); @@ -491,7 +491,7 @@ public class RelocationIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { String id = randomRealisticUnicodeOfLength(10) + String.valueOf(i); ids.add(id); - docs[i] = client().prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(i)); + docs[i] = prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(i)); } indexRandom(true, docs); assertHitCount(prepareSearch("test"), numDocs); @@ -506,7 +506,7 @@ public class RelocationIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { String id = randomRealisticUnicodeOfLength(10) + String.valueOf(numDocs + i); ids.add(id); - docs[i] = client().prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(numDocs + i)); + docs[i] = prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(numDocs + i)); } indexRandom(true, docs); @@ -538,14 +538,13 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> index 10 docs"); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } logger.info("--> flush so we have an actual index"); indicesAdmin().prepareFlush().get(); logger.info("--> index more docs so we have something in the translog"); for (int i = 10; i < 20; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL) .setSource("field", "value" + i) .execute(); @@ -587,7 +586,7 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> index 10 docs"); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value" + i).get(); } logger.info("--> flush so we have an actual index"); indicesAdmin().prepareFlush().get(); @@ -595,8 +594,7 @@ public class RelocationIT extends ESIntegTestCase { final List> pendingIndexResponses = new ArrayList<>(); for (int i = 10; i < 20; i++) { pendingIndexResponses.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL) .setSource("field", "value" + i) .execute() @@ -618,8 +616,7 @@ public class RelocationIT extends ESIntegTestCase { logger.info("--> index 100 docs while relocating"); for (int i = 20; i < 120; i++) { pendingIndexResponses.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL) .setSource("field", "value" + i) .execute() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java index 6281df7fc664..28c56e0cdc91 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java @@ -88,7 +88,7 @@ public class TruncatedRecoveryIT extends ESIntegTestCase { List builder = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { String id = Integer.toString(i); - builder.add(client().prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(i), "the_id", id)); + builder.add(prepareIndex("test").setId(id).setSource("field1", English.intToEnglish(i), "the_id", id)); } indexRandom(true, builder); for (int i = 0; i < numDocs; i++) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java index 6b7def93ad76..53001e30763a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasResolveRoutingIT.java @@ -37,9 +37,9 @@ public class AliasResolveRoutingIT extends ESIntegTestCase { indicesAdmin().prepareClose("test-1").get(); indexRandom( true, - client().prepareIndex("test-0").setId("1").setSource("field1", "the quick brown fox jumps"), - client().prepareIndex("test-0").setId("2").setSource("field1", "quick brown"), - client().prepareIndex("test-0").setId("3").setSource("field1", "quick") + prepareIndex("test-0").setId("1").setSource("field1", "the quick brown fox jumps"), + prepareIndex("test-0").setId("2").setSource("field1", "quick brown"), + prepareIndex("test-0").setId("3").setSource("field1", "quick") ); refresh("test-*"); assertHitCount( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java index ed6e16400600..83d7dc51d052 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/AliasRoutingIT.java @@ -38,7 +38,7 @@ public class AliasRoutingIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareAliases().addAliasAction(AliasActions.add().index("test").alias("alias0").routing("0"))); logger.info("--> indexing with id [1], and routing [0] using alias"); - client().prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "1").get().isExists(), equalTo(false)); @@ -80,7 +80,7 @@ public class AliasRoutingIT extends ESIntegTestCase { } logger.info("--> indexing with id [1], and routing [0] using alias"); - client().prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "1").get().isExists(), equalTo(false)); @@ -104,7 +104,7 @@ public class AliasRoutingIT extends ESIntegTestCase { ); logger.info("--> indexing with id [1], and routing [0] using alias"); - client().prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test", "1").get().isExists(), equalTo(false)); @@ -158,7 +158,7 @@ public class AliasRoutingIT extends ESIntegTestCase { } logger.info("--> indexing with id [2], and routing [1] using alias"); - client().prepareIndex("alias1").setId("2").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias1").setId("2").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> search with no routing, should fine two"); for (int i = 0; i < 5; i++) { @@ -293,7 +293,7 @@ public class AliasRoutingIT extends ESIntegTestCase { ); ensureGreen(); // wait for events again to make sure we got the aliases on all nodes logger.info("--> indexing with id [1], and routing [0] using alias to test-a"); - client().prepareIndex("alias-a0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias-a0").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test-a", "1").get().isExists(), equalTo(false)); @@ -304,7 +304,7 @@ public class AliasRoutingIT extends ESIntegTestCase { } logger.info("--> indexing with id [0], and routing [1] using alias to test-b"); - client().prepareIndex("alias-b1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias-b1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); for (int i = 0; i < 5; i++) { assertThat(client().prepareGet("test-a", "1").get().isExists(), equalTo(false)); @@ -368,9 +368,9 @@ public class AliasRoutingIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareAliases().addAliasAction(AliasActions.add().index("index").alias("index_1").routing("1"))); logger.info("--> indexing on index_1 which is an alias for index with routing [1]"); - client().prepareIndex("index_1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("index_1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> indexing on index_2 which is a concrete index"); - client().prepareIndex("index_2").setId("2").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("index_2").setId("2").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> search all on index_* should find two"); for (int i = 0; i < 5; i++) { @@ -391,9 +391,9 @@ public class AliasRoutingIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareAliases().addAliasAction(AliasActions.add().index("index").alias("index_1").routing("1"))); logger.info("--> indexing on index_1 which is an alias for index with routing [1]"); - client().prepareIndex("index_1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("index_1").setId("1").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> indexing on index_2 which is a concrete index"); - client().prepareIndex("index_2").setId("2").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("index_2").setId("2").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); SearchResponse searchResponse = prepareSearch("index_*").setSearchType(SearchType.QUERY_THEN_FETCH) .setSize(1) @@ -414,7 +414,7 @@ public class AliasRoutingIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareAliases().addAliasAction(AliasActions.add().index("test").alias("alias").routing("3"))); logger.info("--> indexing with id [0], and routing [3]"); - client().prepareIndex("alias").setId("0").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias").setId("0").setSource("field", "value1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); logger.info("--> verifying get and search with routing, should find"); @@ -446,7 +446,7 @@ public class AliasRoutingIT extends ESIntegTestCase { ); logger.info("--> indexing with id [1], and routing [4]"); - client().prepareIndex("alias").setId("1").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); + prepareIndex("alias").setId("1").setSource("field", "value2").setRefreshPolicy(RefreshPolicy.IMMEDIATE).get(); logger.info("--> verifying get with no routing, should not find anything"); logger.info("--> verifying get and search with routing, should find"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java index 92c3d8328f6c..4094378207c0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/PartitionedRoutingIT.java @@ -217,7 +217,7 @@ public class PartitionedRoutingIT extends ESIntegTestCase { String id = routingValue + "_" + String.valueOf(k); routingToDocumentIds.get(routingValue).add(id); - client().prepareIndex(index).setId(id).setRouting(routingValue).setSource("foo", "bar").get(); + prepareIndex(index).setId(id).setRouting(routingValue).setSource("foo", "bar").get(); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java index 9e75acb7d579..772d8767b7dd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/routing/SimpleRoutingIT.java @@ -68,8 +68,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { ensureGreen(); String routingValue = findNonMatchingRoutingValue("test", "1"); logger.info("--> indexing with id [1], and routing [{}]", routingValue); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRouting(routingValue) .setSource("field", "value1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) @@ -98,8 +97,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { } logger.info("--> indexing with id [1], and routing [0]"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRouting(routingValue) .setSource("field", "value1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) @@ -120,8 +118,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { String routingValue = findNonMatchingRoutingValue("test", "1"); logger.info("--> indexing with id [1], and routing [{}]", routingValue); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRouting(routingValue) .setSource("field", "value1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) @@ -171,8 +168,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { String secondRoutingValue = "1"; logger.info("--> indexing with id [{}], and routing [{}]", routingValue, secondRoutingValue); - client().prepareIndex("test") - .setId(routingValue) + prepareIndex("test").setId(routingValue) .setRouting(secondRoutingValue) .setSource("field", "value1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) @@ -282,8 +278,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { String routingValue = findNonMatchingRoutingValue("test", "1"); logger.info("--> indexing with id [1], and routing [{}]", routingValue); - client().prepareIndex(indexOrAlias()) - .setId("1") + prepareIndex(indexOrAlias()).setId("1") .setRouting(routingValue) .setSource("field", "value1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) @@ -292,7 +287,7 @@ public class SimpleRoutingIT extends ESIntegTestCase { logger.info("--> indexing with id [1], with no routing, should fail"); try { - client().prepareIndex(indexOrAlias()).setId("1").setSource("field", "value1").get(); + prepareIndex(indexOrAlias()).setId("1").setSource("field", "value1").get(); fail("index with missing routing when routing is required should fail"); } catch (ElasticsearchException e) { assertThat(e.unwrapCause(), instanceOf(RoutingMissingException.class)); @@ -463,10 +458,9 @@ public class SimpleRoutingIT extends ESIntegTestCase { ensureGreen(); String routingValue = findNonMatchingRoutingValue("test", "1"); logger.info("--> indexing with id [1], and routing [{}]", routingValue); - client().prepareIndex(indexOrAlias()).setId("1").setRouting(routingValue).setSource("field", "value1").get(); + prepareIndex(indexOrAlias()).setId("1").setRouting(routingValue).setSource("field", "value1").get(); logger.info("--> indexing with id [2], and routing [{}]", routingValue); - client().prepareIndex(indexOrAlias()) - .setId("2") + prepareIndex(indexOrAlias()).setId("2") .setRouting(routingValue) .setSource("field", "value2") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java index 1bcf2d8fb327..ecf839bff5e4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchTimeoutIT.java @@ -47,7 +47,7 @@ public class SearchTimeoutIT extends ESIntegTestCase { private void indexDocs() { for (int i = 0; i < 32; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); } refresh("test"); } @@ -90,7 +90,7 @@ public class SearchTimeoutIT extends ESIntegTestCase { } public void testPartialResultsIntolerantTimeout() throws Exception { - client().prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); ElasticsearchException ex = expectThrows( ElasticsearchException.class, diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java index 3202037c8486..51c1269b8767 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/SearchWithRejectionsIT.java @@ -36,7 +36,7 @@ public class SearchWithRejectionsIT extends ESIntegTestCase { ensureGreen("test"); final int docs = scaledRandomIntBetween(20, 50); for (int i = 0; i < docs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", "value").get(); } IndicesStatsResponse indicesStats = indicesAdmin().prepareStats().get(); assertThat(indicesStats.getTotal().getSearch().getOpenContexts(), equalTo(0L)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index eec815d6957a..c7aa4b317928 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -37,7 +37,7 @@ public class StressSearchServiceReaperIT extends ESIntegTestCase { int num = randomIntBetween(100, 150); IndexRequestBuilder[] builders = new IndexRequestBuilder[num]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setId("" + i).setSource("f", English.intToEnglish(i)); + builders[i] = prepareIndex("test").setId("" + i).setSource("f", English.intToEnglish(i)); } createIndex("test"); indexRandom(true, builders); 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 ac1817718737..df8f3825a5ea 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java @@ -31,7 +31,7 @@ public class AggregationsIntegrationIT extends ESIntegTestCase { numDocs = randomIntBetween(1, 20); List docs = new ArrayList<>(); for (int i = 0; i < numDocs; ++i) { - docs.add(client().prepareIndex("index").setSource("f", Integer.toString(i / 3))); + docs.add(prepareIndex("index").setSource("f", Integer.toString(i / 3))); } indexRandom(true, docs); } 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 8c110a298a1d..fc0a93ad3d29 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/CombiIT.java @@ -48,12 +48,13 @@ public class CombiIT extends ESIntegTestCase { String name = "name_" + randomIntBetween(1, 10); if (rarely()) { missingValues++; - builders[i] = client().prepareIndex("idx").setSource(jsonBuilder().startObject().field("name", name).endObject()); + builders[i] = prepareIndex("idx").setSource(jsonBuilder().startObject().field("name", name).endObject()); } else { int value = randomIntBetween(1, 10); values.put(value, values.getOrDefault(value, 0) + 1); - builders[i] = client().prepareIndex("idx") - .setSource(jsonBuilder().startObject().field("name", name).field("value", value).endObject()); + builders[i] = prepareIndex("idx").setSource( + jsonBuilder().startObject().field("name", name).field("value", value).endObject() + ); } } indexRandom(true, builders); 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 8b7ddcaf7ab2..f2aa79d115c4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/EquivalenceIT.java @@ -126,7 +126,7 @@ public class EquivalenceIT extends ESIntegTestCase { source = source.value(docs[i][j]); } source = source.endArray().endObject(); - client().prepareIndex("idx").setSource(source).get(); + prepareIndex("idx").setSource(source).get(); } assertNoFailures(indicesAdmin().prepareRefresh("idx").setIndicesOptions(IndicesOptions.lenientExpandOpen()).get()); @@ -250,7 +250,7 @@ public class EquivalenceIT extends ESIntegTestCase { source = source.value(Integer.toString(values[j])); } source = source.endArray().endObject(); - indexingRequests.add(client().prepareIndex("idx").setSource(source)); + indexingRequests.add(prepareIndex("idx").setSource(source)); } indexRandom(true, indexingRequests); @@ -353,7 +353,7 @@ public class EquivalenceIT extends ESIntegTestCase { source = source.value(randomFrom(values)); } source = source.endArray().endObject(); - client().prepareIndex("idx").setSource(source).get(); + prepareIndex("idx").setSource(source).get(); } assertNoFailures(indicesAdmin().prepareRefresh("idx").setIndicesOptions(IndicesOptions.lenientExpandOpen()).execute().get()); @@ -400,7 +400,7 @@ public class EquivalenceIT extends ESIntegTestCase { logger.info("Indexing [{}] docs", numDocs); List indexingRequests = new ArrayList<>(); for (int i = 0; i < numDocs; ++i) { - indexingRequests.add(client().prepareIndex("idx").setId(Integer.toString(i)).setSource("double_value", randomDouble())); + indexingRequests.add(prepareIndex("idx").setId(Integer.toString(i)).setSource("double_value", randomDouble())); } indexRandom(true, indexingRequests); @@ -421,7 +421,7 @@ public class EquivalenceIT extends ESIntegTestCase { public void testReduce() throws Exception { createIndex("idx"); final int value = randomIntBetween(0, 10); - indexRandom(true, client().prepareIndex("idx").setSource("f", value)); + indexRandom(true, prepareIndex("idx").setSource("f", value)); assertNoFailuresAndResponse( prepareSearch("idx").addAggregation( filter("filter", QueryBuilders.matchAllQuery()).subAggregation( @@ -480,7 +480,7 @@ public class EquivalenceIT extends ESIntegTestCase { final int v1 = randomInt(1 << randomInt(7)); final int v2 = randomInt(1 << randomInt(7)); final int v3 = randomInt(1 << randomInt(7)); - reqs.add(client().prepareIndex("idx").setSource("f1", v1, "f2", v2, "f3", v3)); + reqs.add(prepareIndex("idx").setSource("f1", v1, "f2", v2, "f3", v3)); } indexRandom(true, reqs); @@ -494,37 +494,34 @@ public class EquivalenceIT extends ESIntegTestCase { .subAggregation(terms("f3").field("f3").collectMode(SubAggCollectionMode.DEPTH_FIRST)) ) ), - response1 -> { - assertNoFailuresAndResponse( - 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)) - ) - ), - response2 -> { - - final Terms t1 = response1.getAggregations().get("f1"); - final Terms t2 = response2.getAggregations().get("f1"); - assertEquals(t1, t2); - for (Terms.Bucket b1 : t1.getBuckets()) { - final Terms.Bucket b2 = t2.getBucketByKey(b1.getKeyAsString()); - final Terms sub1 = b1.getAggregations().get("f2"); - final Terms sub2 = b2.getAggregations().get("f2"); - assertEquals(sub1, sub2); - for (Terms.Bucket subB1 : sub1.getBuckets()) { - final Terms.Bucket subB2 = sub2.getBucketByKey(subB1.getKeyAsString()); - final Terms subSub1 = subB1.getAggregations().get("f3"); - final Terms subSub2 = subB2.getAggregations().get("f3"); - assertEquals(subSub1, subSub2); - } + response1 -> assertNoFailuresAndResponse( + 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)) + ) + ), + response2 -> { + final Terms t1 = response1.getAggregations().get("f1"); + final Terms t2 = response2.getAggregations().get("f1"); + assertEquals(t1, t2); + for (Terms.Bucket b1 : t1.getBuckets()) { + final Terms.Bucket b2 = t2.getBucketByKey(b1.getKeyAsString()); + final Terms sub1 = b1.getAggregations().get("f2"); + final Terms sub2 = b2.getAggregations().get("f2"); + assertEquals(sub1, sub2); + for (Terms.Bucket subB1 : sub1.getBuckets()) { + final Terms.Bucket subB2 = sub2.getBucketByKey(subB1.getKeyAsString()); + final Terms subSub1 = subB1.getAggregations().get("f3"); + final Terms subSub2 = subB2.getAggregations().get("f3"); + assertEquals(subSub1, subSub2); } } - ); - } + } + ) ); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java index ce6a77408a5e..3568391279a7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/FiltersAggsRewriteIT.java @@ -29,9 +29,9 @@ public class FiltersAggsRewriteIT extends ESSingleNodeTestCase { public void testWrapperQueryIsRewritten() throws IOException { createIndex("test", Settings.EMPTY, "test", "title", "type=text"); - client().prepareIndex("test").setId("1").setSource("title", "foo bar baz").get(); - client().prepareIndex("test").setId("2").setSource("title", "foo foo foo").get(); - client().prepareIndex("test").setId("3").setSource("title", "bar baz bax").get(); + prepareIndex("test").setId("1").setSource("title", "foo bar baz").get(); + prepareIndex("test").setId("2").setSource("title", "foo foo foo").get(); + prepareIndex("test").setId("3").setSource("title", "bar baz bax").get(); client().admin().indices().prepareRefresh("test").get(); XContentType xContentType = randomFrom(XContentType.values()); 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 3775ba6025ec..f22e0a293163 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MetadataIT.java @@ -30,7 +30,7 @@ public class MetadataIT extends ESIntegTestCase { IndexRequestBuilder[] builders = new IndexRequestBuilder[randomInt(30)]; for (int i = 0; i < builders.length; i++) { String name = "name_" + randomIntBetween(1, 10); - builders[i] = client().prepareIndex("idx").setSource("name", name, "value", randomInt()); + builders[i] = prepareIndex("idx").setSource("name", name, "value", randomInt()); } indexRandom(true, builders); ensureSearchable(); 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 ba20e8623753..8110bc124132 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/MissingValueIT.java @@ -46,10 +46,8 @@ public class MissingValueIT extends ESIntegTestCase { assertAcked(prepareCreate("idx").setMapping("date", "type=date", "location", "type=geo_point", "str", "type=keyword").get()); indexRandom( true, - client().prepareIndex("idx").setId("1").setSource(), - client().prepareIndex("idx") - .setId("2") - .setSource("str", "foo", "long", 3L, "double", 5.5, "date", "2015-05-07", "location", "1,2") + prepareIndex("idx").setId("1").setSource(), + prepareIndex("idx").setId("2").setSource("str", "foo", "long", 3L, "double", 5.5, "date", "2015-05-07", "location", "1,2") ); } 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 ad1d4086c690..4a6859620563 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 @@ -60,13 +60,12 @@ public class BooleanTermsIT extends ESIntegTestCase { } default -> throw new AssertionError(); } - builders[i] = client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, singleValue) - .array(MULTI_VALUED_FIELD_NAME, multiValue) - .endObject() - ); + builders[i] = prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, singleValue) + .array(MULTI_VALUED_FIELD_NAME, multiValue) + .endObject() + ); } indexRandom(true, builders); } 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 e3242a561c2a..a9ff9f15a7e9 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 @@ -85,32 +85,30 @@ public class DateHistogramIT extends ESIntegTestCase { } private IndexRequestBuilder indexDoc(String idx, ZonedDateTime date, int value) throws Exception { - return client().prepareIndex(idx) - .setSource( - jsonBuilder().startObject() - .timeField("date", date) - .field("value", value) - .startArray("dates") - .timeValue(date) - .timeValue(date.plusMonths(1).plusDays(1)) - .endArray() - .endObject() - ); + return prepareIndex(idx).setSource( + jsonBuilder().startObject() + .timeField("date", date) + .field("value", value) + .startArray("dates") + .timeValue(date) + .timeValue(date.plusMonths(1).plusDays(1)) + .endArray() + .endObject() + ); } private IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception { - return client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("value", value) - .field("constant", 1) - .timeField("date", date(month, day)) - .startArray("dates") - .timeValue(date(month, day)) - .timeValue(date(month + 1, day + 1)) - .endArray() - .endObject() - ); + return prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("value", value) + .field("constant", 1) + .timeField("date", date(month, day)) + .startArray("dates") + .timeValue(date(month, day)) + .timeValue(date(month + 1, day + 1)) + .endArray() + .endObject() + ); } @Override @@ -121,9 +119,7 @@ public class DateHistogramIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } @@ -164,45 +160,55 @@ public class DateHistogramIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("sort_idx").setMapping("date", "type=date").get()); for (int i = 1; i <= 3; i++) { builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 1)).field("l", 1).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 1)).field("l", 1).field("d", i).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 2)).field("l", 2).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 2)).field("l", 2).field("d", i).endObject() + ) ); } builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 3)).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 3)).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 3).plusHours(1)).field("l", 3).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 3).plusHours(1)).field("l", 3).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 4)).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 4)).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 4).plusHours(2)).field("l", 3).field("d", 3).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 4).plusHours(2)).field("l", 3).field("d", 3).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 5)).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 5)).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 5).plusHours(12)).field("l", 5).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 5).plusHours(12)).field("l", 5).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 6)).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 6)).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 7)).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().timeField("date", date(1, 7)).field("l", 5).field("d", 1).endObject() + ) ); } @@ -990,9 +996,7 @@ public class DateHistogramIT extends ESIntegTestCase { IndexRequestBuilder[] reqs = new IndexRequestBuilder[5]; ZonedDateTime date = date("2014-03-11T00:00:00+00:00"); for (int i = 0; i < reqs.length; i++) { - reqs[i] = client().prepareIndex("idx2") - .setId("" + i) - .setSource(jsonBuilder().startObject().timeField("date", date).endObject()); + reqs[i] = prepareIndex("idx2").setId("" + i).setSource(jsonBuilder().startObject().timeField("date", date).endObject()); date = date.plusHours(1); } indexRandom(true, reqs); @@ -1267,9 +1271,7 @@ public class DateHistogramIT extends ESIntegTestCase { prepareCreate("idx2").setMapping(mappingJson).get(); IndexRequestBuilder[] reqs = new IndexRequestBuilder[5]; for (int i = 0; i < reqs.length; i++) { - reqs[i] = client().prepareIndex("idx2") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("date", "10-03-2014").endObject()); + reqs[i] = prepareIndex("idx2").setId("" + i).setSource(jsonBuilder().startObject().field("date", "10-03-2014").endObject()); } indexRandom(true, reqs); @@ -1340,8 +1342,8 @@ public class DateHistogramIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test9491").setMapping("d", "type=date").get()); indexRandom( true, - client().prepareIndex("test9491").setSource("d", "2014-10-08T13:00:00Z"), - client().prepareIndex("test9491").setSource("d", "2014-11-08T13:00:00Z") + prepareIndex("test9491").setSource("d", "2014-10-08T13:00:00Z"), + prepareIndex("test9491").setSource("d", "2014-11-08T13:00:00Z") ); ensureSearchable("test9491"); assertNoFailuresAndResponse( @@ -1364,9 +1366,9 @@ public class DateHistogramIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test8209").setMapping("d", "type=date").get()); indexRandom( true, - client().prepareIndex("test8209").setSource("d", "2014-01-01T00:00:00Z"), - client().prepareIndex("test8209").setSource("d", "2014-04-01T00:00:00Z"), - client().prepareIndex("test8209").setSource("d", "2014-04-30T00:00:00Z") + prepareIndex("test8209").setSource("d", "2014-01-01T00:00:00Z"), + prepareIndex("test8209").setSource("d", "2014-04-01T00:00:00Z"), + prepareIndex("test8209").setSource("d", "2014-04-30T00:00:00Z") ); ensureSearchable("test8209"); assertNoFailuresAndResponse( @@ -1404,7 +1406,7 @@ public class DateHistogramIT extends ESIntegTestCase { */ public void testFormatIndexUnmapped() throws InterruptedException, ExecutionException { String indexDateUnmapped = "test31760"; - indexRandom(true, client().prepareIndex(indexDateUnmapped).setSource("foo", "bar")); + indexRandom(true, prepareIndex(indexDateUnmapped).setSource("foo", "bar")); ensureSearchable(indexDateUnmapped); assertNoFailuresAndResponse( @@ -1433,7 +1435,7 @@ public class DateHistogramIT extends ESIntegTestCase { public void testRewriteTimeZone_EpochMillisFormat() throws InterruptedException, ExecutionException { String index = "test31392"; assertAcked(indicesAdmin().prepareCreate(index).setMapping("d", "type=date,format=epoch_millis").get()); - indexRandom(true, client().prepareIndex(index).setSource("d", "1477954800000")); + indexRandom(true, prepareIndex(index).setSource("d", "1477954800000")); ensureSearchable(index); assertNoFailuresAndResponse( prepareSearch(index).addAggregation( @@ -1554,8 +1556,8 @@ public class DateHistogramIT extends ESIntegTestCase { String date2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format(date(2, 1)); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("d", date), - client().prepareIndex("cache_test_idx").setId("2").setSource("d", date2) + prepareIndex("cache_test_idx").setId("1").setSource("d", date), + prepareIndex("cache_test_idx").setId("2").setSource("d", date2) ); // Make sure we are starting with a clear cache @@ -1707,8 +1709,8 @@ public class DateHistogramIT extends ESIntegTestCase { */ public void testDateNanosHistogram() throws Exception { assertAcked(prepareCreate("nanos").setMapping("date", "type=date_nanos").get()); - indexRandom(true, client().prepareIndex("nanos").setId("1").setSource("date", "2000-01-01")); - indexRandom(true, client().prepareIndex("nanos").setId("2").setSource("date", "2000-01-02")); + indexRandom(true, prepareIndex("nanos").setId("1").setSource("date", "2000-01-01")); + indexRandom(true, prepareIndex("nanos").setId("2").setSource("date", "2000-01-02")); // Search interval 24 hours assertNoFailuresAndResponse( 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 c3a1209c7d3b..5abf52cf37f8 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 @@ -61,8 +61,7 @@ public class DateHistogramOffsetIT extends ESIntegTestCase { IndexRequestBuilder[] reqs = new IndexRequestBuilder[numHours]; for (int i = idxIdStart; i < idxIdStart + reqs.length; i++) { - reqs[i - idxIdStart] = client().prepareIndex("idx2") - .setId("" + i) + reqs[i - idxIdStart] = prepareIndex("idx2").setId("" + i) .setSource(jsonBuilder().startObject().timeField("date", date).endObject()); date = date.plusHours(stepSizeHours); } 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 e7acc10e98f5..0a726fcec5a8 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 @@ -55,17 +55,16 @@ import static org.hamcrest.core.IsNull.nullValue; public class DateRangeIT extends ESIntegTestCase { private static IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception { - return client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("value", value) - .timeField("date", date(month, day)) - .startArray("dates") - .timeValue(date(month, day)) - .timeValue(date(month + 1, day + 1)) - .endArray() - .endObject() - ); + return prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("value", value) + .timeField("date", date(month, day)) + .startArray("dates") + .timeValue(date(month, day)) + .timeValue(date(month + 1, day + 1)) + .endArray() + .endObject() + ); } private static ZonedDateTime date(int month, int day) { @@ -104,9 +103,7 @@ public class DateRangeIT extends ESIntegTestCase { assertAcked(prepareCreate("empty_bucket_idx").setMapping("value", "type=integer")); for (int i = 0; i < 2; i++) { docs.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } indexRandom(true, docs); @@ -623,12 +620,8 @@ public class DateRangeIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx") - .setId("1") - .setSource(jsonBuilder().startObject().timeField("date", date(1, 1)).endObject()), - client().prepareIndex("cache_test_idx") - .setId("2") - .setSource(jsonBuilder().startObject().timeField("date", date(2, 1)).endObject()) + prepareIndex("cache_test_idx").setId("1").setSource(jsonBuilder().startObject().timeField("date", date(1, 1)).endObject()), + prepareIndex("cache_test_idx").setId("2").setSource(jsonBuilder().startObject().timeField("date", date(2, 1)).endObject()) ); // Make sure we are starting with a clear cache @@ -718,9 +711,9 @@ public class DateRangeIT extends ESIntegTestCase { assertAcked(prepareCreate(indexName).setMapping("date", "type=date,format=strict_hour_minute_second")); indexRandom( true, - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("date", "00:16:40").endObject()), - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("date", "00:33:20").endObject()), - client().prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("date", "00:50:00").endObject()) + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("date", "00:16:40").endObject()), + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("date", "00:33:20").endObject()), + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("date", "00:50:00").endObject()) ); // using no format should work when to/from is compatible with format in @@ -785,9 +778,9 @@ public class DateRangeIT extends ESIntegTestCase { assertAcked(prepareCreate(indexName).setMapping("date", "type=date,format=epoch_second")); indexRandom( true, - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("date", 1002).endObject()), - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("date", 2000).endObject()), - client().prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("date", 3008).endObject()) + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("date", 1002).endObject()), + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("date", 2000).endObject()), + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("date", 3008).endObject()) ); // using no format should work when to/from is compatible with format in 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 a4ee100fa754..3a313cec2940 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 @@ -77,12 +77,10 @@ public class DiversifiedSamplerIT extends ESIntegTestCase { for (int i = 0; i < data.length; i++) { String[] parts = data[i].split(","); - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) .setSource("author", parts[5], "name", parts[2], "genre", parts[8], "price", Float.parseFloat(parts[3])) .get(); - client().prepareIndex("idx_unmapped_author") - .setId("" + i) + prepareIndex("idx_unmapped_author").setId("" + i) .setSource("name", parts[2], "genre", parts[8], "price", Float.parseFloat(parts[3])) .get(); } 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 2477d61b9e60..1500c203ea4d 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 @@ -115,33 +115,31 @@ public class DoubleTermsIT extends AbstractTermsTestCase { List builders = new ArrayList<>(); for (int i = 0; i < NUM_DOCS; i++) { builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, (double) i) - .field("num_tag", i < NUM_DOCS / 2 + 1 ? 1.0 : 0.0) // used to test order by single-bucket sub agg - .field("constant", 1) - .startArray(MULTI_VALUED_FIELD_NAME) - .value((double) i) - .value(i + 1d) - .endArray() - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, (double) i) + .field("num_tag", i < NUM_DOCS / 2 + 1 ? 1.0 : 0.0) // used to test order by single-bucket sub agg + .field("constant", 1) + .startArray(MULTI_VALUED_FIELD_NAME) + .value((double) i) + .value(i + 1d) + .endArray() + .endObject() + ) ); } for (int i = 0; i < 100; i++) { builders.add( - client().prepareIndex("high_card_idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, (double) i) - .startArray(MULTI_VALUED_FIELD_NAME) - .value((double) i) - .value(i + 1d) - .endArray() - .endObject() - ) + prepareIndex("high_card_idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, (double) i) + .startArray(MULTI_VALUED_FIELD_NAME) + .value((double) i) + .value(i + 1d) + .endArray() + .endObject() + ) ); } @@ -149,8 +147,7 @@ public class DoubleTermsIT extends AbstractTermsTestCase { assertAcked(prepareCreate("empty_bucket_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=integer")); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i * 2).endObject()) ); } @@ -209,45 +206,55 @@ public class DoubleTermsIT extends AbstractTermsTestCase { assertAcked(prepareCreate("sort_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=double")); for (int i = 1; i <= 3; i++) { builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject() + ) ); } builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 3).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 3).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject() + ) ); } @@ -944,8 +951,8 @@ public class DoubleTermsIT extends AbstractTermsTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1.5), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2.5) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1.5), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2.5) ); // Make sure we are starting with a clear cache 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 b2098aee48b1..b5dea9cbbba4 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 @@ -48,8 +48,7 @@ public class FilterIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < numTag1Docs; i++) { builders.add( - client().prepareIndex("idx") - .setId("" + i) + prepareIndex("idx").setId("" + i) .setSource(jsonBuilder().startObject().field("value", i + 1).field("tag", "tag1").endObject()) ); } @@ -59,18 +58,16 @@ public class FilterIT extends ESIntegTestCase { .field("tag", "tag2") .field("name", "name" + i) .endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { // randomly index the document twice so that we have deleted docs that match the filter - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } prepareCreate("empty_bucket_idx").setMapping("value", "type=integer").get(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } indexRandom(true, builders); 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 664644a3a263..b04cb5325a82 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 @@ -55,10 +55,10 @@ public class FiltersIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < numTag1Docs; i++) { XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).field("tag", "tag1").endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { // randomly index the document twice so that we have deleted docs that match the filter - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } for (int i = numTag1Docs; i < (numTag1Docs + numTag2Docs); i++) { @@ -67,9 +67,9 @@ public class FiltersIT extends ESIntegTestCase { .field("tag", "tag2") .field("name", "name" + i) .endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } for (int i = numTag1Docs + numTag2Docs; i < numDocs; i++) { @@ -79,17 +79,15 @@ public class FiltersIT extends ESIntegTestCase { .field("tag", "tag3") .field("name", "name" + i) .endObject(); - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); if (randomBoolean()) { - builders.add(client().prepareIndex("idx").setId("" + i).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i).setSource(source)); } } prepareCreate("empty_bucket_idx").setMapping("value", "type=integer").get(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } indexRandom(true, builders); 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 bb895c2564d3..0ed83f73e418 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 @@ -65,7 +65,7 @@ public class GeoDistanceIT extends ESIntegTestCase { } source.endArray(); source = source.endObject(); - return client().prepareIndex(idx).setSource(source); + return prepareIndex(idx).setSource(source); } @Override @@ -120,8 +120,7 @@ public class GeoDistanceIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource(jsonBuilder().startObject().field("value", i * 2).field("location", "52.0945, 5.116").endObject()) ); } 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 dcb56eeb1038..57b11df3b7d3 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 @@ -62,7 +62,7 @@ public class GeoHashGridIT extends ESIntegTestCase { source = source.field("location", latLon); } source = source.endObject(); - return client().prepareIndex(index).setSource(source); + return prepareIndex(index).setSource(source); } private static IndexRequestBuilder indexCity(String index, String name, String latLon) throws Exception { 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 3ed86b2efc03..abe93597f02b 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 @@ -40,15 +40,13 @@ public class GlobalIT extends ESIntegTestCase { numDocs = randomIntBetween(3, 20); for (int i = 0; i < numDocs / 2; i++) { builders.add( - client().prepareIndex("idx") - .setId("" + i + 1) + prepareIndex("idx").setId("" + i + 1) .setSource(jsonBuilder().startObject().field("value", i + 1).field("tag", "tag1").endObject()) ); } for (int i = numDocs / 2; i < numDocs; i++) { builders.add( - client().prepareIndex("idx") - .setId("" + i + 1) + prepareIndex("idx").setId("" + i + 1) .setSource( jsonBuilder().startObject().field("value", i + 1).field("tag", "tag2").field("name", "name" + i + 1).endObject() ) 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 0c65c92c71da..e5d13627e1da 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 @@ -140,18 +140,17 @@ public class HistogramIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, i + 1) - .startArray(MULTI_VALUED_FIELD_NAME) - .value(i + 1) - .value(i + 2) - .endArray() - .field("tag", "tag" + i) - .field("constant", 1) - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, i + 1) + .startArray(MULTI_VALUED_FIELD_NAME) + .value(i + 1) + .value(i + 2) + .endArray() + .field("tag", "tag" + i) + .field("constant", 1) + .endObject() + ) ); } @@ -160,8 +159,7 @@ public class HistogramIT extends ESIntegTestCase { assertAcked(prepareCreate("empty_bucket_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=integer")); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i * 2).endObject()) ); } @@ -191,45 +189,55 @@ public class HistogramIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("sort_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=double").get()); for (int i = 1; i <= 3; i++) { builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject() + ) ); } builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3.8).field("l", 3).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3.8).field("l", 3).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4.4).field("l", 3).field("d", 3).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4.4).field("l", 3).field("d", 3).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5.1).field("l", 5).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5.1).field("l", 5).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject() + ) ); } @@ -1082,8 +1090,8 @@ public class HistogramIT extends ESIntegTestCase { assertAcked(prepareCreate("decimal_values").setMapping("d", "type=float").get()); indexRandom( true, - client().prepareIndex("decimal_values").setId("1").setSource("d", -0.6), - client().prepareIndex("decimal_values").setId("2").setSource("d", 0.1) + prepareIndex("decimal_values").setId("1").setSource("d", -0.6), + prepareIndex("decimal_values").setId("2").setSource("d", 0.1) ); assertNoFailuresAndResponse( @@ -1111,8 +1119,8 @@ public class HistogramIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("d", -0.6), - client().prepareIndex("cache_test_idx").setId("2").setSource("d", 0.1) + prepareIndex("cache_test_idx").setId("1").setSource("d", -0.6), + prepareIndex("cache_test_idx").setId("2").setSource("d", 0.1) ); // Make sure we are starting with a clear cache @@ -1242,9 +1250,9 @@ public class HistogramIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("d", "type=double").get()); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("d", -0.6), - client().prepareIndex("test").setId("2").setSource("d", 0.5), - client().prepareIndex("test").setId("3").setSource("d", 0.1) + prepareIndex("test").setId("1").setSource("d", -0.6), + prepareIndex("test").setId("2").setSource("d", 0.5), + prepareIndex("test").setId("3").setSource("d", 0.1) ); assertNoFailuresAndResponse( 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 449d0626ade3..887afdb578fd 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 @@ -50,10 +50,9 @@ public class IpRangeIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("idx").setId("1").setSource("ip", "192.168.1.7", "ips", Arrays.asList("192.168.0.13", "192.168.1.2")), - client().prepareIndex("idx").setId("2").setSource("ip", "192.168.1.10", "ips", Arrays.asList("192.168.1.25", "192.168.1.28")), - client().prepareIndex("idx") - .setId("3") + prepareIndex("idx").setId("1").setSource("ip", "192.168.1.7", "ips", Arrays.asList("192.168.0.13", "192.168.1.2")), + prepareIndex("idx").setId("2").setSource("ip", "192.168.1.10", "ips", Arrays.asList("192.168.1.25", "192.168.1.28")), + prepareIndex("idx").setId("3") .setSource("ip", "2001:db8::ff00:42:8329", "ips", Arrays.asList("2001:db8::ff00:42:8329", "2001:db8::ff00:42:8380")) ); 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 91702bd6d815..7f9cb01599a0 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 @@ -54,9 +54,9 @@ public class IpTermsIT extends AbstractTermsTestCase { assertAcked(prepareCreate("index").setMapping("ip", "type=ip")); indexRandom( true, - client().prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("3").setSource("ip", "2001:db8::2:1") + prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("3").setSource("ip", "2001:db8::2:1") ); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['ip'].value", Collections.emptyMap()); @@ -85,9 +85,9 @@ public class IpTermsIT extends AbstractTermsTestCase { assertAcked(prepareCreate("index").setMapping("ip", "type=ip")); indexRandom( true, - client().prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("3").setSource("ip", "2001:db8::2:1") + prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("3").setSource("ip", "2001:db8::2:1") ); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "doc['ip']", Collections.emptyMap()); @@ -116,10 +116,10 @@ public class IpTermsIT extends AbstractTermsTestCase { assertAcked(prepareCreate("index").setMapping("ip", "type=ip")); indexRandom( true, - client().prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), - client().prepareIndex("index").setId("3").setSource("ip", "127.0.0.1"), - client().prepareIndex("index").setId("4").setSource("not_ip", "something") + prepareIndex("index").setId("1").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("2").setSource("ip", "192.168.1.7"), + prepareIndex("index").setId("3").setSource("ip", "127.0.0.1"), + prepareIndex("index").setId("4").setSource("not_ip", "something") ); assertNoFailuresAndResponse( prepareSearch("index").addAggregation( 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 e73404717230..f0c5cbf9c76b 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 @@ -102,32 +102,30 @@ public class LongTermsIT extends AbstractTermsTestCase { createIndex("idx", "high_card_idx"); IndexRequestBuilder[] lowCardBuilders = new IndexRequestBuilder[NUM_DOCS]; for (int i = 0; i < lowCardBuilders.length; i++) { - lowCardBuilders[i] = client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, i) - .startArray(MULTI_VALUED_FIELD_NAME) - .value(i) - .value(i + 1) - .endArray() - .field("num_tag", i < lowCardBuilders.length / 2 + 1 ? 1 : 0) // used to test order by single-bucket sub agg - .field("constant", 1) - .endObject() - ); + lowCardBuilders[i] = prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, i) + .startArray(MULTI_VALUED_FIELD_NAME) + .value(i) + .value(i + 1) + .endArray() + .field("num_tag", i < lowCardBuilders.length / 2 + 1 ? 1 : 0) // used to test order by single-bucket sub agg + .field("constant", 1) + .endObject() + ); } indexRandom(true, lowCardBuilders); IndexRequestBuilder[] highCardBuilders = new IndexRequestBuilder[100]; // TODO randomize the size? for (int i = 0; i < highCardBuilders.length; i++) { - highCardBuilders[i] = client().prepareIndex("high_card_idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, i) - .startArray(MULTI_VALUED_FIELD_NAME) - .value(i) - .value(i + 1) - .endArray() - .endObject() - ); + highCardBuilders[i] = prepareIndex("high_card_idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, i) + .startArray(MULTI_VALUED_FIELD_NAME) + .value(i) + .value(i + 1) + .endArray() + .endObject() + ); } indexRandom(true, highCardBuilders); @@ -137,8 +135,7 @@ public class LongTermsIT extends AbstractTermsTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i * 2).endObject()) ); } @@ -197,45 +194,55 @@ public class LongTermsIT extends AbstractTermsTestCase { createIndex("sort_idx"); for (int i = 1; i <= 3; i++) { builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 1).field("l", 1).field("d", i).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 2).field("l", 2).field("d", i).endObject() + ) ); } builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 3).field("l", 3).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 3).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 4).field("l", 3).field("d", 3).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 5).field("l", 5).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 6).field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, 7).field("l", 5).field("d", 1).endObject() + ) ); } @@ -897,8 +904,8 @@ public class LongTermsIT extends AbstractTermsTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 6404b0636596..4e93bf578cc8 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 @@ -113,16 +113,15 @@ public class MinDocCountIT extends AbstractTermsTestCase { final int frequency = randomBoolean() ? 1 : randomIntBetween(2, 20); for (int j = 0; j < frequency; ++j) { indexRequests.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("s", stringTerm) - .field("l", longTerm) - .field("d", doubleTerm) - .field("date", dateTerm) - .field("match", randomBoolean()) - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("s", stringTerm) + .field("l", longTerm) + .field("d", doubleTerm) + .field("date", dateTerm) + .field("match", randomBoolean()) + .endObject() + ) ); } } 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 23908daf3260..e6d0b6a1f9f1 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 @@ -113,7 +113,7 @@ public class NaNSortingIT extends ESIntegTestCase { if (randomBoolean()) { source.field("numeric_value", randomDouble()); } - client().prepareIndex("idx").setSource(source.endObject()).get(); + prepareIndex("idx").setSource(source.endObject()).get(); } refresh(); ensureSearchable(); 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 d832d7060ffd..9a27b0d8f75a 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 @@ -91,15 +91,14 @@ public class NestedIT extends ESIntegTestCase { source = source.startObject().field("value", i + 1 + j).endObject(); } source = source.endArray().endObject(); - builders.add(client().prepareIndex("idx").setId("" + i + 1).setSource(source)); + builders.add(prepareIndex("idx").setId("" + i + 1).setSource(source)); } prepareCreate("empty_bucket_idx").setMapping("value", "type=integer", "nested", "type=nested").get(); ensureGreen("empty_bucket_idx"); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource( jsonBuilder().startObject() .field("value", i * 2) @@ -146,8 +145,7 @@ public class NestedIT extends ESIntegTestCase { ensureGreen("idx_nested_nested_aggs"); builders.add( - client().prepareIndex("idx_nested_nested_aggs") - .setId("1") + prepareIndex("idx_nested_nested_aggs").setId("1") .setSource( jsonBuilder().startObject() .startArray("nested1") @@ -431,7 +429,7 @@ public class NestedIT extends ESIntegTestCase { ensureGreen("idx2"); List indexRequests = new ArrayList<>(2); - indexRequests.add(client().prepareIndex("idx2").setId("1").setSource(""" + indexRequests.add(prepareIndex("idx2").setId("1").setSource(""" { "dates": { "month": { @@ -453,7 +451,7 @@ public class NestedIT extends ESIntegTestCase { } ] }""", XContentType.JSON)); - indexRequests.add(client().prepareIndex("idx2").setId("2").setSource(""" + indexRequests.add(prepareIndex("idx2").setId("2").setSource(""" { "dates": { "month": { @@ -545,8 +543,7 @@ public class NestedIT extends ESIntegTestCase { ); ensureGreen("idx4"); - client().prepareIndex("idx4") - .setId("1") + prepareIndex("idx4").setId("1") .setSource( jsonBuilder().startObject() .field("name", "product1") @@ -565,8 +562,7 @@ public class NestedIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("idx4") - .setId("2") + prepareIndex("idx4").setId("2") .setSource( jsonBuilder().startObject() .field("name", "product2") @@ -682,8 +678,7 @@ public class NestedIT extends ESIntegTestCase { ) ); - client().prepareIndex("classes") - .setId("1") + prepareIndex("classes").setId("1") .setSource( jsonBuilder().startObject() .field("name", "QueryBuilder") @@ -722,8 +717,7 @@ public class NestedIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("classes") - .setId("2") + prepareIndex("classes").setId("2") .setSource( jsonBuilder().startObject() .field("name", "Document") 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 32496434d32d..28c186c559df 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 @@ -60,14 +60,13 @@ public class RandomSamplerIT extends ESIntegTestCase { numericValue = randomDoubleBetween(5.0, 9.0, false); } builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(KEYWORD_VALUE, keywordValue) - .field(MONOTONIC_VALUE, monotonicValue) - .field(NUMERIC_VALUE, numericValue) - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(KEYWORD_VALUE, keywordValue) + .field(MONOTONIC_VALUE, monotonicValue) + .field(NUMERIC_VALUE, numericValue) + .endObject() + ) ); final double oldAvgMonotonic = avgMonotonic; 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 441187916cb7..10e3649e9f16 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 @@ -91,24 +91,22 @@ public class RangeIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, i + 1) - .startArray(MULTI_VALUED_FIELD_NAME) - .value(i + 1) - .value(i + 2) - .endArray() - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, i + 1) + .startArray(MULTI_VALUED_FIELD_NAME) + .value(i + 1) + .value(i + 2) + .endArray() + .endObject() + ) ); } createIndex("idx_unmapped"); prepareCreate("empty_bucket_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=integer").get(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource( jsonBuilder().startObject() // shift sequence by 1, to ensure we have negative values, and value 3 on the edge of the tested ranges @@ -123,10 +121,10 @@ public class RangeIT extends ESIntegTestCase { prepareCreate("old_index").setMapping("distance", "type=double", "route_length_miles", "type=alias,path=distance").get(); prepareCreate("new_index").setMapping("route_length_miles", "type=double").get(); - builders.add(client().prepareIndex("old_index").setSource("distance", 42.0)); - builders.add(client().prepareIndex("old_index").setSource("distance", 50.5)); - builders.add(client().prepareIndex("new_index").setSource("route_length_miles", 100.2)); - builders.add(client().prepareIndex("new_index").setSource(Collections.emptyMap())); + builders.add(prepareIndex("old_index").setSource("distance", 42.0)); + builders.add(prepareIndex("old_index").setSource("distance", 50.5)); + builders.add(prepareIndex("new_index").setSource("route_length_miles", 100.2)); + builders.add(prepareIndex("new_index").setSource(Collections.emptyMap())); indexRandom(true, builders); ensureSearchable(); @@ -902,8 +900,8 @@ public class RangeIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource(jsonBuilder().startObject().field("i", 1).endObject()), - client().prepareIndex("cache_test_idx").setId("2").setSource(jsonBuilder().startObject().field("i", 2).endObject()) + prepareIndex("cache_test_idx").setId("1").setSource(jsonBuilder().startObject().field("i", 1).endObject()), + prepareIndex("cache_test_idx").setId("2").setSource(jsonBuilder().startObject().field("i", 2).endObject()) ); // Make sure we are starting with a clear cache 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 5f42eb3b2ab1..7585ed42da83 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 @@ -125,7 +125,7 @@ public class ReverseNestedIT extends ESIntegTestCase { source.startObject().field("field2", value1).endObject(); } source.endArray().endObject(); - indexRandom(false, client().prepareIndex("idx1").setRouting("1").setSource(source)); + indexRandom(false, prepareIndex("idx1").setRouting("1").setSource(source)); } private void insertIdx2(String[][] values) throws Exception { @@ -138,7 +138,7 @@ public class ReverseNestedIT extends ESIntegTestCase { source.endArray().endObject(); } source.endArray().endObject(); - indexRandom(false, client().prepareIndex("idx2").setRouting("1").setSource(source)); + indexRandom(false, prepareIndex("idx2").setRouting("1").setSource(source)); } public void testSimpleReverseNestedToRoot() throws Exception { @@ -535,8 +535,7 @@ public class ReverseNestedIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("idx3").setSettings(indexSettings(1, 0)).setMapping(mapping)); - client().prepareIndex("idx3") - .setId("1") + prepareIndex("idx3").setId("1") .setRefreshPolicy(IMMEDIATE) .setSource( jsonBuilder().startObject() 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 c367752cc046..7f46856cdd59 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 @@ -75,12 +75,10 @@ public class SamplerIT extends ESIntegTestCase { for (int i = 0; i < data.length; i++) { String[] parts = data[i].split(","); - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) .setSource("author", parts[5], "name", parts[2], "genre", parts[8], "price", Float.parseFloat(parts[3])) .get(); - client().prepareIndex("idx_unmapped_author") - .setId("" + i) + prepareIndex("idx_unmapped_author").setId("" + i) .setSource("name", parts[2], "genre", parts[8], "price", Float.parseFloat(parts[3])) .get(); } 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 5b9aead6b9e0..94db8926f59e 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 @@ -49,21 +49,20 @@ import static org.hamcrest.Matchers.equalTo; public class ShardReduceIT extends ESIntegTestCase { private IndexRequestBuilder indexDoc(String date, int value) throws Exception { - return client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("value", value) - .field("ip", "10.0.0." + value) - .field("location", Geohash.stringEncode(5, 52, Geohash.PRECISION)) - .field("date", date) - .field("term-l", 1) - .field("term-d", 1.5) - .field("term-s", "term") - .startObject("nested") - .field("date", date) - .endObject() - .endObject() - ); + return prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("value", value) + .field("ip", "10.0.0." + value) + .field("location", Geohash.stringEncode(5, 52, Geohash.PRECISION)) + .field("date", date) + .field("term-l", 1) + .field("term-d", 1.5) + .field("term-s", "term") + .startObject("nested") + .field("date", date) + .endObject() + .endObject() + ); } @Override 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 40336ad61537..b672325891b5 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 @@ -208,10 +208,10 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { String[] cat2v1 = { "constant", "two" }; String[] cat2v2 = { "constant", "duo" }; List indexRequestBuilderList = new ArrayList<>(); - indexRequestBuilderList.add(client().prepareIndex(INDEX_NAME).setId("1").setSource(TEXT_FIELD, cat1v1, CLASS_FIELD, "1")); - indexRequestBuilderList.add(client().prepareIndex(INDEX_NAME).setId("2").setSource(TEXT_FIELD, cat1v2, CLASS_FIELD, "1")); - indexRequestBuilderList.add(client().prepareIndex(INDEX_NAME).setId("3").setSource(TEXT_FIELD, cat2v1, CLASS_FIELD, "2")); - indexRequestBuilderList.add(client().prepareIndex(INDEX_NAME).setId("4").setSource(TEXT_FIELD, cat2v2, CLASS_FIELD, "2")); + indexRequestBuilderList.add(prepareIndex(INDEX_NAME).setId("1").setSource(TEXT_FIELD, cat1v1, CLASS_FIELD, "1")); + indexRequestBuilderList.add(prepareIndex(INDEX_NAME).setId("2").setSource(TEXT_FIELD, cat1v2, CLASS_FIELD, "1")); + indexRequestBuilderList.add(prepareIndex(INDEX_NAME).setId("3").setSource(TEXT_FIELD, cat2v1, CLASS_FIELD, "2")); + indexRequestBuilderList.add(prepareIndex(INDEX_NAME).setId("4").setSource(TEXT_FIELD, cat2v2, CLASS_FIELD, "2")); indexRandom(true, false, indexRequestBuilderList); // Now create some holes in the index with selective deletes caused by updates. @@ -222,7 +222,7 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { indexRequestBuilderList.clear(); for (int i = 0; i < 50; i++) { text = text == cat1v2 ? cat1v1 : cat1v2; - indexRequestBuilderList.add(client().prepareIndex(INDEX_NAME).setId("1").setSource(TEXT_FIELD, text, CLASS_FIELD, "1")); + indexRequestBuilderList.add(prepareIndex(INDEX_NAME).setId("1").setSource(TEXT_FIELD, text, CLASS_FIELD, "1")); } indexRandom(true, false, indexRequestBuilderList); @@ -457,7 +457,7 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 0; i < data.length; i++) { String[] parts = data[i].split("\t"); - indexRequestBuilders.add(client().prepareIndex("test").setId("" + i).setSource("class", parts[0], "text", parts[1])); + indexRequestBuilders.add(prepareIndex("test").setId("" + i).setSource("class", parts[0], "text", parts[1])); } indexRandom(true, false, indexRequestBuilders); } @@ -533,7 +533,7 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { text[0] = gb[randNum]; } indexRequestBuilderList.add( - client().prepareIndex(INDEX_NAME).setSource(TEXT_FIELD, text, CLASS_FIELD, randomBoolean() ? "one" : "zero") + prepareIndex(INDEX_NAME).setSource(TEXT_FIELD, text, CLASS_FIELD, randomBoolean() ? "one" : "zero") ); } indexRandom(true, indexRequestBuilderList); @@ -554,8 +554,8 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1, "t", "foo"), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2, "t", "bar") + prepareIndex("cache_test_idx").setId("1").setSource("s", 1, "t", "foo"), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2, "t", "bar") ); // Make sure we are starting with a clear cache 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 84740d148f10..25d6dfb850bb 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 @@ -57,8 +57,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { int numUniqueTerms = between(2, numDocs / 2); for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx") - .setId("" + i) + prepareIndex("idx").setId("" + i) .setSource( jsonBuilder().startObject() .field(STRING_FIELD_NAME, "val" + randomInt(numUniqueTerms)) @@ -74,8 +73,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { ); for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx_single_shard") - .setId("" + i) + prepareIndex("idx_single_shard").setId("" + i) .setSource( jsonBuilder().startObject() .field(STRING_FIELD_NAME, "val" + randomInt(numUniqueTerms)) @@ -89,8 +87,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { assertAcked(prepareCreate("idx_with_routing").setMapping("{ \"_routing\" : { \"required\" : true } }")); for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx_single_shard") - .setId("" + i) + prepareIndex("idx_single_shard").setId("" + i) .setRouting(String.valueOf(randomInt(numRoutingValues))) .setSource( jsonBuilder().startObject() @@ -162,8 +159,7 @@ public class TermsDocCountErrorIT extends ESIntegTestCase { for (int i = 0; i < entry.getValue(); i++) { String term = entry.getKey(); builders.add( - client().prepareIndex(index) - .setId(term + "-" + i) + prepareIndex(index).setId(term + "-" + i) .setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, term).field("shard", shard).endObject()) ); } 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 2a09e5f90f19..c8e23d65b4e3 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 @@ -102,10 +102,10 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { String sourceClass = "{\"text\": \"" + term + "\", \"class\":" + "true" + "}"; String sourceNotClass = "{\"text\": \"" + term + "\", \"class\":" + "false" + "}"; for (int i = 0; i < numInClass; i++) { - builders.add(client().prepareIndex(index).setSource(sourceClass, XContentType.JSON)); + builders.add(prepareIndex(index).setSource(sourceClass, XContentType.JSON)); } for (int i = 0; i < numNotInClass; i++) { - builders.add(client().prepareIndex(index).setSource(sourceNotClass, XContentType.JSON)); + builders.add(prepareIndex(index).setSource(sourceNotClass, XContentType.JSON)); } } @@ -164,7 +164,7 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { private static void addTermsDocs(String term, int numDocs, List builders) { String sourceClass = "{\"text\": \"" + term + "\"}"; for (int i = 0; i < numDocs; i++) { - builders.add(client().prepareIndex(index).setSource(sourceClass, XContentType.JSON)); + builders.add(prepareIndex(index).setSource(sourceClass, XContentType.JSON)); } } } 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 b7134f3a0f9a..2277f4415d4d 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 @@ -126,19 +126,18 @@ public class StringTermsIT extends AbstractTermsTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 5; i++) { builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, "val" + i) - .field("i", i) - .field("constant", 1) - .field("tag", i < 5 / 2 + 1 ? "more" : "less") - .startArray(MULTI_VALUED_FIELD_NAME) - .value("val" + i) - .value("val" + (i + 1)) - .endArray() - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, "val" + i) + .field("i", i) + .field("constant", 1) + .field("tag", i < 5 / 2 + 1 ? "more" : "less") + .startArray(MULTI_VALUED_FIELD_NAME) + .value("val" + i) + .value("val" + (i + 1)) + .endArray() + .endObject() + ) ); } @@ -150,24 +149,22 @@ public class StringTermsIT extends AbstractTermsTestCase { ); for (int i = 0; i < 100; i++) { builders.add( - client().prepareIndex("high_card_idx") - .setSource( - jsonBuilder().startObject() - .field(SINGLE_VALUED_FIELD_NAME, "val" + Strings.padStart(i + "", 3, '0')) - .startArray(MULTI_VALUED_FIELD_NAME) - .value("val" + Strings.padStart(i + "", 3, '0')) - .value("val" + Strings.padStart((i + 1) + "", 3, '0')) - .endArray() - .endObject() - ) + prepareIndex("high_card_idx").setSource( + jsonBuilder().startObject() + .field(SINGLE_VALUED_FIELD_NAME, "val" + Strings.padStart(i + "", 3, '0')) + .startArray(MULTI_VALUED_FIELD_NAME) + .value("val" + Strings.padStart(i + "", 3, '0')) + .value("val" + Strings.padStart((i + 1) + "", 3, '0')) + .endArray() + .endObject() + ) ); } prepareCreate("empty_bucket_idx").setMapping(SINGLE_VALUED_FIELD_NAME, "type=integer").get(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) + prepareIndex("empty_bucket_idx").setId("" + i) .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i * 2).endObject()) ); } @@ -227,45 +224,55 @@ public class StringTermsIT extends AbstractTermsTestCase { ); for (int i = 1; i <= 3; i++) { builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val1").field("l", 1).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val1").field("l", 1).field("d", i).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val2").field("l", 2).field("d", i).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val2").field("l", 2).field("d", i).endObject() + ) ); } builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val3").field("l", 3).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 3).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val4").field("l", 3).field("d", 3).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 2).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val5").field("l", 5).field("d", 2).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val6").field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val6").field("l", 5).field("d", 1).endObject() + ) ); builders.add( - client().prepareIndex("sort_idx") - .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val7").field("l", 5).field("d", 1).endObject()) + prepareIndex("sort_idx").setSource( + jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, "val7").field("l", 5).field("d", 1).endObject() + ) ); } @@ -1185,8 +1192,8 @@ public class StringTermsIT extends AbstractTermsTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", "foo"), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", "bar") + prepareIndex("cache_test_idx").setId("1").setSource("s", "foo"), + prepareIndex("cache_test_idx").setId("2").setSource("s", "bar") ); // Make sure we are starting with a clear cache 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 44361587dd09..8b1fa4abe09a 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 @@ -37,8 +37,7 @@ public class CardinalityWithRequestBreakerIT extends ESIntegTestCase { true, IntStream.range(0, randomIntBetween(10, 1000)) .mapToObj( - i -> client().prepareIndex("test") - .setId("id_" + i) + i -> prepareIndex("test").setId("id_" + i) .setSource(Map.of("field0", randomAlphaOfLength(5), "field1", randomAlphaOfLength(5))) ) .toArray(IndexRequestBuilder[]::new) 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 295486fba2e5..e15ad15bb4e3 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 @@ -910,8 +910,8 @@ public class ExtendedStatsIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 d4b5be3045cd..d263c14fe471 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 @@ -575,8 +575,8 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 9eac8d4a06a4..0dbc811a7deb 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 @@ -546,8 +546,8 @@ public class HDRPercentilesIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 f494a339a7a7..06f43416eb03 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 @@ -89,8 +89,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { multiValueSample[i * 2] = firstMultiValueDatapoint; multiValueSample[(i * 2) + 1] = secondMultiValueDatapoint; - IndexRequestBuilder builder = client().prepareIndex("idx") - .setId(String.valueOf(i)) + IndexRequestBuilder builder = prepareIndex("idx").setId(String.valueOf(i)) .setSource( jsonBuilder().startObject() .field("value", singleValueDatapoint) @@ -114,8 +113,7 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId(String.valueOf(i)) + prepareIndex("empty_bucket_idx").setId(String.valueOf(i)) .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } @@ -502,8 +500,8 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase { indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 a6876f606ffe..389fe4d0999c 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 @@ -274,8 +274,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { numDocs = randomIntBetween(10, 100); for (int i = 0; i < numDocs; i++) { builders.add( - client().prepareIndex("idx") - .setId("" + i) + prepareIndex("idx").setId("" + i) .setSource( jsonBuilder().startObject().field("value", randomAlphaOfLengthBetween(5, 15)).field("l_value", i).endObject() ) @@ -295,9 +294,7 @@ public class ScriptedMetricIT extends ESIntegTestCase { builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId("" + i) - .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) + prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } @@ -1148,8 +1145,8 @@ public class ScriptedMetricIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 c27751d5c52b..f97d886ae8df 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 @@ -239,8 +239,8 @@ public class StatsIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 e60f0308412c..37524dabe7f0 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 @@ -67,9 +67,9 @@ public class SumIT extends AbstractNumericTestCase { prepareCreate("new_index").setMapping("transit_mode", "type=keyword", "route_length_miles", "type=double").get(); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("old_index").setSource("transit_mode", "train", "distance", 42.0)); - builders.add(client().prepareIndex("old_index").setSource("transit_mode", "bus", "distance", 50.5)); - builders.add(client().prepareIndex("new_index").setSource("transit_mode", "train", "route_length_miles", 100.2)); + builders.add(prepareIndex("old_index").setSource("transit_mode", "train", "distance", 42.0)); + builders.add(prepareIndex("old_index").setSource("transit_mode", "bus", "distance", 50.5)); + builders.add(prepareIndex("new_index").setSource("transit_mode", "train", "route_length_miles", 100.2)); indexRandom(true, builders); ensureSearchable(); @@ -213,8 +213,8 @@ public class SumIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 3156b934fdd0..f1a4c9e5bd7a 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 @@ -492,8 +492,8 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 6d2c11a5868a..98086451c345 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 @@ -462,8 +462,8 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 432da3a05f86..d878dc981b17 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 @@ -156,8 +156,7 @@ public class TopHitsIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 50; i++) { builders.add( - client().prepareIndex("idx") - .setId(Integer.toString(i)) + prepareIndex("idx").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field(TERMS_AGGS_FIELD, "val" + (i / 10)) @@ -171,48 +170,39 @@ public class TopHitsIT extends ESIntegTestCase { } builders.add( - client().prepareIndex("field-collapsing") - .setId("1") + prepareIndex("field-collapsing").setId("1") .setSource(jsonBuilder().startObject().field("group", "a").field("text", "term x y z b").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("2") + prepareIndex("field-collapsing").setId("2") .setSource(jsonBuilder().startObject().field("group", "a").field("text", "term x y z n rare").field("value", 1).endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("3") + prepareIndex("field-collapsing").setId("3") .setSource(jsonBuilder().startObject().field("group", "b").field("text", "x y z term").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("4") + prepareIndex("field-collapsing").setId("4") .setSource(jsonBuilder().startObject().field("group", "b").field("text", "x y term").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("5") + prepareIndex("field-collapsing").setId("5") .setSource(jsonBuilder().startObject().field("group", "b").field("text", "x term").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("6") + prepareIndex("field-collapsing").setId("6") .setSource(jsonBuilder().startObject().field("group", "b").field("text", "term rare").field("value", 3).endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("7") + prepareIndex("field-collapsing").setId("7") .setSource(jsonBuilder().startObject().field("group", "c").field("text", "x y z term").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("8") + prepareIndex("field-collapsing").setId("8") .setSource(jsonBuilder().startObject().field("group", "c").field("text", "x y term b").endObject()) ); builders.add( - client().prepareIndex("field-collapsing") - .setId("9") + prepareIndex("field-collapsing").setId("9") .setSource(jsonBuilder().startObject().field("group", "c").field("text", "rare x term").field("value", 2).endObject()) ); @@ -227,12 +217,11 @@ public class TopHitsIT extends ESIntegTestCase { } builder.endArray().endObject(); - builders.add(client().prepareIndex("articles").setSource(builder)); + builders.add(prepareIndex("articles").setSource(builder)); } builders.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "title 1") @@ -275,8 +264,7 @@ public class TopHitsIT extends ESIntegTestCase { ) ); builders.add( - client().prepareIndex("articles") - .setId("2") + prepareIndex("articles").setId("2") .setSource( jsonBuilder().startObject() .field("title", "title 2") @@ -1097,8 +1085,8 @@ public class TopHitsIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 2b60456e2b2b..7c5ab6600e36 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 @@ -49,8 +49,7 @@ public class ValueCountIT extends ESIntegTestCase { createIndex("idx"); createIndex("idx_unmapped"); for (int i = 0; i < 10; i++) { - client().prepareIndex("idx") - .setId("" + i) + prepareIndex("idx").setId("" + i) .setSource( jsonBuilder().startObject().field("value", i + 1).startArray("values").value(i + 2).value(i + 3).endArray().endObject() ) @@ -221,8 +220,8 @@ public class ValueCountIT extends ESIntegTestCase { ); indexRandom( true, - client().prepareIndex("cache_test_idx").setId("1").setSource("s", 1), - client().prepareIndex("cache_test_idx").setId("2").setSource("s", 2) + prepareIndex("cache_test_idx").setId("1").setSource("s", 1), + prepareIndex("cache_test_idx").setId("2").setSource("s", 2) ); // Make sure we are starting with a clear cache 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 01b2d92de7d8..7509cf381508 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 @@ -94,13 +94,9 @@ abstract class BucketMetricsPipeLineAggregationTestCase builders = new ArrayList<>(); for (int docs = 0; docs < numDocs; docs++) { - builders.add(client().prepareIndex("idx").setSource(newDocBuilder())); + builders.add(prepareIndex("idx").setSource(newDocBuilder())); } indexRandom(true, builders); 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 035173435896..bc518eb6c129 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 @@ -85,8 +85,7 @@ public class ExtendedStatsBucketIT extends BucketMetricsPipeLineAggregationTestC // creates 6 documents where the value of the field is 0, 1, 2, 3, // 3, 5 builders.add( - client().prepareIndex("idx_gappy") - .setId("" + i) + prepareIndex("idx_gappy").setId("" + i) .setSource(jsonBuilder().startObject().field(SINGLE_VALUED_FIELD_NAME, i == 4 ? 3 : i).endObject()) ); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java index e897196cb3c6..e4bb11247d23 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchRedStateIndexIT.java @@ -109,7 +109,7 @@ public class SearchRedStateIndexIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(indexSettings(numShards, 0))); ensureGreen(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId("" + i).setSource("field1", "value1").get(); + prepareIndex("test").setId("" + i).setSource("field1", "value1").get(); } refresh(); 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 19466a949a62..97a400709cde 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java @@ -54,7 +54,7 @@ public class SearchWhileCreatingIndexIT extends ESIntegTestCase { if (createIndex) { createIndex("test"); } - client().prepareIndex("test").setId(id).setSource("field", "test").get(); + prepareIndex("test").setId(id).setSource("field", "test").get(); RefreshResponse refreshResponse = indicesAdmin().prepareRefresh("test").get(); // at least one shard should be successful when refreshing assertThat(refreshResponse.getSuccessfulShards(), greaterThanOrEqualTo(1)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java index f56863016849..26d81f672d65 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java @@ -47,8 +47,7 @@ public class SearchWhileRelocatingIT extends ESIntegTestCase { final int numDocs = between(10, 20); for (int i = 0; i < numDocs; i++) { indexBuilders.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("test", "value") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java index ed88a66272f8..6ebfc6183026 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java @@ -99,8 +99,7 @@ public class SearchWithRandomExceptionsIT extends ESIntegTestCase { boolean[] added = new boolean[numDocs]; for (int i = 0; i < numDocs; i++) { try { - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId("" + i) + DocWriteResponse indexResponse = prepareIndex("test").setId("" + i) .setTimeout(TimeValue.timeValueSeconds(1)) .setSource("test", English.intToEnglish(i)) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java index a541187fb599..33ef75b317e3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/basic/SearchWithRandomIOExceptionsIT.java @@ -82,7 +82,7 @@ public class SearchWithRandomIOExceptionsIT extends ESIntegTestCase { numInitialDocs = between(10, 100); ensureGreen(); for (int i = 0; i < numInitialDocs; i++) { - client().prepareIndex("test").setId("init" + i).setSource("test", "init").get(); + prepareIndex("test").setId("init" + i).setSource("test", "init").get(); } indicesAdmin().prepareRefresh("test").execute().get(); indicesAdmin().prepareFlush("test").execute().get(); @@ -121,8 +121,7 @@ public class SearchWithRandomIOExceptionsIT extends ESIntegTestCase { for (int i = 0; i < numDocs; i++) { added[i] = false; try { - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId(Integer.toString(i)) + DocWriteResponse indexResponse = prepareIndex("test").setId(Integer.toString(i)) .setTimeout(TimeValue.timeValueSeconds(1)) .setSource("test", English.intToEnglish(i)) .get(); 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 ef3b382da708..607c6596d15c 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 @@ -102,8 +102,7 @@ public class InnerHitsIT extends ESIntegTestCase { List requests = new ArrayList<>(); requests.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "quick brown fox") @@ -122,8 +121,7 @@ public class InnerHitsIT extends ESIntegTestCase { ) ); requests.add( - client().prepareIndex("articles") - .setId("2") + prepareIndex("articles").setId("2") .setSource( jsonBuilder().startObject() .field("title", "big gray elephant") @@ -242,7 +240,7 @@ public class InnerHitsIT extends ESIntegTestCase { source.startObject().field("x", "y").endObject(); } source.endArray().endObject(); - requestBuilders.add(client().prepareIndex("idx").setId(Integer.toString(i)).setSource(source)); + requestBuilders.add(prepareIndex("idx").setId(Integer.toString(i)).setSource(source)); } indexRandom(true, requestBuilders); @@ -318,8 +316,7 @@ public class InnerHitsIT extends ESIntegTestCase { List requests = new ArrayList<>(); requests.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "quick brown fox") @@ -345,8 +342,7 @@ public class InnerHitsIT extends ESIntegTestCase { ) ); requests.add( - client().prepareIndex("articles") - .setId("2") + prepareIndex("articles").setId("2") .setSource( jsonBuilder().startObject() .field("title", "big gray elephant") @@ -522,8 +518,7 @@ public class InnerHitsIT extends ESIntegTestCase { List requests = new ArrayList<>(); requests.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "quick brown fox") @@ -578,8 +573,7 @@ public class InnerHitsIT extends ESIntegTestCase { List requests = new ArrayList<>(); requests.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "quick brown fox") @@ -666,8 +660,7 @@ public class InnerHitsIT extends ESIntegTestCase { // index the message in an object form instead of an array requests = new ArrayList<>(); requests.add( - client().prepareIndex("articles") - .setId("1") + prepareIndex("articles").setId("1") .setSource( jsonBuilder().startObject() .field("title", "quick brown fox") @@ -724,8 +717,7 @@ public class InnerHitsIT extends ESIntegTestCase { List requests = new ArrayList<>(); int numDocs = randomIntBetween(2, 35); requests.add( - client().prepareIndex("test") - .setId("0") + prepareIndex("test").setId("0") .setSource( jsonBuilder().startObject() .field("field1", 0) @@ -743,8 +735,7 @@ public class InnerHitsIT extends ESIntegTestCase { ) ); requests.add( - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", 1) @@ -764,8 +755,7 @@ public class InnerHitsIT extends ESIntegTestCase { for (int i = 2; i < numDocs; i++) { requests.add( - client().prepareIndex("test") - .setId(String.valueOf(i)) + prepareIndex("test").setId(String.valueOf(i)) .setSource( jsonBuilder().startObject() .field("field1", i) @@ -819,8 +809,7 @@ public class InnerHitsIT extends ESIntegTestCase { public void testNestedSource() throws Exception { assertAcked(prepareCreate("index1").setMapping("comments", "type=nested")); - client().prepareIndex("index1") - .setId("1") + prepareIndex("index1").setId("1") .setSource( jsonBuilder().startObject() .field("message", "quick brown fox") @@ -920,8 +909,8 @@ public class InnerHitsIT extends ESIntegTestCase { public void testInnerHitsWithIgnoreUnmapped() throws Exception { assertAcked(prepareCreate("index1").setMapping("nested_type", "type=nested")); createIndex("index2"); - client().prepareIndex("index1").setId("1").setSource("nested_type", Collections.singletonMap("key", "value")).get(); - client().prepareIndex("index2").setId("3").setSource("key", "value").get(); + prepareIndex("index1").setId("1").setSource("nested_type", Collections.singletonMap("key", "value")).get(); + prepareIndex("index2").setId("3").setSource("key", "value").get(); refresh(); assertSearchHitsWithoutFailures( @@ -942,8 +931,7 @@ public class InnerHitsIT extends ESIntegTestCase { Settings.builder().put(IndexSettings.MAX_INNER_RESULT_WINDOW_SETTING.getKey(), ArrayUtil.MAX_ARRAY_LENGTH), "index2" ); - client().prepareIndex("index2") - .setId("1") + prepareIndex("index2").setId("1") .setSource( jsonBuilder().startObject().startArray("nested").startObject().field("field", "value1").endObject().endArray().endObject() ) @@ -958,8 +946,7 @@ public class InnerHitsIT extends ESIntegTestCase { public void testTooHighResultWindow() throws Exception { assertAcked(prepareCreate("index2").setMapping("nested", "type=nested")); - client().prepareIndex("index2") - .setId("1") + prepareIndex("index2").setId("1") .setSource( jsonBuilder().startObject().startArray("nested").startObject().field("field", "value1").endObject().endArray().endObject() ) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java index b5243ed5a52a..c996725e6285 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/MatchedQueriesIT.java @@ -41,9 +41,9 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("name", "test1", "number", 1).get(); - client().prepareIndex("test").setId("2").setSource("name", "test2", "number", 2).get(); - client().prepareIndex("test").setId("3").setSource("name", "test3", "number", 3).get(); + prepareIndex("test").setId("1").setSource("name", "test1", "number", 1).get(); + prepareIndex("test").setId("2").setSource("name", "test2", "number", 2).get(); + prepareIndex("test").setId("3").setSource("name", "test3", "number", 3).get(); refresh(); assertResponse( @@ -99,9 +99,9 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("name", "test", "title", "title1").get(); - client().prepareIndex("test").setId("2").setSource("name", "test").get(); - client().prepareIndex("test").setId("3").setSource("name", "test").get(); + prepareIndex("test").setId("1").setSource("name", "test", "title", "title1").get(); + prepareIndex("test").setId("2").setSource("name", "test").get(); + prepareIndex("test").setId("3").setSource("name", "test").get(); refresh(); assertResponse( @@ -159,9 +159,9 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("name", "test", "title", "title1").get(); - client().prepareIndex("test").setId("2").setSource("name", "test", "title", "title2").get(); - client().prepareIndex("test").setId("3").setSource("name", "test", "title", "title3").get(); + prepareIndex("test").setId("1").setSource("name", "test", "title", "title1").get(); + prepareIndex("test").setId("2").setSource("name", "test", "title", "title2").get(); + prepareIndex("test").setId("3").setSource("name", "test", "title", "title3").get(); refresh(); assertResponse( @@ -208,7 +208,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test1"); ensureGreen(); - client().prepareIndex("test1").setId("1").setSource("title", "title1").get(); + prepareIndex("test1").setId("1").setSource("title", "title1").get(); refresh(); assertResponse(prepareSearch().setQuery(QueryBuilders.regexpQuery("title", "title1").queryName("regex")), response -> { @@ -230,7 +230,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test1"); ensureGreen(); - client().prepareIndex("test1").setId("1").setSource("title", "title1").get(); + prepareIndex("test1").setId("1").setSource("title", "title1").get(); refresh(); assertResponse(prepareSearch().setQuery(QueryBuilders.prefixQuery("title", "title").queryName("prefix")), response -> { @@ -252,7 +252,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test1"); ensureGreen(); - client().prepareIndex("test1").setId("1").setSource("title", "title1").get(); + prepareIndex("test1").setId("1").setSource("title", "title1").get(); refresh(); assertResponse(prepareSearch().setQuery(QueryBuilders.fuzzyQuery("title", "titel1").queryName("fuzzy")), response -> { @@ -274,7 +274,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test1"); ensureGreen(); - client().prepareIndex("test1").setId("1").setSource("title", "title1").get(); + prepareIndex("test1").setId("1").setSource("title", "title1").get(); refresh(); assertResponse(prepareSearch().setQuery(QueryBuilders.wildcardQuery("title", "titl*").queryName("wildcard")), response -> { @@ -296,7 +296,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test1"); ensureGreen(); - client().prepareIndex("test1").setId("1").setSource("title", "title1 title2").get(); + prepareIndex("test1").setId("1").setSource("title", "title1 title2").get(); refresh(); assertResponse( @@ -324,8 +324,8 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("content", "Lorem ipsum dolor sit amet").get(); - client().prepareIndex("test").setId("2").setSource("content", "consectetur adipisicing elit").get(); + prepareIndex("test").setId("1").setSource("content", "Lorem ipsum dolor sit amet").get(); + prepareIndex("test").setId("2").setSource("content", "consectetur adipisicing elit").get(); refresh(); // Execute search at least two times to load it in cache @@ -361,7 +361,7 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("content", "Lorem ipsum dolor sit amet").get(); + prepareIndex("test").setId("1").setSource("content", "Lorem ipsum dolor sit amet").get(); refresh(); MatchQueryBuilder matchQueryBuilder = matchQuery("content", "amet").queryName("abc"); @@ -384,8 +384,8 @@ public class MatchedQueriesIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("content", "hello world").get(); - client().prepareIndex("test").setId("2").setSource("content", "hello you").get(); + prepareIndex("test").setId("1").setSource("content", "hello world").get(); + prepareIndex("test").setId("2").setSource("content", "hello you").get(); refresh(); assertResponse( 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 0dbf3af735b4..8aaa1bce252d 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 @@ -39,8 +39,8 @@ public class CustomHighlighterSearchIT extends ESIntegTestCase { protected void setup() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("name", "arbitrary content", "other_name", "foo", "other_other_name", "bar"), - client().prepareIndex("test").setId("2").setSource("other_name", "foo", "other_other_name", "bar") + prepareIndex("test").setId("1").setSource("name", "arbitrary content", "other_name", "foo", "other_other_name", "bar"), + prepareIndex("test").setId("2").setSource("other_name", "foo", "other_other_name", "bar") ); } 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 5dcfd861c91a..5c189c0c6c96 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 @@ -129,12 +129,10 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().array("tags", "foo bar", "foo bar", "foo bar", "foo baz").field("sort", 1).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().array("tags", "foo baz", "foo baz", "foo baz", "foo bar").field("sort", 2).endObject()) .get(); refresh(); @@ -166,7 +164,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "foo").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "foo").endObject()).get(); refresh(); assertResponse( prepareSearch().setQuery(matchQuery("text", "foo")).highlighter(new HighlightBuilder().field(new Field("text"))), @@ -190,7 +188,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "text").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("text", "text").endObject()).get(); refresh(); for (String type : ALL_TYPES) { assertResponse( @@ -219,7 +217,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test").setId("1").setSource("text", "foo").get(); + prepareIndex("test").setId("1").setSource("text", "foo").get(); refresh(); for (String type : ALL_TYPES) { @@ -251,7 +249,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test").setId("1").setSource("text", "foo bar").get(); + prepareIndex("test").setId("1").setSource("text", "foo bar").get(); refresh(); for (String type : ALL_TYPES) { @@ -280,7 +278,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test").setId("1").setSource("keyword", "foo").get(); + prepareIndex("test").setId("1").setSource("keyword", "foo").get(); refresh(); HighlightBuilder builder = new HighlightBuilder().field(new Field("al*")).requireFieldMatch(false); @@ -314,8 +312,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("unstored_text", "text").field("text", "text").endObject()) .get(); refresh(); @@ -340,7 +337,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { for (int i = 0; i < 6000; i++) { builder.append("abc").append(" "); } - client().prepareIndex("test").setId("1").setSource("name", builder.toString()).get(); + prepareIndex("test").setId("1").setSource("name", builder.toString()).get(); refresh(); assertResponse( prepareSearch().setQuery(constantScoreQuery(matchQuery("name", "abc"))).highlighter(new HighlightBuilder().field("name")), @@ -360,8 +357,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( "no_long_term", "This is a test where foo is highlighed and should be highlighted", @@ -428,8 +424,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource( XContentFactory.jsonBuilder() .startObject() @@ -504,8 +499,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource( XContentFactory.jsonBuilder() .startObject() @@ -580,8 +574,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource( XContentFactory.jsonBuilder() .startObject() @@ -662,11 +655,11 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); String[] titles = new String[] { "This is a test on the highlighting bug present in elasticsearch", "The bug is bugging us" }; - indexRandom(false, client().prepareIndex("test").setId("1").setSource("title", titles, "titleTV", titles)); + indexRandom(false, prepareIndex("test").setId("1").setSource("title", titles, "titleTV", titles)); indexRandom( true, - client().prepareIndex("test").setId("2").setSource("titleTV", new String[] { "some text to highlight", "highlight other text" }) + prepareIndex("test").setId("2").setSource("titleTV", new String[] { "some text to highlight", "highlight other text" }) ); assertResponse( @@ -704,14 +697,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test") - .setSource( - "field1", - new String[] { "this is a test", "this is the second test" }, - "field2", - new String[] { "this is another test", "yet another test" } - ) - .get(); + prepareIndex("test").setSource( + "field1", + new String[] { "this is a test", "this is the second test" }, + "field2", + new String[] { "this is another test", "yet another test" } + ).get(); refresh(); logger.info("--> highlighting and searching on field1 and field2 produces different tags"); @@ -752,16 +743,14 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setSource( - "field-postings", - "This is the first test sentence. Here is the second one.", - "field-fvh", - "This is the test with term_vectors", - "field-plain", - "This is the test for the plain highlighter" - ) - .get(); + prepareIndex("test").setSource( + "field-postings", + "This is the first test sentence. Here is the second one.", + "field-fvh", + "This is the test with term_vectors", + "field-plain", + "This is the test for the plain highlighter" + ).get(); refresh(); logger.info("--> highlighting and searching on field*"); @@ -787,7 +776,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testPlainHighlighter() throws Exception { ensureGreen(); - client().prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); + prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); refresh(); SearchSourceBuilder source = searchSource().query(termQuery("field1", "test")) @@ -798,8 +787,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testPlainHighlighterOrder() throws Exception { ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "The quick brown fox jumps over the lazy brown dog but to no suprise the dog doesn't care") + prepareIndex("test").setSource("field1", "The quick brown fox jumps over the lazy brown dog but to no suprise the dog doesn't care") .get(); refresh(); @@ -847,7 +835,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog") + prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog") ); logger.info("--> highlighting and searching on field1"); @@ -873,10 +861,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1TermVectorMapping())); ensureGreen(); - indexRandom( - true, - client().prepareIndex("test").setSource("field1", "A sentence with few words. Another sentence with even more words.") - ); + indexRandom(true, prepareIndex("test").setSource("field1", "A sentence with few words. Another sentence with even more words.")); for (String type : new String[] { "unified", "fvh" }) { logger.info("--> highlighting and searching on 'field' with sentence boundary_scanner"); @@ -914,10 +899,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1TermVectorMapping())); ensureGreen(); - indexRandom( - true, - client().prepareIndex("test").setSource("field1", "A sentence with few words. Another sentence with even more words.") - ); + indexRandom(true, prepareIndex("test").setSource("field1", "A sentence with few words. Another sentence with even more words.")); for (String type : new String[] { "fvh", "unified" }) { logger.info("--> highlighting and searching on 'field' with sentence boundary_scanner"); @@ -957,7 +939,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1TermVectorMapping())); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setSource("field1", "some quick and hairy brown:fox jumped over the lazy dog")); + indexRandom(true, prepareIndex("test").setSource("field1", "some quick and hairy brown:fox jumped over the lazy dog")); logger.info("--> highlighting and searching on 'field' with word boundary_scanner"); for (String type : new String[] { "unified", "fvh" }) { @@ -985,7 +967,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1TermVectorMapping())); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setSource("field1", "some quick and hairy brown:fox jumped over the lazy dog")); + indexRandom(true, prepareIndex("test").setSource("field1", "some quick and hairy brown:fox jumped over the lazy dog")); for (String type : new String[] { "unified", "fvh" }) { SearchSourceBuilder source = searchSource().query(termQuery("field1", "some")) @@ -1020,7 +1002,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { // Index one megabyte of "t " over and over and over again String pattern = "t "; String value = new String(new char[1024 * 256 / pattern.length()]).replace("\0", pattern); - client().prepareIndex("test").setSource("field1", value).get(); + prepareIndex("test").setSource("field1", value).get(); refresh(); final long[] tookDefaultPhrase = new long[1]; @@ -1294,7 +1276,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { int COUNT = between(20, 100); IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[COUNT]; for (int i = 0; i < COUNT; i++) { - indexRequestBuilders[i] = client().prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "test " + i); + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "test " + i); } logger.info("--> indexing docs"); indexRandom(true, indexRequestBuilders); @@ -1337,8 +1319,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < 5; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a test on the highlighting bug present in elasticsearch"); } indexRandom(true, indexRequestBuilders); @@ -1365,8 +1346,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < 5; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a test on the highlighting bug present in elasticsearch"); } indexRandom(true, indexRequestBuilders); @@ -1388,8 +1368,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a html escaping highlighting test for *&? elasticsearch"); } indexRandom(true, indexRequestBuilders); @@ -1417,8 +1396,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < 5; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a html escaping highlighting test for *&? elasticsearch"); } indexRandom(true, indexRequestBuilders); @@ -1460,7 +1438,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -1513,7 +1491,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -1566,7 +1544,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -1618,7 +1596,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -1650,8 +1628,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < 5; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a test for the enabling fast vector highlighter"); } indexRandom(true, indexRequestBuilders); @@ -1683,8 +1660,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a test for the workaround for the fast vector highlighting SOLR-3724"); } indexRandom(true, indexRequestBuilders); @@ -1743,8 +1719,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testFSHHighlightAllMvFragments() throws Exception { assertAcked(prepareCreate("test").setMapping("tags", "type=text,term_vector=with_positions_offsets")); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( "tags", new String[] { @@ -1774,7 +1749,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testBoostingQuery() { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); + prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -1794,7 +1769,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testBoostingQueryTermVector() throws IOException { assertAcked(prepareCreate("test").setMapping(type1TermVectorMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); + prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -1814,8 +1789,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testPlainHighlightDifferentFragmenter() throws Exception { assertAcked(prepareCreate("test").setMapping("tags", "type=text")); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .array( @@ -1932,7 +1906,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testMissingStoredField() throws Exception { assertAcked(prepareCreate("test").setMapping("highlight_field", "type=text,store=true")); ensureGreen(); - client().prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "highlight").endObject()).get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("field", "highlight").endObject()).get(); refresh(); // This query used to fail when the field to highlight was absent @@ -1969,8 +1943,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("text", "elasticsearch test", "byte", 25, "short", 42, "int", 100, "long", -1, "float", 3.2f, "double", 42.42) .get(); refresh(); @@ -2000,7 +1973,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ).setMapping("text", "type=text,analyzer=my_analyzer") ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("text", "elasticsearch test").get(); + prepareIndex("test").setId("1").setSource("text", "elasticsearch test").get(); refresh(); // Mock tokenizer will throw an exception if it is resetted twice @@ -2368,9 +2341,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy quick dog") - .get(); + prepareIndex("test").setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy quick dog").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -2449,8 +2420,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( "field1", "The quick brown fox jumps over the lazy dog. The lazy red fox jumps over the quick dog. " @@ -2481,8 +2451,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); assertHighlight(response, 0, "field1", 1, 2, equalTo("The quick brown dog jumps over the lazy fox.")); }); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( "field1", new String[] { @@ -2549,9 +2518,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("test").setMapping(mapping)); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "The quick brown fox jumps over", "field2", "The quick brown fox jumps over") - .get(); + prepareIndex("test").setSource("field1", "The quick brown fox jumps over", "field2", "The quick brown fox jumps over").get(); refresh(); final int iters = scaledRandomIntBetween(20, 30); for (int i = 0; i < iters; i++) { @@ -2603,9 +2570,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(mapping)); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "The quick brown fox jumps over", "field2", "The quick brown fox jumps over") - .get(); + prepareIndex("test").setSource("field1", "The quick brown fox jumps over", "field2", "The quick brown fox jumps over").get(); refresh(); for (String highlighterType : ALL_TYPES) { @@ -2633,18 +2598,16 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource( - "field1", - new String[] { - "This sentence contains one match, not that short. This sentence contains two sentence matches. " - + "This one contains no matches.", - "This is the second value's first sentence. This one contains no matches. " - + "This sentence contains three sentence occurrences (sentence).", - "One sentence match here and scored lower since the text is quite long, not that appealing. " - + "This one contains no matches." } - ) - .get(); + prepareIndex("test").setSource( + "field1", + new String[] { + "This sentence contains one match, not that short. This sentence contains two sentence matches. " + + "This one contains no matches.", + "This is the second value's first sentence. This one contains no matches. " + + "This sentence contains three sentence occurrences (sentence).", + "One sentence match here and scored lower since the text is quite long, not that appealing. " + + "This one contains no matches." } + ).get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -2683,8 +2646,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < 5; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a html escaping highlighting test for *&? elasticsearch"); } indexRandom(true, indexRequestBuilders); @@ -2732,7 +2694,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test . Second sentence.").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test . Second sentence.").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -2795,7 +2757,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("title", "this is a test").get(); + prepareIndex("test").setId("1").setSource("title", "this is a test").get(); refresh(); // simple search on body with standard analyzer with a simple field query @@ -2839,8 +2801,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a test for the postings highlighter"); } indexRandom(true, indexRequestBuilders); @@ -2853,9 +2814,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { public void testPostingsHighlighterBoostingQuery() throws IOException, ExecutionException, InterruptedException { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -2894,9 +2858,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -2915,9 +2882,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -2936,9 +2906,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -2957,9 +2930,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -2985,7 +2961,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "this is a test", "field2", "aaab").get(); + prepareIndex("test").setSource("field1", "this is a test", "field2", "aaab").get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -2998,9 +2974,12 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test") - .setSource("field1", "this is a test", "field2", "The quick brown fox jumps over the lazy dog! Second sentence.") - .get(); + prepareIndex("test").setSource( + "field1", + "this is a test", + "field2", + "The quick brown fox jumps over the lazy dog! Second sentence." + ).get(); refresh(); logger.info("--> highlighting and searching on field2"); @@ -3020,7 +2999,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); + prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -3040,7 +3019,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); + prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -3063,7 +3042,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); + prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -3084,7 +3063,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(type1PostingsffsetsMapping())); ensureGreen(); - client().prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); + prepareIndex("test").setSource("field1", "The photography word will get highlighted").get(); refresh(); logger.info("--> highlighting and searching on field1"); @@ -3114,8 +3093,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { // (https://github.com/elastic/elasticsearch/issues/4103) String prefix = randomAlphaOfLengthBetween(5, 30); prefixes.put(String.valueOf(i), prefix); - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("field1", "Sentence " + prefix + " test. Sentence two."); } logger.info("--> indexing docs"); @@ -3151,7 +3129,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(mapping)); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setSource("foo", "test typename")); + indexRandom(true, prepareIndex("test").setSource("foo", "test typename")); for (String highlighter : ALL_TYPES) { assertHighlight( @@ -3183,7 +3161,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareAliases().addAlias("test", "filtered_alias", matchQuery("foo", "japanese"))); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setSource("foo", "test japanese")); + indexRandom(true, prepareIndex("test").setSource("foo", "test japanese")); for (String highlighter : ALL_TYPES) { assertHighlight( @@ -3313,8 +3291,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("text", "Arbitrary text field which will should not cause a failure").endObject()) .get(); refresh(); @@ -3355,8 +3332,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(mappings)); ensureYellow(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("jd", "some आवश्यकता है- आर्य समाज अनाथालय, 68 सिविल लाइन्स, बरेली को एक पुरूष" + " रस text") @@ -3395,10 +3371,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { mappings.endObject(); assertAcked(prepareCreate("test").setMapping(mappings)); - client().prepareIndex("test") - .setId("1") - .setSource(jsonBuilder().startObject().field("keyword_field", "some text").endObject()) - .get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("keyword_field", "some text").endObject()).get(); refresh(); assertNoFailuresAndResponse( prepareSearch().setSource( @@ -3425,8 +3398,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { b.endObject().endObject(); prepareCreate("test").setMapping(b).get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("foo", "how now brown cow").endObject()) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -3465,8 +3437,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); prepareCreate("test").setMapping(mapping).get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startArray("foo") @@ -3496,8 +3467,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { } public void testFunctionScoreQueryHighlight() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("text", "brown").endObject()) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -3515,8 +3485,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { } public void testFiltersFunctionScoreQueryHighlight() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("text", "brown").field("enable", "yes").endObject()) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -3551,9 +3520,9 @@ public class HighlighterSearchIT extends ESIntegTestCase { DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time"); indexRandom( true, - client().prepareIndex("index-1").setId("1").setSource("d", formatter.format(now), "field", "hello world"), - client().prepareIndex("index-1").setId("2").setSource("d", formatter.format(now.minusDays(1)), "field", "hello"), - client().prepareIndex("index-1").setId("3").setSource("d", formatter.format(now.minusDays(2)), "field", "world") + prepareIndex("index-1").setId("1").setSource("d", formatter.format(now), "field", "hello world"), + prepareIndex("index-1").setId("2").setSource("d", formatter.format(now.minusDays(1)), "field", "hello"), + prepareIndex("index-1").setId("3").setSource("d", formatter.format(now.minusDays(2)), "field", "world") ); ensureSearchable("index-1"); for (int i = 0; i < 5; i++) { @@ -3596,8 +3565,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { ); prepareCreate("test").setMapping(mapping).get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startArray("foo") @@ -3681,11 +3649,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(builder.build()).setMapping("keyword", "type=keyword,normalizer=my_normalizer")); ensureGreen(); - client().prepareIndex("test") - .setId("0") - .setSource("keyword", "Hello World") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("test").setId("0").setSource("keyword", "Hello World").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); for (String highlighterType : new String[] { "unified", "plain" }) { assertResponse( @@ -3705,8 +3669,7 @@ public class HighlighterSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("keyword", "type=keyword")); ensureGreen(); - client().prepareIndex("test") - .setId("d33f85bf1e51e84d9ab38948db9f3a068e1fe5294f1d8603914ac8c7bcc39ca1") + prepareIndex("test").setId("d33f85bf1e51e84d9ab38948db9f3a068e1fe5294f1d8603914ac8c7bcc39ca1") .setSource("keyword", "Hello World") .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java index eab5dd096869..02867e0cf692 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java @@ -317,10 +317,10 @@ public class FieldCapabilitiesIT extends ESIntegTestCase { assertAcked(prepareCreate("index-2").setMapping("timestamp", "type=date", "field1", "type=long")); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("index-1").setSource("timestamp", "2015-07-08")); - reqs.add(client().prepareIndex("index-1").setSource("timestamp", "2018-07-08")); - reqs.add(client().prepareIndex("index-2").setSource("timestamp", "2019-10-12")); - reqs.add(client().prepareIndex("index-2").setSource("timestamp", "2020-07-08")); + reqs.add(prepareIndex("index-1").setSource("timestamp", "2015-07-08")); + reqs.add(prepareIndex("index-1").setSource("timestamp", "2018-07-08")); + reqs.add(prepareIndex("index-2").setSource("timestamp", "2019-10-12")); + reqs.add(prepareIndex("index-2").setSource("timestamp", "2020-07-08")); indexRandom(true, reqs); FieldCapabilitiesResponse response = client().prepareFieldCaps("index-*").setFields("*").get(); @@ -446,13 +446,13 @@ public class FieldCapabilitiesIT extends ESIntegTestCase { .setMapping("timestamp", "type=date", "field1", "type=long") ); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("log-index-1").setSource("timestamp", "2015-07-08")); - reqs.add(client().prepareIndex("log-index-1").setSource("timestamp", "2018-07-08")); - reqs.add(client().prepareIndex("log-index-1").setSource("timestamp", "2020-03-03")); - reqs.add(client().prepareIndex("log-index-1").setSource("timestamp", "2020-09-09")); - reqs.add(client().prepareIndex("log-index-2").setSource("timestamp", "2019-10-12")); - reqs.add(client().prepareIndex("log-index-2").setSource("timestamp", "2020-02-02")); - reqs.add(client().prepareIndex("log-index-2").setSource("timestamp", "2020-10-10")); + reqs.add(prepareIndex("log-index-1").setSource("timestamp", "2015-07-08")); + reqs.add(prepareIndex("log-index-1").setSource("timestamp", "2018-07-08")); + reqs.add(prepareIndex("log-index-1").setSource("timestamp", "2020-03-03")); + reqs.add(prepareIndex("log-index-1").setSource("timestamp", "2020-09-09")); + reqs.add(prepareIndex("log-index-2").setSource("timestamp", "2019-10-12")); + reqs.add(prepareIndex("log-index-2").setSource("timestamp", "2020-02-02")); + reqs.add(prepareIndex("log-index-2").setSource("timestamp", "2020-10-10")); indexRandom(true, reqs); ensureGreen("log-index-1", "log-index-2"); indicesAdmin().prepareRefresh("log-index-1", "log-index-2").get(); @@ -637,7 +637,7 @@ public class FieldCapabilitiesIT extends ESIntegTestCase { ensureGreen(indices); assertAcked(indicesAdmin().preparePutMapping(indicesWithExtraField).setSource("extra_field", "type=integer").get()); for (String index : indicesWithExtraField) { - client().prepareIndex(index).setSource("extra_field", randomIntBetween(1, 1000)).get(); + prepareIndex(index).setSource("extra_field", randomIntBetween(1, 1000)).get(); } FieldCapabilitiesResponse resp = client().execute(FieldCapabilitiesAction.INSTANCE, request).actionGet(); verifyResponse.accept(resp); 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 7e88df463c13..9ad6363d0e57 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java @@ -181,8 +181,7 @@ public class SearchFieldsIT extends ESIntegTestCase { indicesAdmin().preparePutMapping().setSource(mapping, XContentType.JSON).get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().field("field1", "value1").field("field2", "value2").field("field3", "value3").endObject() ) @@ -275,22 +274,19 @@ public class SearchFieldsIT extends ESIntegTestCase { indicesAdmin().preparePutMapping().setSource(mapping, XContentType.JSON).get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).field("date", "1970-01-01T00:00:00").endObject() ) .get(); indicesAdmin().prepareFlush().get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject().field("test", "value beck").field("num1", 2.0f).field("date", "1970-01-01T00:00:25").endObject() ) .get(); indicesAdmin().prepareFlush().get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject().field("test", "value beck").field("num1", 3.0f).field("date", "1970-01-01T00:02:00").endObject() ) @@ -383,10 +379,8 @@ public class SearchFieldsIT extends ESIntegTestCase { indexRandom( true, false, - client().prepareIndex("test") - .setId("1") - .setSource(jsonBuilder().startObject().field("date", "1970-01-01T00:00:00.000Z").endObject()), - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("date", date).endObject()) + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("date", "1970-01-01T00:00:00.000Z").endObject()), + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("date", date).endObject()) ); assertNoFailuresAndResponse( @@ -423,8 +417,7 @@ public class SearchFieldsIT extends ESIntegTestCase { int numDocs = randomIntBetween(1, 30); IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource(jsonBuilder().startObject().field("num1", i).endObject()); } indexRandom(true, indexRequestBuilders); @@ -449,8 +442,7 @@ public class SearchFieldsIT extends ESIntegTestCase { public void testScriptFieldUsingSource() throws Exception { createIndex("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startObject("obj1") @@ -513,7 +505,7 @@ public class SearchFieldsIT extends ESIntegTestCase { } public void testScriptFieldsForNullReturn() throws Exception { - client().prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy("true").get(); + prepareIndex("test").setId("1").setSource("foo", "bar").setRefreshPolicy("true").get(); assertNoFailuresAndResponse( prepareSearch().setQuery(matchAllQuery()) @@ -534,8 +526,7 @@ public class SearchFieldsIT extends ESIntegTestCase { public void testPartialFields() throws Exception { createIndex("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( XContentFactory.jsonBuilder() .startObject() @@ -616,8 +607,7 @@ public class SearchFieldsIT extends ESIntegTestCase { indicesAdmin().preparePutMapping().setSource(mapping, XContentType.JSON).get(); ZonedDateTime date = ZonedDateTime.of(2012, 3, 22, 0, 0, 0, 0, ZoneOffset.UTC); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("byte_field", (byte) 1) @@ -683,8 +673,7 @@ public class SearchFieldsIT extends ESIntegTestCase { } public void testSearchFieldsMetadata() throws Exception { - client().prepareIndex("my-index") - .setId("1") + prepareIndex("my-index").setId("1") .setRouting("1") .setSource(jsonBuilder().startObject().field("field1", "value").endObject()) .setRefreshPolicy(IMMEDIATE) @@ -754,7 +743,7 @@ public class SearchFieldsIT extends ESIntegTestCase { .endObject() ); - client().prepareIndex("my-index").setId("1").setRefreshPolicy(IMMEDIATE).setSource(source, XContentType.JSON).get(); + prepareIndex("my-index").setId("1").setRefreshPolicy(IMMEDIATE).setSource(source, XContentType.JSON).get(); String field = "field1.field2.field3.field4"; @@ -769,7 +758,7 @@ public class SearchFieldsIT extends ESIntegTestCase { // see #8203 public void testSingleValueFieldDatatField() throws ExecutionException, InterruptedException { assertAcked(indicesAdmin().prepareCreate("test").setMapping("test_field", "type=keyword").get()); - indexRandom(true, client().prepareIndex("test").setId("1").setSource("test_field", "foobar")); + indexRandom(true, prepareIndex("test").setId("1").setSource("test_field", "foobar")); refresh(); assertResponse( prepareSearch("test").setSource(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery()).docValueField("test_field")), @@ -838,8 +827,7 @@ public class SearchFieldsIT extends ESIntegTestCase { indicesAdmin().preparePutMapping().setSource(mapping, XContentType.JSON).get(); ZonedDateTime date = ZonedDateTime.of(2012, 3, 22, 0, 0, 0, 0, ZoneOffset.UTC); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("text_field", "foo") @@ -1010,8 +998,7 @@ public class SearchFieldsIT extends ESIntegTestCase { List reqs = new ArrayList<>(); for (int i = 0; i < numDocs; ++i) { reqs.add( - client().prepareIndex("index") - .setId(Integer.toString(i)) + prepareIndex("index").setId(Integer.toString(i)) .setSource( "s", Integer.toString(i), @@ -1268,10 +1255,7 @@ public class SearchFieldsIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test") - .setId("1") - .setRouting("1") - .setSource(jsonBuilder().startObject().field("field1", "value").endObject()) + prepareIndex("test").setId("1").setRouting("1").setSource(jsonBuilder().startObject().field("field1", "value").endObject()) ); assertNoFailuresAndResponse(prepareSearch("test").addStoredField("field1"), response -> { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java index ef5eafa5153c..eff2e8d3653c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java @@ -87,9 +87,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { List indexBuilders = new ArrayList<>(); indexBuilders.add( - client().prepareIndex() - .setId("1") - .setIndex("test") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -101,9 +99,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { ) ); indexBuilders.add( - client().prepareIndex() - .setId("2") - .setIndex("test") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -118,9 +114,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { int numDummyDocs = 20; for (int i = 1; i <= numDummyDocs; i++) { indexBuilders.add( - client().prepareIndex() - .setId(Integer.toString(i + 3)) - .setIndex("test") + prepareIndex("test").setId(Integer.toString(i + 3)) .setSource( jsonBuilder().startObject() .field("test", "value") @@ -222,25 +216,17 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { // add tw docs within offset List indexBuilders = new ArrayList<>(); indexBuilders.add( - client().prepareIndex() - .setId("1") - .setIndex("test") - .setSource(jsonBuilder().startObject().field("test", "value").field("num", 0.5).endObject()) + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("test", "value").field("num", 0.5).endObject()) ); indexBuilders.add( - client().prepareIndex() - .setId("2") - .setIndex("test") - .setSource(jsonBuilder().startObject().field("test", "value").field("num", 1.7).endObject()) + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("test", "value").field("num", 1.7).endObject()) ); // add docs outside offset int numDummyDocs = 20; for (int i = 0; i < numDummyDocs; i++) { indexBuilders.add( - client().prepareIndex() - .setId(Integer.toString(i + 3)) - .setIndex("test") + prepareIndex("test").setId(Integer.toString(i + 3)) .setSource(jsonBuilder().startObject().field("test", "value").field("num", 3.0 + i).endObject()) ); } @@ -343,9 +329,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { List indexBuilders = new ArrayList<>(); indexBuilders.add( - client().prepareIndex() - .setId("1") - .setIndex("test") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("test", "value value") @@ -357,9 +341,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { ) ); indexBuilders.add( - client().prepareIndex() - .setId("2") - .setIndex("test") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -448,9 +430,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { ) ); - client().prepareIndex() - .setId("1") - .setIndex("test") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -525,9 +505,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { ) ); - client().prepareIndex() - .setId("1") - .setIndex("test") + prepareIndex("test").setId("1") .setRefreshPolicy(IMMEDIATE) .setSource(jsonBuilder().startObject().field("test", "value value").field("num", 1.0).endObject()) .get(); @@ -925,9 +903,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { String date = "2013-05-" + dayString; indexBuilders.add( - client().prepareIndex() - .setId(Integer.toString(i)) - .setIndex("test") + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("test", "value") @@ -1122,9 +1098,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { ); // Index for testing MIN and MAX - IndexRequestBuilder doc1 = client().prepareIndex() - .setId("1") - .setIndex("test") + IndexRequestBuilder doc1 = prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -1140,9 +1114,7 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { .endArray() .endObject() ); - IndexRequestBuilder doc2 = client().prepareIndex() - .setId("2") - .setIndex("test") + IndexRequestBuilder doc2 = prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("test", "value") @@ -1199,16 +1171,11 @@ public class DecayFunctionScoreIT extends ESIntegTestCase { // Now test AVG and SUM - doc1 = client().prepareIndex() - .setId("1") - .setIndex("test") + doc1 = prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().field("test", "value").startArray("num").value(0.0).value(1.0).value(2.0).endArray().endObject() ); - doc2 = client().prepareIndex() - .setId("2") - .setIndex("test") - .setSource(jsonBuilder().startObject().field("test", "value").field("num", 1.0).endObject()); + doc2 = prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("test", "value").field("num", 1.0).endObject()); indexRandom(true, doc1, doc2); assertResponse( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java index 6353c3449132..ee60888d7a0a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java @@ -116,8 +116,7 @@ public class ExplainableScriptIT extends ESIntegTestCase { List indexRequests = new ArrayList<>(); for (int i = 0; i < 20; i++) { indexRequests.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource(jsonBuilder().startObject().field("number_field", i).field("text", "text").endObject()) ); } 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 238f5b873a8d..0a43255967dc 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java @@ -46,9 +46,9 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { ) ); - client().prepareIndex("test").setId("1").setSource("test", 5, "body", "foo").get(); - client().prepareIndex("test").setId("2").setSource("test", 17, "body", "foo").get(); - client().prepareIndex("test").setId("3").setSource("body", "bar").get(); + prepareIndex("test").setId("1").setSource("test", 5, "body", "foo").get(); + prepareIndex("test").setId("2").setSource("test", 17, "body", "foo").get(); + prepareIndex("test").setId("3").setSource("body", "bar").get(); refresh(); @@ -123,7 +123,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase { response -> assertEquals(response.getHits().getAt(0).getScore(), response.getHits().getAt(2).getScore(), 0) ); - client().prepareIndex("test").setId("2").setSource("test", -1, "body", "foo").get(); + prepareIndex("test").setId("2").setSource("test", -1, "body", "foo").get(); refresh(); // -1 divided by 0 is infinity, which should provoke an exception. diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java index d2f68d8dd190..bcecc49c2d46 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java @@ -183,7 +183,7 @@ public class FunctionScoreIT extends ESIntegTestCase { int scoreOffset = randomIntBetween(0, 2 * numDocs); int minScore = randomIntBetween(0, 2 * numDocs); for (int i = 0; i < numDocs; i++) { - docs.add(client().prepareIndex(INDEX).setId(Integer.toString(i)).setSource("num", i + scoreOffset)); + docs.add(prepareIndex(INDEX).setId(Integer.toString(i)).setSource("num", i + scoreOffset)); } indexRandom(true, docs); Script script = new Script(ScriptType.INLINE, CustomScriptPlugin.NAME, "return (doc['num'].value)", Collections.emptyMap()); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java index f191f627dcd7..c608c253c851 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java @@ -68,7 +68,7 @@ public class QueryRescorerIT extends ESIntegTestCase { // this int iters = scaledRandomIntBetween(10, 20); for (int i = 0; i < iters; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("f", Integer.toString(i)).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("f", Integer.toString(i)).get(); } refresh(); @@ -118,10 +118,9 @@ public class QueryRescorerIT extends ESIntegTestCase { ).setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", 1)) ); - client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); - client().prepareIndex("test").setId("2").setSource("field1", "the quick lazy huge brown fox jumps over the tree ").get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); + prepareIndex("test").setId("2").setSource("field1", "the quick lazy huge brown fox jumps over the tree ").get(); + prepareIndex("test").setId("3") .setSource("field1", "quick huge brown", "field2", "the quick lazy huge brown fox jumps over the tree") .get(); refresh(); @@ -179,21 +178,21 @@ public class QueryRescorerIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setMapping(mapping).setSettings(builder.put("index.number_of_shards", 1))); - client().prepareIndex("test").setId("1").setSource("field1", "massachusetts avenue boston massachusetts").get(); - client().prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts").get(); - client().prepareIndex("test").setId("3").setSource("field1", "boston avenue lexington massachusetts").get(); + prepareIndex("test").setId("1").setSource("field1", "massachusetts avenue boston massachusetts").get(); + prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts").get(); + prepareIndex("test").setId("3").setSource("field1", "boston avenue lexington massachusetts").get(); indicesAdmin().prepareRefresh("test").get(); - client().prepareIndex("test").setId("4").setSource("field1", "boston road lexington massachusetts").get(); - client().prepareIndex("test").setId("5").setSource("field1", "lexington street lexington massachusetts").get(); - client().prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); - client().prepareIndex("test").setId("7").setSource("field1", "bosten street san franciso california").get(); + prepareIndex("test").setId("4").setSource("field1", "boston road lexington massachusetts").get(); + prepareIndex("test").setId("5").setSource("field1", "lexington street lexington massachusetts").get(); + prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); + prepareIndex("test").setId("7").setSource("field1", "bosten street san franciso california").get(); indicesAdmin().prepareRefresh("test").get(); - client().prepareIndex("test").setId("8").setSource("field1", "hollywood boulevard los angeles california").get(); - client().prepareIndex("test").setId("9").setSource("field1", "1st street boston massachussetts").get(); - client().prepareIndex("test").setId("10").setSource("field1", "1st street boston massachusetts").get(); + prepareIndex("test").setId("8").setSource("field1", "hollywood boulevard los angeles california").get(); + prepareIndex("test").setId("9").setSource("field1", "1st street boston massachussetts").get(); + prepareIndex("test").setId("10").setSource("field1", "1st street boston massachusetts").get(); indicesAdmin().prepareRefresh("test").get(); - client().prepareIndex("test").setId("11").setSource("field1", "2st street boston massachusetts").get(); - client().prepareIndex("test").setId("12").setSource("field1", "3st street boston massachusetts").get(); + prepareIndex("test").setId("11").setSource("field1", "2st street boston massachusetts").get(); + prepareIndex("test").setId("12").setSource("field1", "3st street boston massachusetts").get(); indicesAdmin().prepareRefresh("test").get(); assertResponse( prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "lexington avenue massachusetts").operator(Operator.OR)) @@ -270,11 +269,11 @@ public class QueryRescorerIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setMapping(mapping).setSettings(builder.put("index.number_of_shards", 1))); - client().prepareIndex("test").setId("3").setSource("field1", "massachusetts").get(); - client().prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); + prepareIndex("test").setId("3").setSource("field1", "massachusetts").get(); + prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); indicesAdmin().prepareRefresh("test").get(); - client().prepareIndex("test").setId("1").setSource("field1", "lexington massachusetts avenue").get(); - client().prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get(); + prepareIndex("test").setId("1").setSource("field1", "lexington massachusetts avenue").get(); + prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get(); indicesAdmin().prepareRefresh("test").get(); assertResponse(prepareSearch().setQuery(QueryBuilders.matchQuery("field1", "massachusetts")).setFrom(0).setSize(5), response -> { @@ -350,11 +349,11 @@ public class QueryRescorerIT extends ESIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setMapping(mapping).setSettings(builder.put("index.number_of_shards", 1))); - client().prepareIndex("test").setId("3").setSource("field1", "massachusetts").get(); - client().prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); + prepareIndex("test").setId("3").setSource("field1", "massachusetts").get(); + prepareIndex("test").setId("6").setSource("field1", "massachusetts avenue lexington massachusetts").get(); indicesAdmin().prepareRefresh("test").get(); - client().prepareIndex("test").setId("1").setSource("field1", "lexington massachusetts avenue").get(); - client().prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get(); + prepareIndex("test").setId("1").setSource("field1", "lexington massachusetts avenue").get(); + prepareIndex("test").setId("2").setSource("field1", "lexington avenue boston massachusetts road").get(); indicesAdmin().prepareRefresh("test").get(); assertResponse( @@ -499,10 +498,9 @@ public class QueryRescorerIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); - client().prepareIndex("test").setId("2").setSource("field1", "the quick lazy huge brown fox jumps over the tree").get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); + prepareIndex("test").setId("2").setSource("field1", "the quick lazy huge brown fox jumps over the tree").get(); + prepareIndex("test").setId("3") .setSource("field1", "quick huge brown", "field2", "the quick lazy huge brown fox jumps over the tree") .get(); refresh(); @@ -783,7 +781,7 @@ public class QueryRescorerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i)); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i)); } indexRandom(true, dummyDocs, docs); @@ -795,7 +793,7 @@ public class QueryRescorerIT extends ESIntegTestCase { public void testFromSize() throws Exception { assertAcked(prepareCreate("test").setSettings(indexSettings(1, 0))); for (int i = 0; i < 5; i++) { - client().prepareIndex("test").setId("" + i).setSource("text", "hello world").get(); + prepareIndex("test").setId("" + i).setSource("text", "hello world").get(); } refresh(); @@ -811,7 +809,7 @@ public class QueryRescorerIT extends ESIntegTestCase { public void testRescorePhaseWithInvalidSort() throws Exception { assertAcked(prepareCreate("test")); for (int i = 0; i < 5; i++) { - client().prepareIndex("test").setId("" + i).setSource("number", 0).get(); + prepareIndex("test").setId("" + i).setSource("number", 0).get(); } refresh(); 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 5109491c5fac..8f178397f508 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java @@ -157,8 +157,7 @@ public class RandomScoreFunctionIT extends ESIntegTestCase { int docCount = randomIntBetween(100, 200); for (int i = 0; i < docCount; i++) { - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) // we add 1 to the index field to make sure that the scripts below never compute log(0) .setSource("body", randomFrom(Arrays.asList("foo", "bar", "baz")), "index", i + 1) .get(); 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 1ade5bfa3b71..37c78ec56833 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoDistanceIT.java @@ -109,8 +109,7 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testDistanceScript() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("name", "TestPosition") @@ -191,8 +190,7 @@ public class GeoDistanceIT extends ESIntegTestCase { } public void testGeoDistanceAggregation() throws IOException { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("name", "TestPosition") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPointScriptDocValuesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPointScriptDocValuesIT.java index c3ff5db7ebf6..3b2d266e77cd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPointScriptDocValuesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPointScriptDocValuesIT.java @@ -147,8 +147,7 @@ public class GeoPointScriptDocValuesIT extends ESSingleNodeTestCase { public void testRandomPoint() throws Exception { final double lat = GeometryTestUtils.randomLat(); final double lon = GeometryTestUtils.randomLon(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("name", "TestPosition").field("location", new double[] { lon, lat }).endObject()) .get(); @@ -194,7 +193,7 @@ public class GeoPointScriptDocValuesIT extends ESSingleNodeTestCase { } XContentBuilder builder = jsonBuilder().startObject().field("name", "TestPosition").field("location", values).endObject(); - client().prepareIndex("test").setId("1").setSource(builder).get(); + prepareIndex("test").setId("1").setSource(builder).get(); client().admin().indices().prepareRefresh("test").get(); @@ -233,8 +232,7 @@ public class GeoPointScriptDocValuesIT extends ESSingleNodeTestCase { } public void testNullPoint() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("name", "TestPosition").nullField("location").endObject()) .get(); 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 97c8aa0ea9e3..e929487af924 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/geo/GeoPolygonIT.java @@ -48,8 +48,7 @@ public class GeoPolygonIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("name", "New York") @@ -60,8 +59,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 5.286 km - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("name", "Times Square") @@ -72,8 +70,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 0.4621 km - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("name", "Tribeca") @@ -84,8 +81,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 1.055 km - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource( jsonBuilder().startObject() .field("name", "Wall Street") @@ -96,8 +92,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 1.258 km - client().prepareIndex("test") - .setId("5") + prepareIndex("test").setId("5") .setSource( jsonBuilder().startObject() .field("name", "Soho") @@ -108,8 +103,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 2.029 km - client().prepareIndex("test") - .setId("6") + prepareIndex("test").setId("6") .setSource( jsonBuilder().startObject() .field("name", "Greenwich Village") @@ -120,8 +114,7 @@ public class GeoPolygonIT extends ESIntegTestCase { .endObject() ), // to NY: 8.572 km - client().prepareIndex("test") - .setId("7") + prepareIndex("test").setId("7") .setSource( jsonBuilder().startObject() .field("name", "Brooklyn") 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 93891a12dd86..d79bb903bdb6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java @@ -291,8 +291,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { public void testMoreLikeThisIssue2197() throws Exception { indicesAdmin().prepareCreate("foo").get(); - client().prepareIndex("foo") - .setId("1") + prepareIndex("foo").setId("1") .setSource(jsonBuilder().startObject().startObject("foo").field("bar", "boz").endObject().endObject()) .get(); indicesAdmin().prepareRefresh("foo").get(); @@ -307,8 +306,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { indicesAdmin().prepareCreate("foo").get(); ensureGreen(); - client().prepareIndex("foo") - .setId("1") + prepareIndex("foo").setId("1") .setSource(jsonBuilder().startObject().startObject("foo").field("bar", "boz").endObject().endObject()) .setRouting("2") .get(); @@ -322,8 +320,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { assertAcked(prepareCreate("foo", 2, indexSettings(2, 0))); ensureGreen(); - client().prepareIndex("foo") - .setId("1") + prepareIndex("foo").setId("1") .setSource(jsonBuilder().startObject().startObject("foo").field("bar", "boz").endObject().endObject()) .setRouting("4000") .get(); @@ -349,12 +346,10 @@ public class MoreLikeThisIT extends ESIntegTestCase { .endObject() ).get(); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("string_value", "lucene index").field("int_value", 1).endObject()) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("string_value", "elasticsearch index").field("int_value", 42).endObject()) .get(); @@ -562,9 +557,9 @@ public class MoreLikeThisIT extends ESIntegTestCase { logger.info("Indexing..."); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("test").setSource("text", "lucene").setId("1")); - builders.add(client().prepareIndex("test").setSource("text", "lucene release").setId("2")); - builders.add(client().prepareIndex("test").setSource("text", "apache lucene").setId("3")); + builders.add(prepareIndex("test").setSource("text", "lucene").setId("1")); + builders.add(prepareIndex("test").setSource("text", "lucene release").setId("2")); + builders.add(prepareIndex("test").setSource("text", "apache lucene").setId("3")); indexRandom(true, builders); logger.info("Running MoreLikeThis"); @@ -588,10 +583,10 @@ public class MoreLikeThisIT extends ESIntegTestCase { String[] values = { "aaaa", "bbbb", "cccc", "dddd", "eeee", "ffff", "gggg", "hhhh", "iiii", "jjjj" }; List builders = new ArrayList<>(values.length + 1); // index one document with all the values - builders.add(client().prepareIndex("test").setId("0").setSource("text", values)); + builders.add(prepareIndex("test").setId("0").setSource("text", values)); // index each document with only one of the values for (int i = 0; i < values.length; i++) { - builders.add(client().prepareIndex("test").setId(String.valueOf(i + 1)).setSource("text", values[i])); + builders.add(prepareIndex("test").setId(String.valueOf(i + 1)).setSource("text", values[i])); } indexRandom(true, builders); @@ -623,7 +618,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { for (int j = 1; j <= 10 - i; j++) { text += j + " "; } - builders.add(client().prepareIndex("test").setId(i + "").setSource("text", text)); + builders.add(prepareIndex("test").setId(i + "").setSource("text", text)); } indexRandom(true, builders); @@ -658,7 +653,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { doc.field("field" + i, generateRandomStringArray(5, 10, false) + "a"); // make sure they are not all empty } doc.endObject(); - indexRandom(true, client().prepareIndex("test").setId("0").setSource(doc)); + indexRandom(true, prepareIndex("test").setId("0").setSource(doc)); logger.info("Checking the document matches ..."); // routing to ensure we hit the shard with the doc @@ -677,8 +672,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { logger.info("Creating an index with a single document ..."); indexRandom( true, - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("text", "Hello World!").field("date", "2009-01-01").endObject()) ); @@ -723,7 +717,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { logger.info("Indexing each field value of this document as a single document."); List builders = new ArrayList<>(); for (int i = 0; i < numFields; i++) { - builders.add(client().prepareIndex("test").setId(i + "").setSource("field" + i, i + "")); + builders.add(prepareIndex("test").setId(i + "").setSource("field" + i, i + "")); } indexRandom(true, builders); @@ -754,11 +748,9 @@ public class MoreLikeThisIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("text", "hello world").field("text1", "elasticsearch").endObject()), - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("text", "goodby moon").field("text1", "elasticsearch").endObject()) ); @@ -776,9 +768,9 @@ public class MoreLikeThisIT extends ESIntegTestCase { } public void testWithRouting() throws IOException { - client().prepareIndex("index").setId("1").setRouting("3").setSource("text", "this is a document").get(); - client().prepareIndex("index").setId("2").setRouting("1").setSource("text", "this is another document").get(); - client().prepareIndex("index").setId("3").setRouting("4").setSource("text", "this is yet another document").get(); + prepareIndex("index").setId("1").setRouting("3").setSource("text", "this is a document").get(); + prepareIndex("index").setId("2").setRouting("1").setSource("text", "this is another document").get(); + prepareIndex("index").setId("3").setRouting("4").setSource("text", "this is yet another document").get(); refresh("index"); Item item = new Item("index", "2").routing("1"); 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 aa418288b8eb..5fae20183272 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/msearch/MultiSearchIT.java @@ -39,8 +39,8 @@ public class MultiSearchIT extends ESIntegTestCase { public void testSimpleMultiSearch() { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "xxx").get(); - client().prepareIndex("test").setId("2").setSource("field", "yyy").get(); + prepareIndex("test").setId("1").setSource("field", "xxx").get(); + prepareIndex("test").setId("2").setSource("field", "yyy").get(); refresh(); MultiSearchResponse response = client().prepareMultiSearch() .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) @@ -63,7 +63,7 @@ public class MultiSearchIT extends ESIntegTestCase { createIndex("test"); int numDocs = randomIntBetween(0, 16); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } refresh(); @@ -92,8 +92,8 @@ public class MultiSearchIT extends ESIntegTestCase { TransportVersion transportVersion = TransportVersionUtils.getNextVersion(TransportVersions.MINIMUM_CCS_VERSION, true); createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "xxx").get(); - client().prepareIndex("test").setId("2").setSource("field", "yyy").get(); + prepareIndex("test").setId("1").setSource("field", "xxx").get(); + prepareIndex("test").setId("2").setSource("field", "yyy").get(); refresh(); MultiSearchResponse response = client().prepareMultiSearch() .add(prepareSearch("test").setQuery(QueryBuilders.termQuery("field", "xxx"))) 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 e238a254b784..245fb1651f4d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/NestedWithMinScoreIT.java @@ -95,7 +95,7 @@ public class NestedWithMinScoreIT extends ESIntegTestCase { doc.endArray(); doc.endObject(); - client().prepareIndex("test").setId("d1").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).setSource(doc).get(); + prepareIndex("test").setId("d1").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).setSource(doc).get(); final BoolQueryBuilder childQuery = new BoolQueryBuilder().filter( new MatchPhraseQueryBuilder("toolTracks.data", "cash dispenser, automated teller machine, automatic teller machine") ).filter(new RangeQueryBuilder("toolTracks.confidence").from(0.8)); 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 f5f672c1fed9..37c08668ba17 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java @@ -56,8 +56,7 @@ public class SimpleNestedIT extends ESIntegTestCase { assertHitCount(prepareSearch("test"), 0L); assertHitCount(prepareSearch("test").setQuery(termQuery("n_field1", "n_value1_1")), 0L); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -102,8 +101,7 @@ public class SimpleNestedIT extends ESIntegTestCase { // add another doc, one that would match if it was not nested... - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -197,8 +195,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field", "value") @@ -347,8 +344,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -366,8 +362,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("field1", "value2") @@ -407,8 +402,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -461,8 +455,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", 1) @@ -477,8 +470,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("field1", 2) @@ -493,8 +485,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("field1", 3) @@ -564,8 +555,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", 1) @@ -582,8 +572,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("field1", 2) @@ -602,8 +591,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); // Doc with missing nested docs if nested filter is used refresh(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("field1", 3) @@ -694,7 +682,7 @@ public class SimpleNestedIT extends ESIntegTestCase { }""")); ensureGreen(); - client().prepareIndex("test").setId("1").setSource(""" + prepareIndex("test").setId("1").setSource(""" { "acl": [ { @@ -744,7 +732,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ] }""", XContentType.JSON).get(); - client().prepareIndex("test").setId("2").setSource(""" + prepareIndex("test").setId("2").setSource(""" { "acl": [ { @@ -924,7 +912,7 @@ public class SimpleNestedIT extends ESIntegTestCase { """)); ensureGreen(); - client().prepareIndex("test").setId("1").setSource(""" + prepareIndex("test").setId("1").setSource(""" { "nested1": [ { @@ -938,7 +926,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ] }""", XContentType.JSON).get(); - client().prepareIndex("test").setId("2").setSource(""" + prepareIndex("test").setId("2").setSource(""" { "nested1": [ { @@ -1009,8 +997,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ensureGreen(); // sum: 11 - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("grand_parent_values", 1L) @@ -1052,8 +1039,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); // sum: 7 - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("grand_parent_values", 2L) @@ -1095,8 +1081,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); // sum: 2 - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field("grand_parent_values", 3L) @@ -1407,8 +1392,7 @@ public class SimpleNestedIT extends ESIntegTestCase { ) ); - DocWriteResponse indexResponse1 = client().prepareIndex("test") - .setId("1") + DocWriteResponse indexResponse1 = prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("officelocation", "gendale") @@ -1461,8 +1445,7 @@ public class SimpleNestedIT extends ESIntegTestCase { .get(); assertTrue(indexResponse1.getShardInfo().getSuccessful() > 0); - DocWriteResponse indexResponse2 = client().prepareIndex("test") - .setId("2") + DocWriteResponse indexResponse2 = prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("officelocation", "gendale") @@ -1550,8 +1533,8 @@ public class SimpleNestedIT extends ESIntegTestCase { } assertAcked(prepareCreate("test").setSettings(settingsBuilder)); - client().prepareIndex("test").setId("0").setSource("field", "value").get(); - client().prepareIndex("test").setId("1").setSource("field", "value").get(); + prepareIndex("test").setId("0").setSource("field", "value").get(); + prepareIndex("test").setId("1").setSource("field", "value").get(); refresh(); ensureSearchable("test"); @@ -1570,11 +1553,11 @@ public class SimpleNestedIT extends ESIntegTestCase { .endArray() .endObject(); // index simple data - client().prepareIndex("test").setId("2").setSource(builder).get(); - client().prepareIndex("test").setId("3").setSource(builder).get(); - client().prepareIndex("test").setId("4").setSource(builder).get(); - client().prepareIndex("test").setId("5").setSource(builder).get(); - client().prepareIndex("test").setId("6").setSource(builder).get(); + prepareIndex("test").setId("2").setSource(builder).get(); + prepareIndex("test").setId("3").setSource(builder).get(); + prepareIndex("test").setId("4").setSource(builder).get(); + prepareIndex("test").setId("5").setSource(builder).get(); + prepareIndex("test").setId("6").setSource(builder).get(); refresh(); ensureSearchable("test"); 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 483296442754..d3e20843bdbe 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/nested/VectorNestedIT.java @@ -47,8 +47,7 @@ public class VectorNestedIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startArray("nested") 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 560806a68c90..0acf9be574ff 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 @@ -105,14 +105,13 @@ public class AggregationProfilerIT extends ESIntegTestCase { for (int i = 0; i < 5; i++) { builders.add( - client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field(STRING_FIELD, randomFrom(randomStrings)) - .field(NUMBER_FIELD, randomIntBetween(0, 9)) - .field(TAG_FIELD, randomBoolean() ? "more" : "less") - .endObject() - ) + prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field(STRING_FIELD, randomFrom(randomStrings)) + .field(NUMBER_FIELD, randomIntBetween(0, 9)) + .field(TAG_FIELD, randomBoolean() ? "more" : "less") + .endObject() + ) ); } @@ -643,7 +642,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < RangeAggregator.DOCS_PER_RANGE_TO_USE_FILTERS * 2; i++) { String date = Instant.ofEpochSecond(i).toString(); - builders.add(client().prepareIndex("dateidx").setSource(jsonBuilder().startObject().field("date", date).endObject())); + builders.add(prepareIndex("dateidx").setSource(jsonBuilder().startObject().field("date", date).endObject())); } indexRandom(true, false, builders); @@ -721,8 +720,7 @@ public class AggregationProfilerIT extends ESIntegTestCase { for (int i = 0; i < RangeAggregator.DOCS_PER_RANGE_TO_USE_FILTERS * 2; i++) { String date = Instant.ofEpochSecond(i).toString(); builders.add( - client().prepareIndex("date_filter_by_filter_disabled") - .setSource(jsonBuilder().startObject().field("date", date).endObject()) + prepareIndex("date_filter_by_filter_disabled").setSource(jsonBuilder().startObject().field("date", date).endObject()) ); } indexRandom(true, false, builders); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java index 0bc23d9bd331..c6d3a6733d2f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/profile/dfs/DfsProfilerIT.java @@ -50,8 +50,7 @@ public class DfsProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(10, 50); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex(indexName) - .setId(String.valueOf(i)) + docs[i] = prepareIndex(indexName).setId(String.valueOf(i)) .setSource( textField, English.intToEnglish(i), 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 9aa5a85dba97..cd732a499234 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 @@ -50,7 +50,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } List stringFields = Arrays.asList("field1"); @@ -98,8 +98,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test") - .setId(String.valueOf(i)) + docs[i] = prepareIndex("test").setId(String.valueOf(i)) .setSource("id", String.valueOf(i), "field1", English.intToEnglish(i), "field2", i); } @@ -175,7 +174,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -215,7 +214,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -274,7 +273,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -317,7 +316,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -357,7 +356,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -397,7 +396,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -437,7 +436,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); @@ -476,8 +475,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test") - .setId(String.valueOf(i)) + docs[i] = prepareIndex("test").setId(String.valueOf(i)) .setSource("field1", English.intToEnglish(i) + " " + English.intToEnglish(i + 1), "field2", i); } @@ -530,7 +528,7 @@ public class QueryProfilerIT extends ESIntegTestCase { int numDocs = randomIntBetween(100, 150); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - docs[i] = client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); + docs[i] = prepareIndex("test").setId(String.valueOf(i)).setSource("field1", English.intToEnglish(i), "field2", i); } indexRandom(true, docs); 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 846696c81e28..81c612107e44 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ExistsIT.java @@ -95,7 +95,7 @@ public class ExistsIT extends ESIntegTestCase { emptyMap() }; List reqs = new ArrayList<>(); for (Map source : sources) { - reqs.add(client().prepareIndex("idx").setSource(source)); + reqs.add(prepareIndex("idx").setSource(source)); } // We do NOT index dummy documents, otherwise the type for these dummy documents // would have _field_names indexed while the current type might not which might @@ -183,11 +183,11 @@ public class ExistsIT extends ESIntegTestCase { ensureGreen("idx"); List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("idx").setSource(emptyMap())); - indexRequests.add(client().prepareIndex("idx").setSource(emptyMap())); - indexRequests.add(client().prepareIndex("idx").setSource("bar", 3)); - indexRequests.add(client().prepareIndex("idx").setSource("foo", singletonMap("bar", 2.718))); - indexRequests.add(client().prepareIndex("idx").setSource("foo", singletonMap("bar", 6.283))); + indexRequests.add(prepareIndex("idx").setSource(emptyMap())); + indexRequests.add(prepareIndex("idx").setSource(emptyMap())); + indexRequests.add(prepareIndex("idx").setSource("bar", 3)); + indexRequests.add(prepareIndex("idx").setSource("foo", singletonMap("bar", 2.718))); + indexRequests.add(prepareIndex("idx").setSource("foo", singletonMap("bar", 6.283))); indexRandom(true, false, indexRequests); Map expected = new LinkedHashMap<>(); @@ -223,10 +223,10 @@ public class ExistsIT extends ESIntegTestCase { ensureGreen("idx"); List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("idx").setSource(emptyMap())); - indexRequests.add(client().prepareIndex("idx").setSource(emptyMap())); - indexRequests.add(client().prepareIndex("idx").setSource("foo", 3)); - indexRequests.add(client().prepareIndex("idx").setSource("foo", 43)); + indexRequests.add(prepareIndex("idx").setSource(emptyMap())); + indexRequests.add(prepareIndex("idx").setSource(emptyMap())); + indexRequests.add(prepareIndex("idx").setSource("foo", 3)); + indexRequests.add(prepareIndex("idx").setSource("foo", 43)); indexRandom(true, false, indexRequests); assertHitCountAndNoFailures(prepareSearch("idx").setQuery(QueryBuilders.existsQuery("foo-alias")), 2L); 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 fd119d314535..50a1924843e7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/IntervalQueriesIT.java @@ -51,9 +51,9 @@ public class IntervalQueriesIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("nested").setId("1").setSource("text", "the quick brown fox jumps"), - client().prepareIndex("nested").setId("2").setSource("text", "quick brown"), - client().prepareIndex("nested").setId("3").setSource("text", "quick") + prepareIndex("nested").setId("1").setSource("text", "the quick brown fox jumps"), + prepareIndex("nested").setId("2").setSource("text", "quick brown"), + prepareIndex("nested").setId("3").setSource("text", "quick") ); assertNoFailures( 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 26c2da7736f6..2d77e170abdc 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/MultiMatchQueryIT.java @@ -91,8 +91,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { int numDocs = scaledRandomIntBetween(50, 100); List builders = new ArrayList<>(); builders.add( - client().prepareIndex("test") - .setId("theone") + prepareIndex("test").setId("theone") .setSource( "id", "theone", @@ -111,8 +110,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) ); builders.add( - client().prepareIndex("test") - .setId("theother") + prepareIndex("test").setId("theother") .setSource( "id", "theother", @@ -130,8 +128,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ); builders.add( - client().prepareIndex("test") - .setId("ultimate1") + prepareIndex("test").setId("ultimate1") .setSource( "id", "ultimate1", @@ -148,8 +145,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ) ); builders.add( - client().prepareIndex("test") - .setId("ultimate2") + prepareIndex("test").setId("ultimate2") .setSource( "full_name", "Man the Ultimate Ninja", @@ -165,8 +161,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ); builders.add( - client().prepareIndex("test") - .setId("anotherhero") + prepareIndex("test").setId("anotherhero") .setSource( "id", "anotherhero", @@ -184,8 +179,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { ); builders.add( - client().prepareIndex("test") - .setId("nowHero") + prepareIndex("test").setId("nowHero") .setSource( "id", "nowHero", @@ -212,8 +206,7 @@ public class MultiMatchQueryIT extends ESIntegTestCase { String first = RandomPicks.randomFrom(random(), firstNames); String last = randomPickExcept(lastNames, first); builders.add( - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) .setSource( "id", i, @@ -919,8 +912,8 @@ public class MultiMatchQueryIT extends ESIntegTestCase { assertAcked(builder.setMapping("title", "type=text", "body", "type=text")); ensureGreen(); List builders = new ArrayList<>(); - builders.add(client().prepareIndex(idx).setId("1").setSource("title", "foo", "body", "bar")); - builders.add(client().prepareIndex(idx).setId("2").setSource("title", "bar", "body", "foo")); + builders.add(prepareIndex(idx).setId("1").setSource("title", "foo", "body", "bar")); + builders.add(prepareIndex(idx).setId("2").setSource("title", "bar", "body", "foo")); indexRandom(true, false, builders); assertResponse( 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 f10110691718..d8787b6ef7b1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/QueryStringIT.java @@ -44,9 +44,9 @@ public class QueryStringIT extends ESIntegTestCase { public void testBasicAllQuery() throws Exception { List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f1", "foo bar baz")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f2", "Bar")); - reqs.add(client().prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo bar baz")); + reqs.add(prepareIndex("test").setId("2").setSource("f2", "Bar")); + reqs.add(prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(queryStringQuery("foo")), response -> { @@ -65,8 +65,8 @@ public class QueryStringIT extends ESIntegTestCase { public void testWithDate() throws Exception { List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(queryStringQuery("foo bar")), response -> { @@ -89,12 +89,8 @@ public class QueryStringIT extends ESIntegTestCase { public void testWithLotsOfTypes() throws Exception { List reqs = new ArrayList<>(); - reqs.add( - client().prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02", "f_float", "1.7", "f_ip", "127.0.0.1") - ); - reqs.add( - client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01", "f_float", "1.8", "f_ip", "127.0.0.2") - ); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02", "f_float", "1.7", "f_ip", "127.0.0.1")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01", "f_float", "1.8", "f_ip", "127.0.0.2")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(queryStringQuery("foo bar")), response -> { @@ -118,7 +114,7 @@ public class QueryStringIT extends ESIntegTestCase { public void testDocWithAllTypes() throws Exception { List reqs = new ArrayList<>(); String docBody = copyToStringFromClasspath("/org/elasticsearch/search/query/all-example-document.json"); - reqs.add(client().prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); + reqs.add(prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(queryStringQuery("foo")), response -> assertHits(response.getHits(), "1")); @@ -142,9 +138,9 @@ public class QueryStringIT extends ESIntegTestCase { public void testKeywordWithWhitespace() throws Exception { List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f2", "Foo Bar")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar")); - reqs.add(client().prepareIndex("test").setId("3").setSource("f1", "foo bar")); + reqs.add(prepareIndex("test").setId("1").setSource("f2", "Foo Bar")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar")); + reqs.add(prepareIndex("test").setId("3").setSource("f1", "foo bar")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(queryStringQuery("foo")), response -> { @@ -169,7 +165,7 @@ public class QueryStringIT extends ESIntegTestCase { ensureGreen("test_1"); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test_1").setId("1").setSource("f1", "foo", "f2", "eggplant")); + reqs.add(prepareIndex("test_1").setId("1").setSource("f1", "foo", "f2", "eggplant")); indexRandom(true, false, reqs); assertHitCount(prepareSearch("test_1").setQuery(queryStringQuery("foo eggplant").defaultOperator(Operator.AND)), 0L); @@ -182,8 +178,8 @@ public class QueryStringIT extends ESIntegTestCase { public void testPhraseQueryOnFieldWithNoPositions() throws Exception { List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f1", "foo bar", "f4", "eggplant parmesan")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "foo bar", "f4", "chicken parmesan")); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo bar", "f4", "eggplant parmesan")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "foo bar", "f4", "chicken parmesan")); indexRandom(true, false, reqs); assertHitCount(prepareSearch("test").setQuery(queryStringQuery("\"eggplant parmesan\"").lenient(true)), 0L); @@ -215,9 +211,9 @@ public class QueryStringIT extends ESIntegTestCase { public void testFieldAlias() throws Exception { List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); - indexRequests.add(client().prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); - indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); + indexRequests.add(prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); assertNoFailuresAndResponse(prepareSearch("test").setQuery(queryStringQuery("value").field("f3_alias")), response -> { @@ -228,9 +224,9 @@ public class QueryStringIT extends ESIntegTestCase { public void testFieldAliasWithEmbeddedFieldNames() throws Exception { List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); - indexRequests.add(client().prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); - indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); + indexRequests.add(prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); assertNoFailuresAndResponse(prepareSearch("test").setQuery(queryStringQuery("f3_alias:value AND f2:three")), response -> { @@ -241,9 +237,9 @@ public class QueryStringIT extends ESIntegTestCase { public void testFieldAliasWithWildcardField() throws Exception { List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); - indexRequests.add(client().prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); - indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); + indexRequests.add(prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); assertNoFailuresAndResponse(prepareSearch("test").setQuery(queryStringQuery("value").field("f3_*")), response -> { @@ -254,7 +250,7 @@ public class QueryStringIT extends ESIntegTestCase { public void testFieldAliasOnDisallowedFieldType() throws Exception { List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); indexRandom(true, false, indexRequests); // The wildcard field matches aliases for both a text and geo_point field. 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 95ad5560aacd..0a35c3367334 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/ScriptScoreQueryIT.java @@ -66,7 +66,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { assertAcked(prepareCreate("test-index").setMapping("field1", "type=text", "field2", "type=double")); int docCount = 10; for (int i = 1; i <= docCount; i++) { - client().prepareIndex("test-index").setId("" + i).setSource("field1", "text" + (i % 2), "field2", i).get(); + prepareIndex("test-index").setId("" + i).setSource("field1", "text" + (i % 2), "field2", i).get(); } refresh(); @@ -94,7 +94,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { assertAcked(prepareCreate("test-index").setMapping("field1", "type=text", "field2", "type=double")); int docCount = 10; for (int i = 1; i <= docCount; i++) { - client().prepareIndex("test-index").setId("" + i).setSource("field1", "text" + i, "field2", i).get(); + prepareIndex("test-index").setId("" + i).setSource("field1", "text" + i, "field2", i).get(); } refresh(); @@ -115,9 +115,9 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { prepareCreate("test-index2").setSettings(Settings.builder().put("index.number_of_shards", 1)) .setMapping("field1", "type=date", "field2", "type=double") ); - client().prepareIndex("test-index2").setId("1").setSource("field1", "2019-09-01", "field2", 1).get(); - client().prepareIndex("test-index2").setId("2").setSource("field1", "2019-10-01", "field2", 2).get(); - client().prepareIndex("test-index2").setId("3").setSource("field1", "2019-11-01", "field2", 3).get(); + prepareIndex("test-index2").setId("1").setSource("field1", "2019-09-01", "field2", 1).get(); + prepareIndex("test-index2").setId("2").setSource("field1", "2019-10-01", "field2", 2).get(); + prepareIndex("test-index2").setId("3").setSource("field1", "2019-11-01", "field2", 3).get(); refresh(); RangeQueryBuilder rangeQB = new RangeQueryBuilder("field1").from("2019-01-01"); // the query should be rewritten to from:null @@ -133,7 +133,7 @@ public class ScriptScoreQueryIT extends ESIntegTestCase { assertAcked(prepareCreate("test-index").setMapping("field1", "type=text", "field2", "type=double")); int docCount = 10; for (int i = 1; i <= docCount; i++) { - client().prepareIndex("test-index").setId("" + i).setSource("field1", "text" + (i % 2), "field2", i).get(); + prepareIndex("test-index").setId("" + i).setSource("field1", "text" + (i % 2), "field2", i).get(); } refresh(); 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 072922da5479..ea2decff18cd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -142,9 +142,9 @@ public class SearchQueryIT extends ESIntegTestCase { createIndex("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox jumps"), - client().prepareIndex("test").setId("2").setSource("field1", "quick brown"), - client().prepareIndex("test").setId("3").setSource("field1", "quick") + prepareIndex("test").setId("1").setSource("field1", "the quick brown fox jumps"), + prepareIndex("test").setId("2").setSource("field1", "quick brown"), + prepareIndex("test").setId("3").setSource("field1", "quick") ); assertHitCount(prepareSearch().setQuery(queryStringQuery("quick")), 3L); @@ -154,9 +154,9 @@ public class SearchQueryIT extends ESIntegTestCase { // see https://github.com/elastic/elasticsearch/issues/3177 public void testIssue3177() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field1", "value2").get(); - client().prepareIndex("test").setId("3").setSource("field1", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field1", "value2").get(); + prepareIndex("test").setId("3").setSource("field1", "value3").get(); ensureGreen(); waitForRelocation(); forceMerge(); @@ -186,8 +186,8 @@ public class SearchQueryIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("field1", "type=text,index_options=docs")); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "quick brown fox", "field2", "quick brown fox"), - client().prepareIndex("test").setId("2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox") + prepareIndex("test").setId("1").setSource("field1", "quick brown fox", "field2", "quick brown fox"), + prepareIndex("test").setId("2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox") ); assertHitCount(prepareSearch().setQuery(matchPhraseQuery("field2", "quick brown").slop(0)), 1L); @@ -205,8 +205,8 @@ public class SearchQueryIT extends ESIntegTestCase { createIndex("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "quick brown fox", "field2", "quick brown fox"), - client().prepareIndex("test").setId("2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox") + prepareIndex("test").setId("1").setSource("field1", "quick brown fox", "field2", "quick brown fox"), + prepareIndex("test").setId("2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox") ); assertResponse(prepareSearch().setQuery(constantScoreQuery(matchQuery("field1", "quick"))), response -> { @@ -253,7 +253,7 @@ public class SearchQueryIT extends ESIntegTestCase { int num = scaledRandomIntBetween(100, 200); IndexRequestBuilder[] builders = new IndexRequestBuilder[num]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test_1").setId("" + i).setSource("f", English.intToEnglish(i)); + builders[i] = prepareIndex("test_1").setId("" + i).setSource("f", English.intToEnglish(i)); } createIndex("test_1"); indexRandom(true, builders); @@ -291,11 +291,7 @@ public class SearchQueryIT extends ESIntegTestCase { // see #3521 public void testAllDocsQueryString() throws InterruptedException, ExecutionException { createIndex("test"); - indexRandom( - true, - client().prepareIndex("test").setId("1").setSource("foo", "bar"), - client().prepareIndex("test").setId("2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test").setId("1").setSource("foo", "bar"), prepareIndex("test").setId("2").setSource("foo", "bar")); int iters = scaledRandomIntBetween(100, 200); for (int i = 0; i < iters; i++) { @@ -315,7 +311,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testQueryStringAnalyzedWildcard() throws Exception { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); + prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); refresh(); assertHitCount(prepareSearch().setQuery(queryStringQuery("value*")), 1L); @@ -328,7 +324,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testLowercaseExpandedTerms() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); + prepareIndex("test").setId("1").setSource("field1", "value_1", "field2", "value_2").get(); refresh(); assertHitCount(prepareSearch().setQuery(queryStringQuery("VALUE_3~1")), 1L); @@ -346,7 +342,7 @@ public class SearchQueryIT extends ESIntegTestCase { ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC); String aMonthAgo = DateTimeFormatter.ISO_LOCAL_DATE.format(now.minusMonths(1)); String aMonthFromNow = DateTimeFormatter.ISO_LOCAL_DATE.format(now.plusMonths(1)); - client().prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); + prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); refresh(); assertHitCount(prepareSearch().setQuery(queryStringQuery("past:[now-2M/d TO now/d]")), 1L); @@ -369,7 +365,7 @@ public class SearchQueryIT extends ESIntegTestCase { ZoneId timeZone = randomZone(); String now = DateFormatter.forPattern("strict_date_optional_time").format(Instant.now().atZone(timeZone)); logger.info(" --> Using time_zone [{}], now is [{}]", timeZone.getId(), now); - client().prepareIndex("test").setId("1").setSource("past", now).get(); + prepareIndex("test").setId("1").setSource("past", now).get(); refresh(); assertHitCount(prepareSearch().setQuery(queryStringQuery("past:[now-1m/m TO now+1m/m]").timeZone(timeZone.getId())), 1L); @@ -381,8 +377,8 @@ public class SearchQueryIT extends ESIntegTestCase { // as with dynamic mappings some shards might be lacking behind and parse a different query assertAcked(prepareCreate("test").setMapping("past", "type=date")); - client().prepareIndex("test").setId("1").setSource("past", "2015-04-05T23:00:00+0000").get(); - client().prepareIndex("test").setId("2").setSource("past", "2015-04-06T00:00:00+0000").get(); + prepareIndex("test").setId("1").setSource("past", "2015-04-05T23:00:00+0000").get(); + prepareIndex("test").setId("2").setSource("past", "2015-04-06T00:00:00+0000").get(); refresh(); // Timezone set with dates @@ -409,9 +405,9 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "value1"), - client().prepareIndex("test").setId("2").setSource("field1", "value2"), - client().prepareIndex("test").setId("3").setSource("field1", "value3") + prepareIndex("test").setId("1").setSource("field1", "value1"), + prepareIndex("test").setId("2").setSource("field1", "value2"), + prepareIndex("test").setId("3").setSource("field1", "value3") ); assertSearchHitsWithoutFailures(prepareSearch().setQuery(constantScoreQuery(idsQuery().addIds("1", "3"))), "1", "3"); @@ -428,7 +424,7 @@ public class SearchQueryIT extends ESIntegTestCase { for (String indexName : indexNames) { assertAcked(indicesAdmin().prepareCreate(indexName)); - indexRandom(true, client().prepareIndex(indexName).setId(indexName + "1").setSource("field1", "value1")); + indexRandom(true, prepareIndex(indexName).setId(indexName + "1").setSource("field1", "value1")); } @@ -451,8 +447,7 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startObject("obj1") @@ -463,8 +458,7 @@ public class SearchQueryIT extends ESIntegTestCase { .field("field2", "value2_1") .endObject() ), - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .startObject("obj1") @@ -474,8 +468,7 @@ public class SearchQueryIT extends ESIntegTestCase { .field("field1", "value1_2") .endObject() ), - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .startObject("obj2") @@ -485,8 +478,7 @@ public class SearchQueryIT extends ESIntegTestCase { .field("field2", "value2_3") .endObject() ), - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource( jsonBuilder().startObject() .startObject("obj2") @@ -512,7 +504,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testPassQueryOrFilterAsJSONString() throws Exception { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value1_1", "field2", "value2_1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1_1", "field2", "value2_1").setRefreshPolicy(IMMEDIATE).get(); WrapperQueryBuilder wrapper = new WrapperQueryBuilder("{ \"term\" : { \"field1\" : \"value1_1\" } }"); assertHitCount(prepareSearch().setQuery(wrapper), 1L); @@ -527,7 +519,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testFiltersWithCustomCacheKey() throws Exception { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); refresh(); assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("field1", "value1"))), 1L); @@ -540,9 +532,9 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("long", 1L, "double", 1.0d), - client().prepareIndex("test").setId("2").setSource("long", 2L, "double", 2.0d), - client().prepareIndex("test").setId("3").setSource("long", 3L, "double", 3.0d) + prepareIndex("test").setId("1").setSource("long", 1L, "double", 1.0d), + prepareIndex("test").setId("2").setSource("long", 2L, "double", 2.0d), + prepareIndex("test").setId("3").setSource("long", 3L, "double", 3.0d) ); assertResponse(prepareSearch().setQuery(matchQuery("long", "1")), response -> { @@ -561,8 +553,8 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("text", "Unit"), - client().prepareIndex("test").setId("2").setSource("text", "Unity") + prepareIndex("test").setId("1").setSource("text", "Unit"), + prepareIndex("test").setId("2").setSource("text", "Unity") ); assertHitCount(prepareSearch().setQuery(matchQuery("text", "uniy").fuzziness(Fuzziness.fromEdits(0))), 0L); @@ -585,9 +577,9 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value4", "field3", "value3"), - client().prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value5", "field3", "value2"), - client().prepareIndex("test").setId("3").setSource("field1", "value3", "field2", "value6", "field3", "value1") + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value4", "field3", "value3"), + prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value5", "field3", "value2"), + prepareIndex("test").setId("3").setSource("field1", "value3", "field2", "value6", "field3", "value1") ); MultiMatchQueryBuilder builder = multiMatchQuery("value1 value2 value4", "field1", "field2"); @@ -620,7 +612,7 @@ public class SearchQueryIT extends ESIntegTestCase { assertSearchHits(response, "3", "1"); }); // Test lenient - client().prepareIndex("test").setId("3").setSource("field1", "value7", "field2", "value8", "field4", 5).get(); + prepareIndex("test").setId("3").setSource("field1", "value7", "field2", "value8", "field4", 5).get(); refresh(); builder = multiMatchQuery("value1", "field1", "field2", "field4"); @@ -653,8 +645,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testMatchQueryZeroTermsQuery() { assertAcked(prepareCreate("test").setMapping("field1", "type=text,analyzer=classic", "field2", "type=text,analyzer=classic")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field1", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field1", "value2").get(); refresh(); BoolQueryBuilder boolQuery = boolQuery().must(matchQuery("field1", "a").zeroTermsQuery(ZeroTermsQueryOption.NONE)) @@ -671,8 +663,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testMultiMatchQueryZeroTermsQuery() { assertAcked(prepareCreate("test").setMapping("field1", "type=text,analyzer=classic", "field2", "type=text,analyzer=classic")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); - client().prepareIndex("test").setId("2").setSource("field1", "value3", "field2", "value4").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId("2").setSource("field1", "value3", "field2", "value4").get(); refresh(); BoolQueryBuilder boolQuery = boolQuery().must(multiMatchQuery("a", "field1", "field2").zeroTermsQuery(ZeroTermsQueryOption.NONE)) @@ -690,8 +682,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testMultiMatchQueryMinShouldMatch() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", new String[] { "value1", "value2", "value3" }).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", new String[] { "value1", "value2", "value3" }).get(); + prepareIndex("test").setId("2").setSource("field2", "value1").get(); refresh(); MultiMatchQueryBuilder multiMatchQuery = multiMatchQuery("value1 value2 foo", "field1", "field2"); @@ -735,8 +727,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testBoolQueryMinShouldMatchBiggerThanNumberOfShouldClauses() throws IOException { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", new String[] { "value1", "value2", "value3" }).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value1").get(); + prepareIndex("test").setId("1").setSource("field1", new String[] { "value1", "value2", "value3" }).get(); + prepareIndex("test").setId("2").setSource("field2", "value1").get(); refresh(); BoolQueryBuilder boolQuery = boolQuery().must(termQuery("field1", "value1")) @@ -765,8 +757,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testFuzzyQueryString() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get(); - client().prepareIndex("test").setId("2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get(); + prepareIndex("test").setId("1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get(); + prepareIndex("test").setId("2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get(); refresh(); assertNoFailuresAndResponse(prepareSearch().setQuery(queryStringQuery("str:kimcy~1")), response -> { @@ -786,8 +778,8 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, false, - client().prepareIndex("test").setId("1").setSource("important", "phrase match", "less_important", "nothing important"), - client().prepareIndex("test").setId("2").setSource("important", "nothing important", "less_important", "phrase match") + prepareIndex("test").setId("1").setSource("important", "phrase match", "less_important", "nothing important"), + prepareIndex("test").setId("2").setSource("important", "nothing important", "less_important", "phrase match") ); assertResponse( @@ -803,8 +795,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testSpecialRangeSyntaxInQueryString() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get(); - client().prepareIndex("test").setId("2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get(); + prepareIndex("test").setId("1").setSource("str", "kimchy", "date", "2012-02-01", "num", 12).get(); + prepareIndex("test").setId("2").setSource("str", "shay", "date", "2012-02-05", "num", 20).get(); refresh(); assertResponse(prepareSearch().setQuery(queryStringQuery("num:>19")), response -> { @@ -828,10 +820,10 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("term", "1"), - client().prepareIndex("test").setId("2").setSource("term", "2"), - client().prepareIndex("test").setId("3").setSource("term", "3"), - client().prepareIndex("test").setId("4").setSource("term", "4") + prepareIndex("test").setId("1").setSource("term", "1"), + prepareIndex("test").setId("2").setSource("term", "2"), + prepareIndex("test").setId("3").setSource("term", "3"), + prepareIndex("test").setId("4").setSource("term", "4") ); assertHitCount(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("term", new String[0]))), 0L); assertHitCount(prepareSearch("test").setQuery(idsQuery()), 0L); @@ -842,10 +834,10 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("str", "1", "lng", 1L, "dbl", 1.0d), - client().prepareIndex("test").setId("2").setSource("str", "2", "lng", 2L, "dbl", 2.0d), - 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) + prepareIndex("test").setId("1").setSource("str", "1", "lng", 1L, "dbl", 1.0d), + prepareIndex("test").setId("2").setSource("str", "2", "lng", 2L, "dbl", 2.0d), + prepareIndex("test").setId("3").setSource("str", "3", "lng", 3L, "dbl", 3.0d), + prepareIndex("test").setId("4").setSource("str", "4", "lng", 4L, "dbl", 4.0d) ); assertSearchHitsWithoutFailures(prepareSearch("test").setQuery(constantScoreQuery(termsQuery("str", "1", "4"))), "1", "4"); assertSearchHitsWithoutFailures( @@ -902,12 +894,11 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("lookup").setId("1").setSource("terms", new String[] { "1", "3" }), - client().prepareIndex("lookup").setId("2").setSource("terms", new String[] { "2" }), - client().prepareIndex("lookup").setId("3").setSource("terms", new String[] { "2", "4" }), - client().prepareIndex("lookup").setId("4").setSource("other", "value"), - client().prepareIndex("lookup2") - .setId("1") + prepareIndex("lookup").setId("1").setSource("terms", new String[] { "1", "3" }), + prepareIndex("lookup").setId("2").setSource("terms", new String[] { "2" }), + prepareIndex("lookup").setId("3").setSource("terms", new String[] { "2", "4" }), + prepareIndex("lookup").setId("4").setSource("other", "value"), + prepareIndex("lookup2").setId("1") .setSource( XContentFactory.jsonBuilder() .startObject() @@ -921,8 +912,7 @@ public class SearchQueryIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("lookup2") - .setId("2") + prepareIndex("lookup2").setId("2") .setSource( XContentFactory.jsonBuilder() .startObject() @@ -933,8 +923,7 @@ public class SearchQueryIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("lookup2") - .setId("3") + prepareIndex("lookup2").setId("3") .setSource( XContentFactory.jsonBuilder() .startObject() @@ -948,11 +937,11 @@ public class SearchQueryIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("lookup3").setId("1").setSource("terms", new String[] { "1", "3" }), - client().prepareIndex("test").setId("1").setSource("term", "1"), - client().prepareIndex("test").setId("2").setSource("term", "2"), - client().prepareIndex("test").setId("3").setSource("term", "3"), - client().prepareIndex("test").setId("4").setSource("term", "4") + prepareIndex("lookup3").setId("1").setSource("terms", new String[] { "1", "3" }), + prepareIndex("test").setId("1").setSource("term", "1"), + prepareIndex("test").setId("2").setSource("term", "2"), + prepareIndex("test").setId("3").setSource("term", "3"), + prepareIndex("test").setId("4").setSource("term", "4") ); assertSearchHitsWithoutFailures( prepareSearch("test").setQuery(termsLookupQuery("term", new TermsLookup("lookup", "1", "terms"))), @@ -1016,9 +1005,9 @@ public class SearchQueryIT extends ESIntegTestCase { public void testBasicQueryById() throws Exception { assertAcked(prepareCreate("test")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field1", "value2").get(); - client().prepareIndex("test").setId("3").setSource("field1", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field1", "value2").get(); + prepareIndex("test").setId("3").setSource("field1", "value3").get(); refresh(); assertResponse(prepareSearch().setQuery(idsQuery().addIds("1", "2")), response -> { @@ -1061,18 +1050,15 @@ public class SearchQueryIT extends ESIntegTestCase { ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("num_byte", 1, "num_short", 1, "num_integer", 1, "num_long", 1, "num_float", 1, "num_double", 1) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource("num_byte", 2, "num_short", 2, "num_integer", 2, "num_long", 2, "num_float", 2, "num_double", 2) .get(); - client().prepareIndex("test") - .setId("17") + prepareIndex("test").setId("17") .setSource("num_byte", 17, "num_short", 17, "num_integer", 17, "num_long", 17, "num_float", 17, "num_double", 17) .get(); refresh(); @@ -1197,10 +1183,10 @@ public class SearchQueryIT extends ESIntegTestCase { ) ); - client().prepareIndex("test").setId("1").setSource("field1", "test1", "num_long", 1).get(); - client().prepareIndex("test").setId("2").setSource("field1", "test1", "num_long", 2).get(); - client().prepareIndex("test").setId("3").setSource("field1", "test2", "num_long", 3).get(); - client().prepareIndex("test").setId("4").setSource("field1", "test2", "num_long", 4).get(); + prepareIndex("test").setId("1").setSource("field1", "test1", "num_long", 1).get(); + prepareIndex("test").setId("2").setSource("field1", "test1", "num_long", 2).get(); + prepareIndex("test").setId("3").setSource("field1", "test2", "num_long", 3).get(); + prepareIndex("test").setId("4").setSource("field1", "test2", "num_long", 4).get(); refresh(); assertHitCount( @@ -1239,10 +1225,10 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("description", "foo other anything bar"), - client().prepareIndex("test").setId("2").setSource("description", "foo other anything"), - client().prepareIndex("test").setId("3").setSource("description", "foo other"), - client().prepareIndex("test").setId("4").setSource("description", "foo") + prepareIndex("test").setId("1").setSource("description", "foo other anything bar"), + prepareIndex("test").setId("2").setSource("description", "foo other anything"), + prepareIndex("test").setId("3").setSource("description", "foo other"), + prepareIndex("test").setId("4").setSource("description", "foo") ); assertHitCount(prepareSearch("test").setQuery(matchAllQuery()).setSearchType(SearchType.DFS_QUERY_THEN_FETCH), 4L); @@ -1256,10 +1242,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testIntervals() throws InterruptedException { createIndex("test"); - indexRandom( - true, - client().prepareIndex("test").setId("1").setSource("description", "it's cold outside, there's no kind of atmosphere") - ); + indexRandom(true, prepareIndex("test").setId("1").setSource("description", "it's cold outside, there's no kind of atmosphere")); String json = """ { @@ -1293,10 +1276,10 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("description", "foo other anything bar"), - client().prepareIndex("test").setId("2").setSource("description", "foo other anything"), - client().prepareIndex("test").setId("3").setSource("description", "foo other"), - client().prepareIndex("test").setId("4").setSource("description", "foo") + prepareIndex("test").setId("1").setSource("description", "foo other anything bar"), + prepareIndex("test").setId("2").setSource("description", "foo other anything"), + prepareIndex("test").setId("3").setSource("description", "foo other"), + prepareIndex("test").setId("4").setSource("description", "foo") ); assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanTermQuery("description", "bar"))), 1L); @@ -1311,10 +1294,10 @@ public class SearchQueryIT extends ESIntegTestCase { public void testSpanMultiTermQuery() throws IOException { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("description", "foo other anything bar", "count", 1).get(); - client().prepareIndex("test").setId("2").setSource("description", "foo other anything", "count", 2).get(); - client().prepareIndex("test").setId("3").setSource("description", "foo other", "count", 3).get(); - client().prepareIndex("test").setId("4").setSource("description", "fop", "count", 4).get(); + prepareIndex("test").setId("1").setSource("description", "foo other anything bar", "count", 1).get(); + prepareIndex("test").setId("2").setSource("description", "foo other anything", "count", 2).get(); + prepareIndex("test").setId("3").setSource("description", "foo other", "count", 3).get(); + prepareIndex("test").setId("4").setSource("description", "fop", "count", 4).get(); refresh(); assertHitCount(prepareSearch("test").setQuery(spanOrQuery(spanMultiTermQueryBuilder(fuzzyQuery("description", "fop")))), 4); @@ -1332,8 +1315,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testSpanNot() throws IOException, ExecutionException, InterruptedException { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("description", "the quick brown fox jumped over the lazy dog").get(); - client().prepareIndex("test").setId("2").setSource("description", "the quick black fox leaped over the sleeping dog").get(); + prepareIndex("test").setId("1").setSource("description", "the quick brown fox jumped over the lazy dog").get(); + prepareIndex("test").setId("2").setSource("description", "the quick black fox leaped over the sleeping dog").get(); refresh(); assertHitCount( @@ -1397,23 +1380,19 @@ public class SearchQueryIT extends ESIntegTestCase { ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRouting("Y") .setSource("online", false, "bs", "Y", "ts", System.currentTimeMillis() - 100, "type", "s") .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setRouting("X") .setSource("online", true, "bs", "X", "ts", System.currentTimeMillis() - 10000000, "type", "s") .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setRouting(randomAlphaOfLength(2)) .setSource("online", false, "ts", System.currentTimeMillis() - 100, "type", "bs") .get(); - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setRouting(randomAlphaOfLength(2)) .setSource("online", true, "ts", System.currentTimeMillis() - 123123, "type", "bs") .get(); @@ -1442,7 +1421,7 @@ public class SearchQueryIT extends ESIntegTestCase { } public void testMultiFieldQueryString() { - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); logger.info("regular"); assertHitCount(prepareSearch("test").setQuery(queryStringQuery("value1").field("field1").field("field2")), 1); @@ -1465,7 +1444,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testMultiMatchLenientIssue3797() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field1", 123, "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", 123, "field2", "value2").get(); refresh(); assertHitCount(prepareSearch("test").setQuery(multiMatchQuery("value2", "field2").field("field1", 2).lenient(true)), 1L); @@ -1476,10 +1455,10 @@ public class SearchQueryIT extends ESIntegTestCase { public void testMinScore() throws ExecutionException, InterruptedException { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("score", 1.5).get(); - client().prepareIndex("test").setId("2").setSource("score", 1.0).get(); - client().prepareIndex("test").setId("3").setSource("score", 2.0).get(); - client().prepareIndex("test").setId("4").setSource("score", 0.5).get(); + prepareIndex("test").setId("1").setSource("score", 1.5).get(); + prepareIndex("test").setId("2").setSource("score", 1.0).get(); + prepareIndex("test").setId("3").setSource("score", 2.0).get(); + prepareIndex("test").setId("4").setSource("score", 0.5).get(); refresh(); assertResponse( @@ -1497,8 +1476,8 @@ public class SearchQueryIT extends ESIntegTestCase { public void testQueryStringWithSlopAndFields() { assertAcked(prepareCreate("test")); - client().prepareIndex("test").setId("1").setSource("desc", "one two three", "type", "customer").get(); - client().prepareIndex("test").setId("2").setSource("desc", "one two three", "type", "product").get(); + prepareIndex("test").setId("1").setSource("desc", "one two three", "type", "customer").get(); + prepareIndex("test").setId("2").setSource("desc", "one two three", "type", "product").get(); refresh(); assertHitCount(prepareSearch("test").setQuery(QueryBuilders.queryStringQuery("\"one two\"").defaultField("desc")), 2); @@ -1529,12 +1508,12 @@ public class SearchQueryIT extends ESIntegTestCase { assertAcked(indicesAdmin().preparePutMapping("test").setSource("field", "type=date,format=epoch_millis").get()); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field", 1000000000001L), - client().prepareIndex("test").setId("2").setSource("field", 1000000000000L), - client().prepareIndex("test").setId("3").setSource("field", 999999999999L), - client().prepareIndex("test").setId("4").setSource("field", 1000000000002L), - client().prepareIndex("test").setId("5").setSource("field", 1000000000003L), - client().prepareIndex("test").setId("6").setSource("field", 999999999999L) + prepareIndex("test").setId("1").setSource("field", 1000000000001L), + prepareIndex("test").setId("2").setSource("field", 1000000000000L), + prepareIndex("test").setId("3").setSource("field", 999999999999L), + prepareIndex("test").setId("4").setSource("field", 1000000000002L), + prepareIndex("test").setId("5").setSource("field", 1000000000003L), + prepareIndex("test").setId("6").setSource("field", 999999999999L) ); assertHitCount(prepareSearch("test").setSize(0).setQuery(rangeQuery("field").gte(1000000000000L)), 4); @@ -1546,12 +1525,11 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("date", "2014-01-01", "num", 1), - client().prepareIndex("test").setId("2").setSource("date", "2013-12-31T23:00:00", "num", 2), - client().prepareIndex("test").setId("3").setSource("date", "2014-01-01T01:00:00", "num", 3), + prepareIndex("test").setId("1").setSource("date", "2014-01-01", "num", 1), + prepareIndex("test").setId("2").setSource("date", "2013-12-31T23:00:00", "num", 2), + prepareIndex("test").setId("3").setSource("date", "2014-01-01T01:00:00", "num", 3), // Now in UTC+1 - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource("date", Instant.now().atZone(ZoneOffset.ofHours(1)).toInstant().toEpochMilli(), "num", 4) ); @@ -1675,8 +1653,8 @@ public class SearchQueryIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("date_field", "Mi, 06 Dez 2000 02:55:00 -0800"), - client().prepareIndex("test").setId("2").setSource("date_field", "Do, 07 Dez 2000 02:55:00 -0800") + prepareIndex("test").setId("1").setSource("date_field", "Mi, 06 Dez 2000 02:55:00 -0800"), + prepareIndex("test").setId("2").setSource("date_field", "Do, 07 Dez 2000 02:55:00 -0800") ); assertHitCount( @@ -1694,7 +1672,7 @@ public class SearchQueryIT extends ESIntegTestCase { } public void testSearchEmptyDoc() { - client().prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{}", XContentType.JSON).get(); refresh(); assertHitCount(prepareSearch().setQuery(matchAllQuery()), 1L); @@ -1704,8 +1682,8 @@ public class SearchQueryIT extends ESIntegTestCase { createIndex("test1"); indexRandom( true, - client().prepareIndex("test1").setId("1").setSource("field", "Johnnie Walker Black Label"), - client().prepareIndex("test1").setId("2").setSource("field", "trying out Elasticsearch") + prepareIndex("test1").setId("1").setSource("field", "Johnnie Walker Black Label"), + prepareIndex("test1").setId("2").setSource("field", "trying out Elasticsearch") ); assertSearchHitsWithoutFailures(prepareSearch().setQuery(matchPhrasePrefixQuery("field", "Johnnie la").slop(between(2, 5))), "1"); @@ -1715,7 +1693,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testQueryStringParserCache() throws Exception { createIndex("test"); - indexRandom(true, false, client().prepareIndex("test").setId("1").setSource("nameTokens", "xyz")); + indexRandom(true, false, prepareIndex("test").setId("1").setSource("nameTokens", "xyz")); final float[] first = new float[1]; assertResponse( prepareSearch("test").setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setQuery(QueryBuilders.queryStringQuery("xyz").boost(100)), @@ -1743,8 +1721,7 @@ public class SearchQueryIT extends ESIntegTestCase { public void testRangeQueryRangeFields_24744() throws Exception { assertAcked(prepareCreate("test").setMapping("int_range", "type=integer_range")); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().startObject("int_range").field("gte", 10).field("lte", 20).endObject().endObject()) .get(); refresh(); @@ -1811,7 +1788,7 @@ public class SearchQueryIT extends ESIntegTestCase { .endObject(); assertAcked(prepareCreate("test").setMapping(mapping)); - IndexRequestBuilder indexRequest = client().prepareIndex("test").setId("1").setRouting("custom").setSource("field", "value"); + IndexRequestBuilder indexRequest = prepareIndex("test").setId("1").setRouting("custom").setSource("field", "value"); indexRandom(true, false, indexRequest); updateClusterSettings(Settings.builder().put(IndicesService.INDICES_ID_FIELD_DATA_ENABLED_SETTING.getKey(), true)); try { @@ -1844,7 +1821,7 @@ public class SearchQueryIT extends ESIntegTestCase { .build() ).setMapping("field1", "type=keyword,normalizer=lowercase_normalizer") ); - client().prepareIndex("test").setId("1").setSource("field1", "Bbb Aaa").get(); + prepareIndex("test").setId("1").setSource("field1", "Bbb Aaa").get(); refresh(); { @@ -1869,7 +1846,7 @@ public class SearchQueryIT extends ESIntegTestCase { .build() ).setMapping("field1", "type=text,analyzer=lowercase_analyzer") ); - client().prepareIndex("test").setId("1").setSource("field1", "Bbb Aaa").get(); + prepareIndex("test").setId("1").setSource("field1", "Bbb Aaa").get(); refresh(); { @@ -1899,7 +1876,7 @@ public class SearchQueryIT extends ESIntegTestCase { .build() ).setMapping("field", "type=keyword,normalizer=no_wildcard") ); - client().prepareIndex("test").setId("1").setSource("field", "label-1").get(); + prepareIndex("test").setId("1").setSource("field", "label-1").get(); refresh(); WildcardQueryBuilder wildCardQuery = wildcardQuery("field", "la*"); @@ -1951,7 +1928,7 @@ public class SearchQueryIT extends ESIntegTestCase { */ public void testIssueFuzzyInsideSpanMulti() { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field", "foobarbaz").get(); + prepareIndex("test").setId("1").setSource("field", "foobarbaz").get(); ensureGreen(); refresh(); @@ -1963,7 +1940,7 @@ public class SearchQueryIT extends ESIntegTestCase { createIndex("test"); int docCount = randomIntBetween(10, 50); for (int i = 0; i < docCount; i++) { - client().prepareIndex("test").setSource("field", "foobarbaz").get(); + prepareIndex("test").setSource("field", "foobarbaz").get(); } ensureGreen(); refresh(); 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 cc41ac0089a5..449777580b69 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/query/SimpleQueryStringIT.java @@ -77,12 +77,12 @@ public class SimpleQueryStringIT extends ESIntegTestCase { indexRandom( true, false, - client().prepareIndex("test").setId("1").setSource("body", "foo"), - client().prepareIndex("test").setId("2").setSource("body", "bar"), - client().prepareIndex("test").setId("3").setSource("body", "foo bar"), - client().prepareIndex("test").setId("4").setSource("body", "quux baz eggplant"), - client().prepareIndex("test").setId("5").setSource("body", "quux baz spaghetti"), - client().prepareIndex("test").setId("6").setSource("otherbody", "spaghetti") + prepareIndex("test").setId("1").setSource("body", "foo"), + prepareIndex("test").setId("2").setSource("body", "bar"), + prepareIndex("test").setId("3").setSource("body", "foo bar"), + prepareIndex("test").setId("4").setSource("body", "quux baz eggplant"), + prepareIndex("test").setId("5").setSource("body", "quux baz spaghetti"), + prepareIndex("test").setId("6").setSource("otherbody", "spaghetti") ); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("foo bar")), "1", "2", "3"); @@ -124,10 +124,10 @@ public class SimpleQueryStringIT extends ESIntegTestCase { indexRandom( true, false, - client().prepareIndex("test").setId("1").setSource("body", "foo"), - client().prepareIndex("test").setId("2").setSource("body", "bar"), - client().prepareIndex("test").setId("3").setSource("body", "foo bar"), - client().prepareIndex("test").setId("4").setSource("body", "foo baz bar") + prepareIndex("test").setId("1").setSource("body", "foo"), + prepareIndex("test").setId("2").setSource("body", "bar"), + prepareIndex("test").setId("3").setSource("body", "foo bar"), + prepareIndex("test").setId("4").setSource("body", "foo baz bar") ); logger.info("--> query 1"); @@ -159,10 +159,10 @@ public class SimpleQueryStringIT extends ESIntegTestCase { indexRandom( true, false, - client().prepareIndex("test").setId("5").setSource("body2", "foo", "other", "foo"), - client().prepareIndex("test").setId("6").setSource("body2", "bar", "other", "foo"), - client().prepareIndex("test").setId("7").setSource("body2", "foo bar", "other", "foo"), - client().prepareIndex("test").setId("8").setSource("body2", "foo baz bar", "other", "foo") + prepareIndex("test").setId("5").setSource("body2", "foo", "other", "foo"), + prepareIndex("test").setId("6").setSource("body2", "bar", "other", "foo"), + prepareIndex("test").setId("7").setSource("body2", "foo bar", "other", "foo"), + prepareIndex("test").setId("8").setSource("body2", "foo baz bar", "other", "foo") ); logger.info("--> query 5"); @@ -212,7 +212,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { .endObject() ) ); - client().prepareIndex("test").setId("1").setSource("body", "foo bar baz").get(); + prepareIndex("test").setId("1").setSource("body", "foo bar baz").get(); refresh(); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("foo bar baz").field("body")), "1"); @@ -225,12 +225,12 @@ public class SimpleQueryStringIT extends ESIntegTestCase { createIndex("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("body", "foo"), - client().prepareIndex("test").setId("2").setSource("body", "bar"), - client().prepareIndex("test").setId("3").setSource("body", "foo bar"), - client().prepareIndex("test").setId("4").setSource("body", "quux baz eggplant"), - client().prepareIndex("test").setId("5").setSource("body", "quux baz spaghetti"), - client().prepareIndex("test").setId("6").setSource("otherbody", "spaghetti") + prepareIndex("test").setId("1").setSource("body", "foo"), + prepareIndex("test").setId("2").setSource("body", "bar"), + prepareIndex("test").setId("3").setSource("body", "foo bar"), + prepareIndex("test").setId("4").setSource("body", "quux baz eggplant"), + prepareIndex("test").setId("5").setSource("body", "quux baz spaghetti"), + prepareIndex("test").setId("6").setSource("otherbody", "spaghetti") ); assertSearchHitsWithoutFailures( @@ -283,8 +283,8 @@ public class SimpleQueryStringIT extends ESIntegTestCase { createIndex("test1", "test2"); indexRandom( true, - client().prepareIndex("test1").setId("1").setSource("field", "foo"), - client().prepareIndex("test2").setId("10").setSource("field", 5) + prepareIndex("test1").setId("1").setSource("field", "foo"), + prepareIndex("test2").setId("10").setSource("field", 5) ); refresh(); @@ -304,8 +304,8 @@ public class SimpleQueryStringIT extends ESIntegTestCase { public void testLenientFlagBeingTooLenient() throws Exception { indexRandom( true, - client().prepareIndex("test").setId("1").setSource("num", 1, "body", "foo bar baz"), - client().prepareIndex("test").setId("2").setSource("num", 2, "body", "eggplant spaghetti lasagna") + prepareIndex("test").setId("1").setSource("num", 1, "body", "foo bar baz"), + prepareIndex("test").setId("2").setSource("num", 2, "body", "eggplant spaghetti lasagna") ); BoolQueryBuilder q = boolQuery().should(simpleQueryStringQuery("bar").field("num").field("body").lenient(true)); @@ -329,22 +329,22 @@ public class SimpleQueryStringIT extends ESIntegTestCase { CreateIndexRequestBuilder mappingRequest = indicesAdmin().prepareCreate("test1").setMapping(mapping); mappingRequest.get(); - indexRandom(true, client().prepareIndex("test1").setId("1").setSource("location", "Köln")); + indexRandom(true, prepareIndex("test1").setId("1").setSource("location", "Köln")); refresh(); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("Köln*").field("location")), "1"); } public void testSimpleQueryStringUsesFieldAnalyzer() throws Exception { - client().prepareIndex("test").setId("1").setSource("foo", 123, "bar", "abc").get(); - client().prepareIndex("test").setId("2").setSource("foo", 234, "bar", "bcd").get(); + prepareIndex("test").setId("1").setSource("foo", 123, "bar", "abc").get(); + prepareIndex("test").setId("2").setSource("foo", 234, "bar", "bcd").get(); refresh(); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("123").field("foo").field("bar")), "1"); } public void testSimpleQueryStringOnIndexMetaField() throws Exception { - client().prepareIndex("test").setId("1").setSource("foo", 123, "bar", "abc").get(); - client().prepareIndex("test").setId("2").setSource("foo", 234, "bar", "bcd").get(); + prepareIndex("test").setId("1").setSource("foo", 123, "bar", "abc").get(); + prepareIndex("test").setId("2").setSource("foo", 234, "bar", "bcd").get(); refresh(); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("test").field("_index")), "1", "2"); } @@ -365,7 +365,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { CreateIndexRequestBuilder mappingRequest = indicesAdmin().prepareCreate("test1").setMapping(mapping); mappingRequest.get(); - indexRandom(true, client().prepareIndex("test1").setId("1").setSource("body", "Some Text")); + indexRandom(true, prepareIndex("test1").setId("1").setSource("body", "Some Text")); refresh(); assertSearchHitsWithoutFailures(prepareSearch().setQuery(simpleQueryStringQuery("the*").field("body"))); @@ -377,9 +377,9 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f1", "foo bar baz")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f2", "Bar")); - reqs.add(client().prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo bar baz")); + reqs.add(prepareIndex("test").setId("2").setSource("f2", "Bar")); + reqs.add(prepareIndex("test").setId("3").setSource("f3", "foo bar baz")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("foo")), response -> { @@ -402,8 +402,8 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")), response -> { @@ -430,12 +430,8 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List reqs = new ArrayList<>(); - reqs.add( - client().prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02", "f_float", "1.7", "f_ip", "127.0.0.1") - ); - reqs.add( - client().prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01", "f_float", "1.8", "f_ip", "127.0.0.2") - ); + reqs.add(prepareIndex("test").setId("1").setSource("f1", "foo", "f_date", "2015/09/02", "f_float", "1.7", "f_ip", "127.0.0.1")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar", "f_date", "2015/09/01", "f_float", "1.8", "f_ip", "127.0.0.2")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("foo bar")), response -> { @@ -463,7 +459,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { List reqs = new ArrayList<>(); String docBody = copyToStringFromClasspath("/org/elasticsearch/search/query/all-example-document.json"); - reqs.add(client().prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); + reqs.add(prepareIndex("test").setId("1").setSource(docBody, XContentType.JSON)); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("foo")), response -> assertHits(response.getHits(), "1")); @@ -503,9 +499,9 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f2", "Foo Bar")); - reqs.add(client().prepareIndex("test").setId("2").setSource("f1", "bar")); - reqs.add(client().prepareIndex("test").setId("3").setSource("f1", "foo bar")); + reqs.add(prepareIndex("test").setId("1").setSource("f2", "Foo Bar")); + reqs.add(prepareIndex("test").setId("2").setSource("f1", "bar")); + reqs.add(prepareIndex("test").setId("3").setSource("f1", "foo bar")); indexRandom(true, false, reqs); assertResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("foo")), response -> { @@ -524,7 +520,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List reqs = new ArrayList<>(); - reqs.add(client().prepareIndex("test").setId("1").setSource("f_long", 1)); + reqs.add(prepareIndex("test").setId("1").setSource("f_long", 1)); indexRandom(true, false, reqs); SearchPhaseExecutionException e = expectThrows( @@ -540,9 +536,9 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); - indexRequests.add(client().prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); - indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); + indexRequests.add(prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); assertNoFailuresAndResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_alias")), response -> { @@ -557,9 +553,9 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); - indexRequests.add(client().prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); - indexRequests.add(client().prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("2").setSource("f3", "value", "f2", "two")); + indexRequests.add(prepareIndex("test").setId("3").setSource("f3", "another value", "f2", "three")); indexRandom(true, false, indexRequests); assertNoFailuresAndResponse(prepareSearch("test").setQuery(simpleQueryStringQuery("value").field("f3_*")), response -> { @@ -574,7 +570,7 @@ public class SimpleQueryStringIT extends ESIntegTestCase { ensureGreen("test"); List indexRequests = new ArrayList<>(); - indexRequests.add(client().prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); + indexRequests.add(prepareIndex("test").setId("1").setSource("f3", "text", "f2", "one")); indexRandom(true, false, indexRequests); // The wildcard field matches aliases for both a text and boolean field. 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 ee87b868f280..20b9ce38254c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchPreferenceIT.java @@ -55,7 +55,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(indexSettings(cluster().numDataNodes() + 2, 0))); ensureGreen(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setId("" + i).setSource("field1", "value1").get(); + prepareIndex("test").setId("" + i).setSource("field1", "value1").get(); } refresh(); internalCluster().stopRandomDataNode(); @@ -97,7 +97,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test").setSource("field1", "value1").get(); + prepareIndex("test").setSource("field1", "value1").get(); refresh(); final Client client = internalCluster().smartClient(); @@ -117,7 +117,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { indicesAdmin().prepareCreate("test").setSettings("{\"number_of_replicas\": 1}", XContentType.JSON).get(); ensureGreen(); - client().prepareIndex("test").setSource("field1", "value1").get(); + prepareIndex("test").setSource("field1", "value1").get(); refresh(); assertResponse( @@ -156,7 +156,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setSource("field1", "value1").get(); + prepareIndex("test").setSource("field1", "value1").get(); refresh(); final Client client = internalCluster().smartClient(); @@ -227,7 +227,7 @@ public class SearchPreferenceIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setSource("field1", "value1").get(); + prepareIndex("test").setSource("field1", "value1").get(); refresh(); final String customPreference = randomAlphaOfLength(10); 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 9e7ea2fed8aa..4c99becad055 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java @@ -102,13 +102,11 @@ public class ScriptQuerySearchIT extends ESIntegTestCase { final byte[] randomBytesDoc2 = getRandomBytes(16); assertAcked(indicesAdmin().prepareCreate("my-index").setMapping(createMappingSource("binary")).setSettings(indexSettings())); - client().prepareIndex("my-index") - .setId("1") + prepareIndex("my-index").setId("1") .setSource(jsonBuilder().startObject().field("binaryData", Base64.getEncoder().encodeToString(randomBytesDoc1)).endObject()) .get(); flush(); - client().prepareIndex("my-index") - .setId("2") + prepareIndex("my-index").setId("2") .setSource(jsonBuilder().startObject().field("binaryData", Base64.getEncoder().encodeToString(randomBytesDoc2)).endObject()) .get(); flush(); @@ -152,18 +150,15 @@ public class ScriptQuerySearchIT extends ESIntegTestCase { public void testCustomScriptBoost() throws Exception { createIndex("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).endObject()) .get(); flush(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 2.0f).endObject()) .get(); flush(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource(jsonBuilder().startObject().field("test", "value beck").field("num1", 3.0f).endObject()) .get(); refresh(); @@ -234,7 +229,7 @@ public class ScriptQuerySearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test-index").setMapping("num1", "type=double")); int docCount = 10; for (int i = 1; i <= docCount; i++) { - client().prepareIndex("test-index").setId("" + i).setSource("num1", i).get(); + prepareIndex("test-index").setId("" + i).setSource("num1", i).get(); } refresh(); 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 c63aa19beb42..e89e51a60fa2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/DuelScrollIT.java @@ -130,7 +130,7 @@ public class DuelScrollIT extends ESIntegTestCase { } for (int i = 1; i <= numDocs; i++) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex("index").setId(String.valueOf(i)); + IndexRequestBuilder indexRequestBuilder = prepareIndex("index").setId(String.valueOf(i)); if (missingDocs.contains(i)) { indexRequestBuilder.setSource("x", "y"); } else { @@ -205,7 +205,7 @@ public class DuelScrollIT extends ESIntegTestCase { IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; ++i) { - builders[i] = client().prepareIndex("test").setId(Integer.toString(i)).setSource("foo", random().nextBoolean()); + builders[i] = prepareIndex("test").setId(Integer.toString(i)).setSource("foo", random().nextBoolean()); } indexRandom(true, builders); return numDocs; 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 f94e59cbe1ab..e8b3cfdb1768 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java @@ -73,10 +73,7 @@ public class SearchScrollIT extends ESIntegTestCase { clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get(); for (int i = 0; i < 100; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setSource(jsonBuilder().startObject().field("field", i).endObject()) - .get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get(); } indicesAdmin().prepareRefresh().get(); @@ -128,7 +125,7 @@ public class SearchScrollIT extends ESIntegTestCase { } else if (i > 60) { routing = "2"; } - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", i).setRouting(routing).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", i).setRouting(routing).get(); } indicesAdmin().prepareRefresh().get(); @@ -186,8 +183,7 @@ public class SearchScrollIT extends ESIntegTestCase { clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get(); for (int i = 0; i < 500; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("user", "kimchy") @@ -216,7 +212,7 @@ public class SearchScrollIT extends ESIntegTestCase { for (SearchHit searchHit : searchResponse.getHits().getHits()) { Map map = searchHit.getSourceAsMap(); map.put("message", "update"); - client().prepareIndex("test").setId(searchHit.getId()).setSource(map).get(); + prepareIndex("test").setId(searchHit.getId()).setSource(map).get(); } searchResponse = client().prepareSearchScroll(searchResponse.getScrollId()).setScroll(TimeValue.timeValueMinutes(2)).get(); } while (searchResponse.getHits().getHits().length > 0); @@ -245,10 +241,7 @@ public class SearchScrollIT extends ESIntegTestCase { clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get(); for (int i = 0; i < 100; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setSource(jsonBuilder().startObject().field("field", i).endObject()) - .get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get(); } indicesAdmin().prepareRefresh().get(); @@ -363,10 +356,7 @@ public class SearchScrollIT extends ESIntegTestCase { clusterAdmin().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().get(); for (int i = 0; i < 100; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setSource(jsonBuilder().startObject().field("field", i).endObject()) - .get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get(); } indicesAdmin().prepareRefresh().get(); @@ -436,7 +426,7 @@ public class SearchScrollIT extends ESIntegTestCase { * Tests that we use an optimization shrinking the batch to the size of the shard. Thus the Integer.MAX_VALUE window doesn't OOM us. */ public void testDeepScrollingDoesNotBlowUp() throws Exception { - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).execute().get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).execute().get(); /* * Disable the max result window setting for this test because it'll reject the search's unreasonable batch size. We want * unreasonable batch sizes to just OOM. @@ -462,7 +452,7 @@ public class SearchScrollIT extends ESIntegTestCase { } public void testThatNonExistingScrollIdReturnsCorrectException() throws Exception { - client().prepareIndex("index").setId("1").setSource("field", "value").execute().get(); + prepareIndex("index").setId("1").setSource("field", "value").execute().get(); refresh(); SearchResponse searchResponse = prepareSearch("index").setSize(1).setScroll("1m").get(); @@ -478,7 +468,7 @@ public class SearchScrollIT extends ESIntegTestCase { assertAcked( prepareCreate("test").setSettings(indexSettings(1, 0)).setMapping("no_field", "type=keyword", "some_field", "type=keyword") ); - client().prepareIndex("test").setId("1").setSource("some_field", "test").get(); + prepareIndex("test").setId("1").setSource("some_field", "test").get(); refresh(); SearchResponse response = prepareSearch("test") @@ -510,7 +500,7 @@ public class SearchScrollIT extends ESIntegTestCase { public void testCloseAndReopenOrDeleteWithActiveScroll() { createIndex("test"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", i).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", i).get(); } refresh(); SearchResponse searchResponse = prepareSearch().setQuery(matchAllQuery()) @@ -566,10 +556,7 @@ public class SearchScrollIT extends ESIntegTestCase { public void testInvalidScrollKeepAlive() throws IOException { createIndex("test"); for (int i = 0; i < 2; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setSource(jsonBuilder().startObject().field("field", i).endObject()) - .get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("field", i).endObject()).get(); } refresh(); updateClusterSettings(Settings.builder().put("search.default_keep_alive", "5m").put("search.max_keep_alive", "5m")); @@ -612,9 +599,9 @@ public class SearchScrollIT extends ESIntegTestCase { {"properties":{"created_date":{"type": "date", "format": "yyyy-MM-dd"}}} """) ); - client().prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); - client().prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get(); - client().prepareIndex("test").setId("3").setSource("created_date", "2020-01-03").get(); + prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get(); + prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get(); + prepareIndex("test").setId("3").setSource("created_date", "2020-01-03").get(); indicesAdmin().prepareRefresh("test").get(); SearchResponse resp = null; try { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java index 96c007e05e41..23a38c060849 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java @@ -53,7 +53,7 @@ public class SearchScrollWithFailingNodesIT extends ESIntegTestCase { List writes = new ArrayList<>(); for (int i = 0; i < 100; i++) { - writes.add(client().prepareIndex("test").setSource(jsonBuilder().startObject().field("field", i).endObject())); + writes.add(prepareIndex("test").setSource(jsonBuilder().startObject().field("field", i).endObject())); } indexRandom(false, writes); refresh(); 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 3ac8b103ce91..8852da02a975 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/searchafter/SearchAfterIT.java @@ -63,7 +63,7 @@ public class SearchAfterIT extends ESIntegTestCase { public void testsShouldFail() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=long", "field2", "type=keyword").get()); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setId("0").setSource("field1", 0, "field2", "toto")); + indexRandom(true, prepareIndex("test").setId("0").setSource("field1", 0, "field2", "toto")); { SearchPhaseExecutionException e = expectThrows( SearchPhaseExecutionException.class, @@ -154,8 +154,8 @@ public class SearchAfterIT extends ESIntegTestCase { ensureGreen(); indexRandom( true, - client().prepareIndex("test").setId("0").setSource("field1", 0), - client().prepareIndex("test").setId("1").setSource("field1", 100, "field2", "toto") + prepareIndex("test").setId("0").setSource("field1", 0), + prepareIndex("test").setId("1").setSource("field1", 100, "field2", "toto") ); SearchResponse searchResponse = prepareSearch("test").addSort("field1", SortOrder.ASC) .addSort("field2", SortOrder.ASC) @@ -314,7 +314,7 @@ public class SearchAfterIT extends ESIntegTestCase { builder.field("field" + Integer.toString(j), documents.get(i).get(j)); } builder.endObject(); - requests.add(client().prepareIndex(INDEX_NAME).setId(Integer.toString(i)).setSource(builder)); + requests.add(prepareIndex(INDEX_NAME).setId(Integer.toString(i)).setSource(builder)); } indexRandom(true, requests); } 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 4189482a73f3..f47303b83b6e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java @@ -76,12 +76,12 @@ public class SimpleSearchIT extends ESIntegTestCase { createIndex("test"); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field", "value"), - client().prepareIndex("test").setId("2").setSource("field", "value"), - client().prepareIndex("test").setId("3").setSource("field", "value"), - client().prepareIndex("test").setId("4").setSource("field", "value"), - client().prepareIndex("test").setId("5").setSource("field", "value"), - client().prepareIndex("test").setId("6").setSource("field", "value") + prepareIndex("test").setId("1").setSource("field", "value"), + prepareIndex("test").setId("2").setSource("field", "value"), + prepareIndex("test").setId("3").setSource("field", "value"), + prepareIndex("test").setId("4").setSource("field", "value"), + prepareIndex("test").setId("5").setSource("field", "value"), + prepareIndex("test").setId("6").setSource("field", "value") ); int iters = scaledRandomIntBetween(10, 20); @@ -117,7 +117,7 @@ public class SimpleSearchIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test").setId("1").setSource("from", "192.168.0.5", "to", "192.168.0.10").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("from", "192.168.0.5", "to", "192.168.0.10").setRefreshPolicy(IMMEDIATE).get(); assertHitCount( prepareSearch().setQuery(boolQuery().must(rangeQuery("from").lte("192.168.0.7")).must(rangeQuery("to").gte("192.168.0.7"))), 1L @@ -143,11 +143,11 @@ public class SimpleSearchIT extends ESIntegTestCase { .get(); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("ip", "192.168.0.1").get(); - client().prepareIndex("test").setId("2").setSource("ip", "192.168.0.2").get(); - client().prepareIndex("test").setId("3").setSource("ip", "192.168.0.3").get(); - client().prepareIndex("test").setId("4").setSource("ip", "192.168.1.4").get(); - client().prepareIndex("test").setId("5").setSource("ip", "2001:db8::ff00:42:8329").get(); + prepareIndex("test").setId("1").setSource("ip", "192.168.0.1").get(); + prepareIndex("test").setId("2").setSource("ip", "192.168.0.2").get(); + prepareIndex("test").setId("3").setSource("ip", "192.168.0.3").get(); + prepareIndex("test").setId("4").setSource("ip", "192.168.1.4").get(); + prepareIndex("test").setId("5").setSource("ip", "2001:db8::ff00:42:8329").get(); refresh(); assertHitCount(prepareSearch().setQuery(boolQuery().must(QueryBuilders.termQuery("ip", "192.168.0.1"))), 1L); @@ -171,7 +171,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testSimpleId() { createIndex("test"); - client().prepareIndex("test").setId("XXX1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("XXX1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); // id is not indexed, but lets see that we automatically convert to assertHitCount(prepareSearch().setQuery(QueryBuilders.termQuery("_id", "XXX1")), 1L); assertHitCount(prepareSearch().setQuery(QueryBuilders.queryStringQuery("_id:XXX1")), 1L); @@ -179,9 +179,9 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testSimpleDateRange() throws Exception { createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field", "2010-01-05T02:00").get(); - client().prepareIndex("test").setId("2").setSource("field", "2010-01-06T02:00").get(); - client().prepareIndex("test").setId("3").setSource("field", "1967-01-01T00:00").get(); + prepareIndex("test").setId("1").setSource("field", "2010-01-05T02:00").get(); + prepareIndex("test").setId("2").setSource("field", "2010-01-06T02:00").get(); + prepareIndex("test").setId("3").setSource("field", "1967-01-01T00:00").get(); ensureGreen(); refresh(); assertHitCountAndNoFailures( @@ -223,10 +223,10 @@ public class SimpleSearchIT extends ESIntegTestCase { indicesAdmin().preparePutMapping("test").setSource("field", "type=keyword").get(); - client().prepareIndex("test").setId("0").setSource("field", "").get(); - client().prepareIndex("test").setId("1").setSource("field", "A").get(); - client().prepareIndex("test").setId("2").setSource("field", "B").get(); - client().prepareIndex("test").setId("3").setSource("field", "C").get(); + prepareIndex("test").setId("0").setSource("field", "").get(); + prepareIndex("test").setId("1").setSource("field", "A").get(); + prepareIndex("test").setId("2").setSource("field", "B").get(); + prepareIndex("test").setId("3").setSource("field", "C").get(); ensureGreen(); refresh(); @@ -248,7 +248,7 @@ public class SimpleSearchIT extends ESIntegTestCase { for (int i = 1; i <= max; i++) { String id = String.valueOf(i); - docbuilders.add(client().prepareIndex("test").setId(id).setSource("field", i)); + docbuilders.add(prepareIndex("test").setId(id).setSource("field", i)); } indexRandom(true, docbuilders); @@ -282,7 +282,7 @@ public class SimpleSearchIT extends ESIntegTestCase { for (int i = max - 1; i >= 0; i--) { String id = String.valueOf(i); - docbuilders.add(client().prepareIndex("test").setId(id).setSource("rank", i)); + docbuilders.add(prepareIndex("test").setId(id).setSource("rank", i)); } indexRandom(true, docbuilders); @@ -305,7 +305,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testInsaneFromAndSize() throws Exception { createIndex("idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertWindowFails(prepareSearch("idx").setFrom(Integer.MAX_VALUE)); assertWindowFails(prepareSearch("idx").setSize(Integer.MAX_VALUE)); @@ -313,7 +313,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testTooLargeFromAndSize() throws Exception { createIndex("idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); 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)); @@ -325,7 +325,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testLargeFromAndSizeSucceeds() throws Exception { createIndex("idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); 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); @@ -341,7 +341,7 @@ public class SimpleSearchIT extends ESIntegTestCase { Settings.builder() .put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 2) ).get(); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); 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); @@ -359,7 +359,7 @@ public class SimpleSearchIT extends ESIntegTestCase { .put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), IndexSettings.MAX_RESULT_WINDOW_SETTING.get(Settings.EMPTY) * 2), "idx" ); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); 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); @@ -372,7 +372,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testTooLargeFromAndSizeBackwardsCompatibilityRecommendation() throws Exception { prepareCreate("idx").setSettings(Settings.builder().put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), Integer.MAX_VALUE)).get(); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); 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); @@ -385,7 +385,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testTooLargeRescoreWindow() throws Exception { createIndex("idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertRescoreWindowFails(Integer.MAX_VALUE); assertRescoreWindowFails(IndexSettings.MAX_RESCORE_WINDOW_SETTING.get(Settings.EMPTY) + 1); @@ -395,7 +395,7 @@ public class SimpleSearchIT extends ESIntegTestCase { int defaultMaxWindow = IndexSettings.MAX_RESCORE_WINDOW_SETTING.get(Settings.EMPTY); prepareCreate("idx").setSettings(Settings.builder().put(IndexSettings.MAX_RESCORE_WINDOW_SETTING.getKey(), defaultMaxWindow * 2)) .get(); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } @@ -409,7 +409,7 @@ public class SimpleSearchIT extends ESIntegTestCase { defaultMaxWindow * 2 ) ).get(); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } @@ -418,7 +418,7 @@ public class SimpleSearchIT extends ESIntegTestCase { int defaultMaxWindow = IndexSettings.MAX_RESCORE_WINDOW_SETTING.get(Settings.EMPTY); createIndex("idx"); updateIndexSettings(Settings.builder().put(IndexSettings.MAX_RESCORE_WINDOW_SETTING.getKey(), defaultMaxWindow * 2), "idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } @@ -431,7 +431,7 @@ public class SimpleSearchIT extends ESIntegTestCase { Settings.builder().put(IndexSettings.MAX_RESULT_WINDOW_SETTING.getKey(), defaultMaxWindow * 2), "idx" ); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); assertHitCount(prepareSearch("idx").addRescorer(new QueryRescorerBuilder(matchAllQuery()).windowSize(defaultMaxWindow + 1)), 1); } @@ -452,8 +452,7 @@ public class SimpleSearchIT extends ESIntegTestCase { prepareCreate("idx").setMapping("field", "type=keyword").get(); ensureGreen("idx"); - client().prepareIndex("idx") - .setId("1") + prepareIndex("idx").setId("1") .setSource("{\"field\" : 80315953321748200608 }", XContentType.JSON) .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .get(); @@ -467,7 +466,7 @@ public class SimpleSearchIT extends ESIntegTestCase { public void testTooLongRegexInRegexpQuery() throws Exception { createIndex("idx"); - indexRandom(true, client().prepareIndex("idx").setSource("{}", XContentType.JSON)); + indexRandom(true, prepareIndex("idx").setSource("{}", XContentType.JSON)); int defaultMaxRegexLength = IndexSettings.MAX_REGEX_LENGTH_SETTING.get(Settings.EMPTY); StringBuilder regexp = new StringBuilder(defaultMaxRegexLength); 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 948b7261ded1..2c836e7763ff 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java @@ -79,7 +79,7 @@ public class SearchSliceIT extends ESIntegTestCase { .field("static_int", 0) .field("invalid_random_int", randomInt()) .endObject(); - requests.add(client().prepareIndex("test").setSource(builder)); + requests.add(prepareIndex("test").setSource(builder)); } indexRandom(true, requests); } 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 f5dd2182e055..2cd68398e211 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java @@ -117,7 +117,7 @@ public class FieldSortIT extends ESIntegTestCase { assertAcked(prepareCreate("test_" + i).addAlias(new Alias("test"))); } if (i > 0) { - client().prepareIndex("test_" + i).setId("" + i).setSource("{\"entry\": " + i + "}", XContentType.JSON).get(); + prepareIndex("test_" + i).setId("" + i).setSource("{\"entry\": " + i + "}", XContentType.JSON).get(); } } refresh(); @@ -163,13 +163,12 @@ public class FieldSortIT extends ESIntegTestCase { final int numDocs = randomIntBetween(1, 23); // hour of the day for (int j = 0; j < numDocs; j++) { builders.add( - client().prepareIndex(indexId) - .setSource( - "foo", - "bar", - "timeUpdated", - "2014/07/" + Strings.format("%02d", i + 1) + " " + Strings.format("%02d", j + 1) + ":00:00" - ) + prepareIndex(indexId).setSource( + "foo", + "bar", + "timeUpdated", + "2014/07/" + Strings.format("%02d", i + 1) + " " + Strings.format("%02d", j + 1) + ":00:00" + ) ); } indexRandom(true, builders); @@ -278,7 +277,7 @@ public class FieldSortIT extends ESIntegTestCase { sparseBytes.put(ref, docId); } src.endObject(); - builders[i] = client().prepareIndex("test").setId(docId).setSource(src); + builders[i] = prepareIndex("test").setId(docId).setSource(src); } indexRandom(true, builders); { @@ -327,7 +326,7 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen(); for (int i = 1; i < 101; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field", Integer.toString(i)).get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field", Integer.toString(i)).get(); } refresh(); assertResponse( @@ -339,7 +338,7 @@ public class FieldSortIT extends ESIntegTestCase { } ); // reindex and refresh - client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); + prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); refresh(); assertResponse( @@ -351,7 +350,7 @@ public class FieldSortIT extends ESIntegTestCase { } ); // reindex - no refresh - client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); + prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); assertResponse( prepareSearch("test").setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)), @@ -365,7 +364,7 @@ public class FieldSortIT extends ESIntegTestCase { forceMerge(); refresh(); - client().prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); + prepareIndex("test").setId(Integer.toString(1)).setSource("field", Integer.toString(1)).get(); assertResponse( prepareSearch("test").setQuery(matchAllQuery()).addSort(SortBuilders.fieldSort("field").order(SortOrder.ASC)), response -> { @@ -389,9 +388,9 @@ public class FieldSortIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", 2).get(); - client().prepareIndex("test").setId("2").setSource("field", 1).get(); - client().prepareIndex("test").setId("3").setSource("field", 0).get(); + prepareIndex("test").setId("1").setSource("field", 2).get(); + prepareIndex("test").setId("2").setSource("field", 1).get(); + prepareIndex("test").setId("3").setSource("field", 0).get(); refresh(); @@ -435,9 +434,9 @@ public class FieldSortIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", 2).get(); - client().prepareIndex("test").setId("2").setSource("field", 1).get(); - client().prepareIndex("test").setId("3").setSource("field", 0).get(); + prepareIndex("test").setId("1").setSource("field", 2).get(); + prepareIndex("test").setId("2").setSource("field", 1).get(); + prepareIndex("test").setId("3").setSource("field", 0).get(); refresh(); @@ -473,9 +472,9 @@ public class FieldSortIT extends ESIntegTestCase { public void testIssue2986() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=keyword").get()); - client().prepareIndex("test").setId("1").setSource("{\"field1\":\"value1\"}", XContentType.JSON).get(); - client().prepareIndex("test").setId("2").setSource("{\"field1\":\"value2\"}", XContentType.JSON).get(); - client().prepareIndex("test").setId("3").setSource("{\"field1\":\"value3\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"field1\":\"value1\"}", XContentType.JSON).get(); + prepareIndex("test").setId("2").setSource("{\"field1\":\"value2\"}", XContentType.JSON).get(); + prepareIndex("test").setId("3").setSource("{\"field1\":\"value3\"}", XContentType.JSON).get(); refresh(); assertResponse(prepareSearch("test").setQuery(matchAllQuery()).setTrackScores(true).addSort("field1", SortOrder.ASC), response -> { for (SearchHit hit : response.getHits()) { @@ -493,16 +492,16 @@ public class FieldSortIT extends ESIntegTestCase { } assertAcked(indicesAdmin().prepareCreate("test").setMapping("tag", "type=keyword").get()); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("tag", "alpha").get(); + prepareIndex("test").setId("1").setSource("tag", "alpha").get(); refresh(); - client().prepareIndex("test").setId("3").setSource("tag", "gamma").get(); + prepareIndex("test").setId("3").setSource("tag", "gamma").get(); refresh(); - client().prepareIndex("test").setId("4").setSource("tag", "delta").get(); + prepareIndex("test").setId("4").setSource("tag", "delta").get(); refresh(); - client().prepareIndex("test").setId("2").setSource("tag", "beta").get(); + prepareIndex("test").setId("2").setSource("tag", "beta").get(); refresh(); assertResponse( @@ -566,8 +565,7 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen(); List builders = new ArrayList<>(); for (int i = 0; i < 10; i++) { - IndexRequestBuilder builder = client().prepareIndex("test") - .setId(Integer.toString(i)) + IndexRequestBuilder builder = prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("str_value", new String(new char[] { (char) (97 + i), (char) (97 + i) })) @@ -802,15 +800,13 @@ public class FieldSortIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("i_value", -1).field("d_value", -1.1).endObject()) .get(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("id", "2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("id", "2").endObject()).get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource(jsonBuilder().startObject().field("id", "1").field("i_value", 2).field("d_value", 2.2).endObject()) .get(); @@ -865,17 +861,11 @@ public class FieldSortIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test") - .setId("1") - .setSource(jsonBuilder().startObject().field("id", "1").field("value", "a").endObject()) - .get(); + prepareIndex("test").setId("1").setSource(jsonBuilder().startObject().field("id", "1").field("value", "a").endObject()).get(); - client().prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("id", "2").endObject()).get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("id", "2").endObject()).get(); - client().prepareIndex("test") - .setId("3") - .setSource(jsonBuilder().startObject().field("id", "1").field("value", "c").endObject()) - .get(); + prepareIndex("test").setId("3").setSource(jsonBuilder().startObject().field("id", "1").field("value", "c").endObject()).get(); flush(); refresh(); @@ -955,9 +945,9 @@ public class FieldSortIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex(index).setId("1").setSource("mydate", "2021-01-01").get(); - client().prepareIndex(index).setId("2").setSource("mydate", "2021-02-01").get(); - client().prepareIndex(index).setId("3").setSource("other_field", "value").get(); + prepareIndex(index).setId("1").setSource("mydate", "2021-01-01").get(); + prepareIndex(index).setId("2").setSource("mydate", "2021-02-01").get(); + prepareIndex(index).setId("3").setSource("other_field", "value").get(); refresh(); @@ -1016,12 +1006,12 @@ public class FieldSortIT extends ESIntegTestCase { } ensureGreen(); - client().prepareIndex("test_date").setId("1").setSource("mydate", "2021-01-01").get(); - client().prepareIndex("test_date").setId("2").setSource("mydate", "2021-02-01").get(); - client().prepareIndex("test_date").setId("3").setSource("other_field", 1).get(); - client().prepareIndex("test_date_nanos").setId("4").setSource("mydate", "2021-03-01").get(); - client().prepareIndex("test_date_nanos").setId("5").setSource("mydate", "2021-04-01").get(); - client().prepareIndex("test_date_nanos").setId("6").setSource("other_field", 2).get(); + prepareIndex("test_date").setId("1").setSource("mydate", "2021-01-01").get(); + prepareIndex("test_date").setId("2").setSource("mydate", "2021-02-01").get(); + prepareIndex("test_date").setId("3").setSource("other_field", 1).get(); + prepareIndex("test_date_nanos").setId("4").setSource("mydate", "2021-03-01").get(); + prepareIndex("test_date_nanos").setId("5").setSource("mydate", "2021-04-01").get(); + prepareIndex("test_date_nanos").setId("6").setSource("other_field", 2).get(); refresh(); for (boolean withFormat : List.of(true, false)) { @@ -1074,8 +1064,7 @@ public class FieldSortIT extends ESIntegTestCase { public void testIgnoreUnmapped() throws Exception { createIndex("test"); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("id", "1").field("i_value", -1).field("d_value", -1.1).endObject()) .get(); @@ -1150,8 +1139,7 @@ public class FieldSortIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId(Integer.toString(1)) + prepareIndex("test").setId(Integer.toString(1)) .setSource( jsonBuilder().startObject() .array("long_values", 1L, 5L, 10L, 8L) @@ -1164,8 +1152,7 @@ public class FieldSortIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId(Integer.toString(2)) + prepareIndex("test").setId(Integer.toString(2)) .setSource( jsonBuilder().startObject() .array("long_values", 11L, 15L, 20L, 7L) @@ -1178,8 +1165,7 @@ public class FieldSortIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId(Integer.toString(3)) + prepareIndex("test").setId(Integer.toString(3)) .setSource( jsonBuilder().startObject() .array("long_values", 2L, 1L, 3L, -4L) @@ -1450,8 +1436,7 @@ public class FieldSortIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test") - .setId(Integer.toString(1)) + prepareIndex("test").setId(Integer.toString(1)) .setSource(jsonBuilder().startObject().array("string_values", "01", "05", "10", "08").endObject()) .get(); @@ -1462,13 +1447,11 @@ public class FieldSortIT extends ESIntegTestCase { assertThat(response.getHits().getAt(0).getId(), equalTo(Integer.toString(1))); assertThat(response.getHits().getAt(0).getSortValues()[0], equalTo("10")); }); - client().prepareIndex("test") - .setId(Integer.toString(2)) + prepareIndex("test").setId(Integer.toString(2)) .setSource(jsonBuilder().startObject().array("string_values", "11", "15", "20", "07").endObject()) .get(); for (int i = 0; i < 15; i++) { - client().prepareIndex("test") - .setId(Integer.toString(300 + i)) + prepareIndex("test").setId(Integer.toString(300 + i)) .setSource(jsonBuilder().startObject().array("some_other_field", "foobar").endObject()) .get(); } @@ -1484,13 +1467,11 @@ public class FieldSortIT extends ESIntegTestCase { assertThat(response.getHits().getAt(1).getId(), equalTo(Integer.toString(1))); assertThat(response.getHits().getAt(1).getSortValues()[0], equalTo("10")); }); - client().prepareIndex("test") - .setId(Integer.toString(3)) + prepareIndex("test").setId(Integer.toString(3)) .setSource(jsonBuilder().startObject().array("string_values", "02", "01", "03", "!4").endObject()) .get(); for (int i = 0; i < 15; i++) { - client().prepareIndex("test") - .setId(Integer.toString(300 + i)) + prepareIndex("test").setId(Integer.toString(300 + i)) .setSource(jsonBuilder().startObject().array("some_other_field", "foobar").endObject()) .get(); } @@ -1510,8 +1491,7 @@ public class FieldSortIT extends ESIntegTestCase { assertThat(response.getHits().getAt(2).getSortValues()[0], equalTo("03")); }); for (int i = 0; i < 15; i++) { - client().prepareIndex("test") - .setId(Integer.toString(300 + i)) + prepareIndex("test").setId(Integer.toString(300 + i)) .setSource(jsonBuilder().startObject().array("some_other_field", "foobar").endObject()) .get(); refresh(); @@ -1540,7 +1520,7 @@ public class FieldSortIT extends ESIntegTestCase { final int numDocs = randomIntBetween(10, 20); IndexRequestBuilder[] indexReqs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; ++i) { - indexReqs[i] = client().prepareIndex("test").setId(Integer.toString(i)).setSource(); + indexReqs[i] = prepareIndex("test").setId(Integer.toString(i)).setSource(); } indexRandom(true, indexReqs); @@ -1611,8 +1591,7 @@ public class FieldSortIT extends ESIntegTestCase { ); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .startArray("nested") @@ -1626,8 +1605,7 @@ public class FieldSortIT extends ESIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .startArray("nested") @@ -1726,7 +1704,7 @@ public class FieldSortIT extends ESIntegTestCase { for (String index : new String[] { "test1", "test2" }) { List docs = new ArrayList<>(); for (int i = 0; i < 256; i++) { - docs.add(client().prepareIndex(index).setId(Integer.toString(i)).setSource(sortField, i)); + docs.add(prepareIndex(index).setId(Integer.toString(i)).setSource(sortField, i)); } indexRandom(true, docs); } @@ -1764,8 +1742,8 @@ public class FieldSortIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping("ip", "type=ip")); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("ip", "192.168.1.7"), - client().prepareIndex("test").setId("2").setSource("ip", "2001:db8::ff00:42:8329") + prepareIndex("test").setId("1").setSource("ip", "192.168.1.7"), + prepareIndex("test").setId("2").setSource("ip", "2001:db8::ff00:42:8329") ); assertNoFailuresAndResponse(prepareSearch("test").addSort(SortBuilders.fieldSort("ip")), response -> { @@ -1790,7 +1768,7 @@ public class FieldSortIT extends ESIntegTestCase { IndexRequestBuilder[] indexReqs = new IndexRequestBuilder[numDocs]; List keywords = new ArrayList<>(); for (int i = 0; i < numDocs; ++i) { - indexReqs[i] = client().prepareIndex("test").setSource("number", i, "keyword", Integer.toString(i)); + indexReqs[i] = prepareIndex("test").setSource("number", i, "keyword", Integer.toString(i)); keywords.add(Integer.toString(i)); } Collections.sort(keywords); @@ -1841,9 +1819,9 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen("old_index", "new_index"); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("old_index").setSource("distance", 42.0)); - builders.add(client().prepareIndex("old_index").setSource("distance", 50.5)); - builders.add(client().prepareIndex("new_index").setSource("route_length_miles", 100.2)); + builders.add(prepareIndex("old_index").setSource("distance", 42.0)); + builders.add(prepareIndex("old_index").setSource("distance", 50.5)); + builders.add(prepareIndex("new_index").setSource("route_length_miles", 100.2)); indexRandom(true, true, builders); assertResponse( @@ -1867,9 +1845,9 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen("old_index", "new_index"); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("old_index").setSource("distance", 42.0)); - builders.add(client().prepareIndex("old_index").setSource(Collections.emptyMap())); - builders.add(client().prepareIndex("new_index").setSource("route_length_miles", 100.2)); + builders.add(prepareIndex("old_index").setSource("distance", 42.0)); + builders.add(prepareIndex("old_index").setSource(Collections.emptyMap())); + builders.add(prepareIndex("new_index").setSource("route_length_miles", 100.2)); indexRandom(true, true, builders); assertResponse( @@ -1894,9 +1872,9 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen("index_double", "index_long", "index_float"); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("index_double").setSource("field", 12.6)); - builders.add(client().prepareIndex("index_long").setSource("field", 12)); - builders.add(client().prepareIndex("index_float").setSource("field", 12.1)); + builders.add(prepareIndex("index_double").setSource("field", 12.6)); + builders.add(prepareIndex("index_long").setSource("field", 12)); + builders.add(prepareIndex("index_float").setSource("field", 12.1)); indexRandom(true, true, builders); { @@ -1943,8 +1921,8 @@ public class FieldSortIT extends ESIntegTestCase { ensureGreen("index_date", "index_date_nanos"); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("index_date").setSource("field", "2024-04-11T23:47:17")); - builders.add(client().prepareIndex("index_date_nanos").setSource("field", "2024-04-11T23:47:16.854775807Z")); + builders.add(prepareIndex("index_date").setSource("field", "2024-04-11T23:47:17")); + builders.add(prepareIndex("index_date_nanos").setSource("field", "2024-04-11T23:47:16.854775807Z")); indexRandom(true, true, builders); { @@ -2030,7 +2008,7 @@ public class FieldSortIT extends ESIntegTestCase { { builders.clear(); - builders.add(client().prepareIndex("index_date").setSource("field", "1905-04-11T23:47:17")); + builders.add(prepareIndex("index_date").setSource("field", "1905-04-11T23:47:17")); indexRandom(true, true, builders); assertResponse( prepareSearch().setQuery(matchAllQuery()).setSize(1).addSort(SortBuilders.fieldSort("field").setNumericType("date_nanos")), @@ -2044,7 +2022,7 @@ public class FieldSortIT extends ESIntegTestCase { { builders.clear(); - builders.add(client().prepareIndex("index_date").setSource("field", "2346-04-11T23:47:17")); + builders.add(prepareIndex("index_date").setSource("field", "2346-04-11T23:47:17")); indexRandom(true, true, builders); assertResponse( prepareSearch().setQuery(QueryBuilders.rangeQuery("field").gt("1970-01-01")) @@ -2089,7 +2067,7 @@ public class FieldSortIT extends ESIntegTestCase { bulkBuilder = client().prepareBulk(); } String source = "{\"long_field\":" + randomLong() + "}"; - bulkBuilder.add(client().prepareIndex("test1").setId(Integer.toString(i)).setSource(source, XContentType.JSON)); + bulkBuilder.add(prepareIndex("test1").setId(Integer.toString(i)).setSource(source, XContentType.JSON)); } refresh(); @@ -2130,10 +2108,10 @@ public class FieldSortIT extends ESIntegTestCase { assertAcked(prepareCreate("index_double").setMapping("foo", "type=double").get()); assertAcked(prepareCreate("index_keyword").setMapping("foo", "type=keyword").get()); - client().prepareIndex("index_long").setId("1").setSource("foo", "123").get(); - client().prepareIndex("index_integer").setId("1").setSource("foo", "123").get(); - client().prepareIndex("index_double").setId("1").setSource("foo", "123").get(); - client().prepareIndex("index_keyword").setId("1").setSource("foo", "123").get(); + prepareIndex("index_long").setId("1").setSource("foo", "123").get(); + prepareIndex("index_integer").setId("1").setSource("foo", "123").get(); + prepareIndex("index_double").setId("1").setSource("foo", "123").get(); + prepareIndex("index_keyword").setId("1").setSource("foo", "123").get(); refresh(); { // mixing long and integer types is ok, as we convert integer sort to long sort 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 e09eb3d73b84..2d0fbb42a42e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceIT.java @@ -56,8 +56,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(settings).setMapping(xContentBuilder)); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("names", "New York") @@ -69,8 +68,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("names", "New York 2") @@ -82,8 +80,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .array("names", "Times Square", "Tribeca") @@ -103,8 +100,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("4") + prepareIndex("test").setId("4") .setSource( jsonBuilder().startObject() .array("names", "Wall Street", "Soho") @@ -124,8 +120,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("5") + prepareIndex("test").setId("5") .setSource( jsonBuilder().startObject() .array("names", "Greenwich Village", "Brooklyn") @@ -253,8 +248,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(settings).setMapping(xContentBuilder)); ensureGreen(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .array("names", "Times Square", "Tribeca") @@ -274,10 +268,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") - .setSource(jsonBuilder().startObject().array("names", "Wall Street", "Soho").endObject()) - .get(); + prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().array("names", "Wall Street", "Soho").endObject()).get(); refresh(); @@ -331,8 +322,7 @@ public class GeoDistanceIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("companies") - .setId("1") + prepareIndex("companies").setId("1") .setSource( jsonBuilder().startObject() .field("name", "company 1") @@ -347,8 +337,7 @@ public class GeoDistanceIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("companies") - .setId("2") + prepareIndex("companies").setId("2") .setSource( jsonBuilder().startObject() .field("name", "company 2") @@ -372,8 +361,7 @@ public class GeoDistanceIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("companies") - .setId("3") + prepareIndex("companies").setId("3") .setSource( jsonBuilder().startObject() .field("name", "company 3") @@ -396,8 +384,7 @@ public class GeoDistanceIT extends ESIntegTestCase { .endArray() .endObject() ), - client().prepareIndex("companies") - .setId("4") + prepareIndex("companies").setId("4") .setSource( jsonBuilder().startObject() .field("name", "company 4") @@ -579,7 +566,7 @@ public class GeoDistanceIT extends ESIntegTestCase { XContentBuilder source = JsonXContent.contentBuilder().startObject().field("pin", Geohash.stringEncode(lon, lat)).endObject(); assertAcked(prepareCreate("locations").setSettings(settings).setMapping(mapping)); - client().prepareIndex("locations").setId("1").setCreate(true).setSource(source).get(); + prepareIndex("locations").setId("1").setCreate(true).setSource(source).get(); refresh(); client().prepareGet("locations", "1").get(); @@ -602,8 +589,7 @@ public class GeoDistanceIT extends ESIntegTestCase { assertAcked(prepareCreate("test2")); ensureGreen(); - client().prepareIndex("test1") - .setId("1") + prepareIndex("test1").setId("1") .setSource( jsonBuilder().startObject() .array("names", "Times Square", "Tribeca") @@ -623,10 +609,7 @@ public class GeoDistanceIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test2") - .setId("2") - .setSource(jsonBuilder().startObject().array("names", "Wall Street", "Soho").endObject()) - .get(); + prepareIndex("test2").setId("2").setSource(jsonBuilder().startObject().array("names", "Wall Street", "Soho").endObject()).get(); refresh(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java index 265cd77bdbbb..67426caf2faa 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java @@ -71,11 +71,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase { logger.info("d1: {}", d1Builder); logger.info("d2: {}", d2Builder); - indexRandom( - true, - client().prepareIndex("index").setId("d1").setSource(d1Builder), - client().prepareIndex("index").setId("d2").setSource(d2Builder) - ); + indexRandom(true, prepareIndex("index").setId("d1").setSource(d1Builder), prepareIndex("index").setId("d2").setSource(d2Builder)); GeoPoint[] q = new GeoPoint[2]; if (randomBoolean()) { q[0] = new GeoPoint(2, 1); @@ -167,11 +163,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase { logger.info("d1: {}", d1Builder); logger.info("d2: {}", d2Builder); - indexRandom( - true, - client().prepareIndex("index").setId("d1").setSource(d1Builder), - client().prepareIndex("index").setId("d2").setSource(d2Builder) - ); + indexRandom(true, prepareIndex("index").setId("d1").setSource(d1Builder), prepareIndex("index").setId("d2").setSource(d2Builder)); GeoPoint q = new GeoPoint(0, 0); assertResponse( @@ -242,11 +234,7 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase { GeoPoint[] d2Points = { new GeoPoint(4.5, 1), new GeoPoint(4.75, 2), new GeoPoint(5, 3), new GeoPoint(5.25, 4) }; createShuffeldJSONArray(d2Builder, d2Points); - indexRandom( - true, - client().prepareIndex("index").setId("d1").setSource(d1Builder), - client().prepareIndex("index").setId("d2").setSource(d2Builder) - ); + indexRandom(true, prepareIndex("index").setId("d1").setSource(d1Builder), prepareIndex("index").setId("d2").setSource(d2Builder)); List qPoints = Arrays.asList(new GeoPoint(2, 1), new GeoPoint(2, 2), new GeoPoint(2, 3), new GeoPoint(2, 4)); Collections.shuffle(qPoints, random()); @@ -295,11 +283,9 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase { assertAcked(prepareCreate("index").setMapping(LOCATION_FIELD, "type=geo_point")); indexRandom( true, - client().prepareIndex("index") - .setId("d1") + prepareIndex("index").setId("d1") .setSource(jsonBuilder().startObject().startObject(LOCATION_FIELD).field("lat", 1).field("lon", 1).endObject().endObject()), - client().prepareIndex("index") - .setId("d2") + prepareIndex("index").setId("d2") .setSource(jsonBuilder().startObject().startObject(LOCATION_FIELD).field("lat", 1).field("lon", 2).endObject().endObject()) ); @@ -371,8 +357,8 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test1").setSource("str_field", "bcd", "long_field", 3, "double_field", 0.65), - client().prepareIndex("test2").setSource() + prepareIndex("test1").setSource("str_field", "bcd", "long_field", 3, "double_field", 0.65), + prepareIndex("test2").setSource() ); assertSortValues( diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java index db06eb1b5de0..c7b934df0394 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/sort/SimpleSortIT.java @@ -147,8 +147,7 @@ public class SimpleSortIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (int i = 0; i < 10; i++) { builders.add( - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource( jsonBuilder().startObject() .field("str_value", new String(new char[] { (char) (97 + i), (char) (97 + i) })) @@ -240,8 +239,7 @@ public class SimpleSortIT extends ESIntegTestCase { ensureGreen(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test") - .setId("" + i) + prepareIndex("test").setId("" + i) .setSource( jsonBuilder().startObject() .field("ord", i) @@ -258,7 +256,7 @@ public class SimpleSortIT extends ESIntegTestCase { } for (int i = 10; i < 20; i++) { // add some docs that don't have values in those fields - client().prepareIndex("test").setId("" + i).setSource(jsonBuilder().startObject().field("ord", i).endObject()).get(); + prepareIndex("test").setId("" + i).setSource(jsonBuilder().startObject().field("ord", i).endObject()).get(); } indicesAdmin().prepareRefresh("test").get(); @@ -349,11 +347,11 @@ public class SimpleSortIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(mapping)); ensureGreen(); - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "1").field("svalue", "aaa").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "1").field("svalue", "aaa").endObject()).get(); - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "2").nullField("svalue").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "2").nullField("svalue").endObject()).get(); - client().prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "3").field("svalue", "bbb").endObject()).get(); + prepareIndex("test").setSource(jsonBuilder().startObject().field("id", "3").field("svalue", "bbb").endObject()).get(); flush(); refresh(); @@ -432,10 +430,7 @@ public class SimpleSortIT extends ESIntegTestCase { ); ensureGreen(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) - .setSource(jsonBuilder().startObject().field("value", "" + i).endObject()) - .get(); + prepareIndex("test").setId(Integer.toString(i)).setSource(jsonBuilder().startObject().field("value", "" + i).endObject()).get(); } refresh(); 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 179778240cc3..2967bdc454ae 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/source/MetadataFetchingIT.java @@ -31,7 +31,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { assertAcked(prepareCreate("test")); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "value").get(); + prepareIndex("test").setId("1").setSource("field", "value").get(); refresh(); assertResponse(prepareSearch("test").storedFields("_none_").setFetchSource(false).setVersion(true), response -> { @@ -50,7 +50,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { public void testInnerHits() { assertAcked(prepareCreate("test").setMapping("nested", "type=nested")); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "value", "nested", Collections.singletonMap("title", "foo")).get(); + prepareIndex("test").setId("1").setSource("field", "value", "nested", Collections.singletonMap("title", "foo")).get(); refresh(); assertResponse( @@ -79,7 +79,7 @@ public class MetadataFetchingIT extends ESIntegTestCase { assertAcked(prepareCreate("test")); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "value").setRouting("toto").get(); + prepareIndex("test").setId("1").setSource("field", "value").setRouting("toto").get(); refresh(); assertResponse(prepareSearch("test").storedFields("_none_").setFetchSource(false), response -> { 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 5e7847c74404..81facfa8116c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/source/SourceFetchingIT.java @@ -41,7 +41,7 @@ public class SourceFetchingIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field1", "value", "field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value", "field2", "value2").get(); refresh(); assertResponse( @@ -78,7 +78,7 @@ public class SourceFetchingIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field", "value").get(); + prepareIndex("test").setId("1").setSource("field", "value").get(); refresh(); assertResponse(prepareSearch("test").setFetchSource(new String[] { "*.notexisting", "field" }, null), response -> { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java index e3b5301cb199..0d850a370804 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java @@ -55,8 +55,7 @@ public class FieldUsageStatsIT extends ESIntegTestCase { LocalDate date = LocalDate.of(2015, 9, 1); for (int i = 0; i < 30; i++) { - client().prepareIndex("test") - .setId(Integer.toString(i)) + prepareIndex("test").setId(Integer.toString(i)) .setSource("field", "value", "field2", "value2", "date_field", formatter.format(date.plusDays(i))) .get(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java index 81c776d0893c..23384d1b199f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java @@ -83,7 +83,7 @@ public class SearchStatsIT extends ESIntegTestCase { assertAcked(prepareCreate("test1").setSettings(indexSettings(shardsIdx1, 0))); int docsTest1 = scaledRandomIntBetween(3 * shardsIdx1, 5 * shardsIdx1); for (int i = 0; i < docsTest1; i++) { - client().prepareIndex("test1").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test1").setId(Integer.toString(i)).setSource("field", "value").get(); if (rarely()) { refresh(); } @@ -91,7 +91,7 @@ public class SearchStatsIT extends ESIntegTestCase { assertAcked(prepareCreate("test2").setSettings(indexSettings(shardsIdx2, 0))); int docsTest2 = scaledRandomIntBetween(3 * shardsIdx2, 5 * shardsIdx2); for (int i = 0; i < docsTest2; i++) { - client().prepareIndex("test2").setId(Integer.toString(i)).setSource("field", "value").get(); + prepareIndex("test2").setId(Integer.toString(i)).setSource("field", "value").get(); if (rarely()) { refresh(); } @@ -181,11 +181,7 @@ public class SearchStatsIT extends ESIntegTestCase { final int docs = scaledRandomIntBetween(20, 50); for (int s = 0; s < numAssignedShards(index); s++) { for (int i = 0; i < docs; i++) { - client().prepareIndex(index) - .setId(Integer.toString(s * docs + i)) - .setSource("field", "value") - .setRouting(Integer.toString(s)) - .get(); + prepareIndex(index).setId(Integer.toString(s * docs + i)).setSource("field", "value").setRouting(Integer.toString(s)).get(); } } indicesAdmin().prepareRefresh(index).get(); 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 c36538508c6a..b5f7468d1645 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java @@ -95,8 +95,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { String value = "a" + randomAlphaOfLengthBetween(1, 10); entries[i] = value; indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject().startObject(FIELD).field("input", value).field("weight", 10).endObject().endObject() ) @@ -118,8 +117,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -146,8 +144,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -185,8 +182,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -209,8 +205,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -233,8 +228,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -268,8 +262,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -305,8 +298,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -342,8 +334,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -409,8 +400,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List similarNames = Arrays.asList("the", "The Prodigy", "The Verve", "The the"); // the weight is 1000 divided by string length, so the results are easy to to check for (String similarName : similarNames) { - client().prepareIndex(INDEX) - .setId(similarName) + prepareIndex(INDEX).setId(similarName) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -434,8 +424,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { Exception e = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex(INDEX) - .setId("1") + () -> prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -454,8 +443,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatWeightCanBeAString() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -496,8 +484,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { Exception e = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex(INDEX) - .setId("1") + () -> prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -520,8 +507,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { Exception e = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex(INDEX) - .setId("1") + () -> prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -540,8 +526,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatInputCanBeAStringInsteadOfAnArray() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource(jsonBuilder().startObject().startObject(FIELD).field("input", "Foo Fighters").endObject().endObject()) .get(); @@ -554,8 +539,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { completionMappingBuilder.preserveSeparators(false); createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -568,8 +552,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { ) .get(); - client().prepareIndex(INDEX) - .setId("2") + prepareIndex(INDEX).setId("2") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -591,15 +574,13 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { completionMappingBuilder.preserveSeparators(true); createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Foo Fighters").endArray().endObject().endObject() ) .get(); - client().prepareIndex(INDEX) - .setId("2") + prepareIndex(INDEX).setId("2") .setSource(jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Foof").endArray().endObject().endObject()) .get(); @@ -611,8 +592,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatMultipleInputsAreSupported() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -634,8 +614,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatShortSyntaxIsWorking() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startArray(FIELD).value("The Prodigy Firestarter").value("Firestarter").endArray().endObject() ) @@ -652,8 +631,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { completionMappingBuilder.searchAnalyzer("classic").indexAnalyzer("classic").preservePositionIncrements(false); createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("The Beatles").endArray().endObject().endObject() ) @@ -675,8 +653,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .endObject() .endObject(); assertAcked(prepareCreate(INDEX).setMapping(mapping)); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setRefreshPolicy(IMMEDIATE) .setSource(jsonBuilder().startObject().field(FIELD, "Foo Fighters").endObject()) .get(); @@ -710,8 +687,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { response -> assertSuggestions(response, "suggs") ); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setRefreshPolicy(IMMEDIATE) .setSource(jsonBuilder().startObject().field(FIELD, "Foo Fighters").endObject()) .get(); @@ -728,8 +704,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterWorks() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -758,8 +733,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterSupportsEditDistances() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -793,8 +767,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterSupportsTranspositions() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -828,8 +801,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterSupportsMinPrefixLength() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -865,8 +837,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterSupportsNonPrefixLength() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -902,8 +873,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatFuzzySuggesterIsUnicodeAware() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource(jsonBuilder().startObject().startObject(FIELD).startArray("input").value("ööööö").endArray().endObject().endObject()) .get(); @@ -964,12 +934,10 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { assertThat(putMappingResponse.isAcknowledged(), is(true)); // Index two entities - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource(jsonBuilder().startObject().field(FIELD, "Foo Fighters").field(otherField, "WHATEVER").endObject()) .get(); - client().prepareIndex(INDEX) - .setId("2") + prepareIndex(INDEX).setId("2") .setSource(jsonBuilder().startObject().field(FIELD, "Bar Fighters").field(otherField, "WHATEVER2").endObject()) .get(); @@ -1017,8 +985,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testThatSortingOnCompletionFieldReturnsUsefulException() throws Exception { createIndexAndMapping(completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("Nirvana").endArray().endObject().endObject() ) @@ -1047,8 +1014,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { builder.indexAnalyzer("simple"); createIndexAndMappingAndSettings(settingsBuilder.build(), builder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1062,8 +1028,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { .get(); // Higher weight so it's ranked first: - client().prepareIndex(INDEX) - .setId("2") + prepareIndex(INDEX).setId("2") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1095,8 +1060,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { createIndexAndMapping(builder); try { - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1128,15 +1092,14 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { weights[id] = Math.max(weight, weights[id]); String suggestion = "suggestion-" + String.format(Locale.ENGLISH, "%03d", id); indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setSource( - jsonBuilder().startObject() - .startObject(FIELD) - .field("input", suggestion) - .field("weight", weight) - .endObject() - .endObject() - ) + prepareIndex(INDEX).setSource( + jsonBuilder().startObject() + .startObject(FIELD) + .field("input", suggestion) + .field("weight", weight) + .endObject() + .endObject() + ) ); } indexRandom(true, indexRequestBuilders); @@ -1298,19 +1261,18 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { public void testPrunedSegments() throws IOException { createIndexAndMappingAndSettings(indexSettings(1, 0).build(), completionMappingBuilder); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value("The Beatles").endArray().endObject().endObject() ) .get(); // we have 2 docs in a segment... - client().prepareIndex(INDEX).setId("2").setSource(jsonBuilder().startObject().field("somefield", "somevalue").endObject()).get(); + prepareIndex(INDEX).setId("2").setSource(jsonBuilder().startObject().field("somefield", "somevalue").endObject()).get(); ForceMergeResponse actionGet = indicesAdmin().prepareForceMerge().setFlush(true).setMaxNumSegments(1).get(); assertAllSuccessful(actionGet); refresh(); // update the first one and then merge.. the target segment will have no value in FIELD - client().prepareIndex(INDEX).setId("1").setSource(jsonBuilder().startObject().field("somefield", "somevalue").endObject()).get(); + prepareIndex(INDEX).setId("1").setSource(jsonBuilder().startObject().field("somefield", "somevalue").endObject()).get(); actionGet = indicesAdmin().prepareForceMerge().setFlush(true).setMaxNumSegments(1).get(); assertAllSuccessful(actionGet); refresh(); @@ -1343,8 +1305,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { ); // can cause stack overflow without the default max_input_length String longString = replaceReservedChars(randomRealisticUnicodeOfLength(randomIntBetween(5000, 10000)), (char) 0x01); - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject().startObject(FIELD).startArray("input").value(longString).endArray().endObject().endObject() ) @@ -1373,8 +1334,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { String string = "foo" + (char) 0x00 + "bar"; Exception e = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex(INDEX) - .setId("1") + () -> prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1407,8 +1367,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { ) ); String string = "foo bar"; - client().prepareIndex(INDEX) - .setId("1") + prepareIndex(INDEX).setId("1") .setSource(jsonBuilder().startObject().field(FIELD, string).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -1429,8 +1388,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1464,9 +1422,9 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { assertAcked(prepareCreate(INDEX).setMapping(mapping)); List builders = new ArrayList<>(); - builders.add(client().prepareIndex(INDEX).setSource(FIELD, "apple")); - builders.add(client().prepareIndex(INDEX).setSource(FIELD, "mango")); - builders.add(client().prepareIndex(INDEX).setSource(FIELD, "papaya")); + builders.add(prepareIndex(INDEX).setSource(FIELD, "apple")); + builders.add(prepareIndex(INDEX).setSource(FIELD, "mango")); + builders.add(prepareIndex(INDEX).setSource(FIELD, "papaya")); indexRandom(true, false, builders); CompletionSuggestionBuilder suggestionBuilder = SuggestBuilders.completionSuggestion("alias").text("app"); @@ -1480,8 +1438,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 1; i <= numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -1524,7 +1481,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { XContentBuilder builder = jsonBuilder().startObject(); builder.startObject(suggestField).field("input", "suggestion" + i).field("weight", i).endObject(); builder.field("collapse_field", "collapse me").endObject(); // all docs the same value for collapsing - client().prepareIndex(index).setId("" + i).setSource(builder).get(); + prepareIndex(index).setId("" + i).setSource(builder).get(); } indicesAdmin().prepareRefresh(index).get(); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(suggestField).prefix("sug").size(1); 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 3493bba9230f..22d48c2f282d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java @@ -77,7 +77,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { source.field("type", "type" + i % 3); } source.endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD) @@ -113,7 +113,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { source.field("type", "type" + i % 3); } source.endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD) @@ -149,7 +149,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { source.field("type", "type" + i % 3); } source.endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD) @@ -168,8 +168,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { LinkedHashMap> map = new LinkedHashMap<>(Collections.singletonMap("cat", contextMapping)); final CompletionMappingBuilder mapping = new CompletionMappingBuilder().context(map); createIndexAndMapping(mapping); - DocWriteResponse indexResponse = client().prepareIndex(INDEX) - .setId("1") + DocWriteResponse indexResponse = prepareIndex(INDEX).setId("1") .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -198,8 +197,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -230,8 +228,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { List indexRequestBuilders = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { indexRequestBuilders.add( - client().prepareIndex(INDEX) - .setId("" + i) + prepareIndex(INDEX).setId("" + i) .setSource( jsonBuilder().startObject() .startObject(FIELD) @@ -275,7 +272,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .field("cat", "cat" + i % 2) .field("type", "type" + i % 4) .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -317,7 +314,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .field("cat", "cat" + i % 2) .field("type", "type" + i % 4) .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -390,7 +387,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { source.field("type" + c, "type" + c + i % 4); } source.endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -423,7 +420,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .endObject() .endObject() .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -457,7 +454,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .endObject() .endObject() .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -490,7 +487,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .endObject() .endObject() .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); CompletionSuggestionBuilder prefix = SuggestBuilders.completionSuggestion(FIELD) @@ -532,7 +529,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .endObject() .endObject() .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } indexRandom(true, indexRequestBuilders); @@ -595,7 +592,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .array("input", "Hotel Amsterdam in Berlin") .endObject() .endObject(); - client().prepareIndex(INDEX).setId("1").setSource(source1).get(); + prepareIndex(INDEX).setId("1").setSource(source1).get(); XContentBuilder source2 = jsonBuilder().startObject() .startObject("location") @@ -605,7 +602,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .array("input", "Hotel Berlin in Amsterdam") .endObject() .endObject(); - client().prepareIndex(INDEX).setId("2").setSource(source2).get(); + prepareIndex(INDEX).setId("2").setSource(source2).get(); refresh(); @@ -647,7 +644,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase { .field("cat", "cat" + id % 2) .field("type", "type" + id) .endObject(); - indexRequestBuilders.add(client().prepareIndex(INDEX).setId("" + i).setSource(source)); + indexRequestBuilders.add(prepareIndex(INDEX).setId("" + i).setSource(source)); } String[] expected = new String[numUnique]; for (int i = 0; i < numUnique; i++) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java index e2a439bc9f94..bade23e193e7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java @@ -295,9 +295,9 @@ public class SuggestSearchIT extends ESIntegTestCase { indexRandom( true, - client().prepareIndex("test").setSource("name", "I like iced tea"), - client().prepareIndex("test").setSource("name", "I like tea."), - client().prepareIndex("test").setSource("name", "I like ice cream.") + prepareIndex("test").setSource("name", "I like iced tea"), + prepareIndex("test").setSource("name", "I like tea."), + prepareIndex("test").setSource("name", "I like ice cream.") ); refresh(); @@ -781,9 +781,9 @@ public class SuggestSearchIT extends ESIntegTestCase { ensureGreen(); indexRandom( true, - client().prepareIndex("test").setId("1").setSource("field1", "foobar1").setRouting("1"), - client().prepareIndex("test").setId("2").setSource("field1", "foobar2").setRouting("2"), - client().prepareIndex("test").setId("3").setSource("field1", "foobar3").setRouting("3") + prepareIndex("test").setId("1").setSource("field1", "foobar1").setRouting("1"), + prepareIndex("test").setId("2").setSource("field1", "foobar2").setRouting("2"), + prepareIndex("test").setId("3").setSource("field1", "foobar3").setRouting("3") ); Suggest suggest = searchSuggest( @@ -1118,7 +1118,7 @@ public class SuggestSearchIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (String title : titles) { - builders.add(client().prepareIndex("test").setSource("title", title)); + builders.add(prepareIndex("test").setSource("title", title)); } indexRandom(true, builders); @@ -1156,9 +1156,9 @@ public class SuggestSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setMapping(mapping)); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("test").setSource("text", "apple")); - builders.add(client().prepareIndex("test").setSource("text", "mango")); - builders.add(client().prepareIndex("test").setSource("text", "papaya")); + builders.add(prepareIndex("test").setSource("text", "apple")); + builders.add(prepareIndex("test").setSource("text", "mango")); + builders.add(prepareIndex("test").setSource("text", "papaya")); indexRandom(true, false, builders); TermSuggestionBuilder termSuggest = termSuggestion("alias").text("appple"); @@ -1181,10 +1181,10 @@ public class SuggestSearchIT extends ESIntegTestCase { assertAcked(prepareCreate("test").setSettings(Settings.builder().put("index.number_of_shards", 1).build()).setMapping(mapping)); List builders = new ArrayList<>(); - builders.add(client().prepareIndex("test").setSource("text", "apple")); - builders.add(client().prepareIndex("test").setSource("text", "apple")); - builders.add(client().prepareIndex("test").setSource("text", "apple")); - builders.add(client().prepareIndex("test").setSource("text", "appfle")); + builders.add(prepareIndex("test").setSource("text", "apple")); + builders.add(prepareIndex("test").setSource("text", "apple")); + builders.add(prepareIndex("test").setSource("text", "apple")); + builders.add(prepareIndex("test").setSource("text", "appfle")); indexRandom(true, false, builders); PhraseSuggestionBuilder phraseSuggest = phraseSuggestion("text").text("appple") @@ -1294,7 +1294,7 @@ public class SuggestSearchIT extends ESIntegTestCase { List builders = new ArrayList<>(); for (String title : titles) { - builders.add(client().prepareIndex("test").setSource("title", title)); + builders.add(prepareIndex("test").setSource("title", title)); } indexRandom(true, builders); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java index 4da91791b535..d4f56730629c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/similarity/SimilarityIT.java @@ -47,8 +47,7 @@ public class SimilarityIT extends ESIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "the quick brown fox jumped over the lazy dog", "field2", "the quick brown fox jumped over the lazy dog") .setRefreshPolicy(IMMEDIATE) .get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java index 6c54e79a1b1b..e7bc6f13383d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/CorruptedBlobStoreRepositoryIT.java @@ -65,7 +65,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1"); logger.info("--> indexing some data"); - indexRandom(true, client().prepareIndex("test-idx-1").setSource("foo", "bar")); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar")); final String snapshot = "test-snap"; @@ -111,11 +111,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); final String snapshot = "test-snap"; @@ -186,11 +182,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); final String snapshot = "test-snap"; @@ -555,11 +547,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas final String[] indices = { "test-idx-1", "test-idx-2" }; createIndex(indices); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); logger.info("--> creating snapshot"); CreateSnapshotResponse createSnapshotResponse = client.admin() @@ -608,11 +596,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); logger.info("--> creating snapshot"); CreateSnapshotResponse createSnapshotResponse = client.admin() @@ -655,11 +639,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); logger.info("--> creating snapshot"); CreateSnapshotResponse createSnapshotResponse = client.admin() @@ -714,9 +694,9 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); indexRandom( true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") + prepareIndex("test-idx-1").setSource("foo", "bar"), + prepareIndex("test-idx-2").setSource("foo", "bar"), + prepareIndex("test-idx-2").setSource("foo", "bar") ); flushAndRefresh("test-idx-1", "test-idx-2"); @@ -760,11 +740,7 @@ public class CorruptedBlobStoreRepositoryIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); logger.info("--> indexing some data"); - indexRandom( - true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") - ); + indexRandom(true, prepareIndex("test-idx-1").setSource("foo", "bar"), prepareIndex("test-idx-2").setSource("foo", "bar")); logger.info("--> creating snapshot"); clusterAdmin().prepareCreateSnapshot("test-repo", "test-snap-1").setWaitForCompletion(true).setIndices("test-idx-*").get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java index 0a141dbc20cc..59fc54347d1d 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java @@ -701,7 +701,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex(indexName).setSource("test", "init").get(); + prepareIndex(indexName).setSource("test", "init").get(); } final Path repoPath = randomRepoPath(); @@ -734,7 +734,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest // add few docs - less than initially docs = between(1, 5); for (int i = 0; i < docs; i++) { - client().prepareIndex(indexName).setSource("test", "test" + i).get(); + prepareIndex(indexName).setSource("test", "test" + i).get(); } // create another snapshot @@ -786,7 +786,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest int docs = between(10, 100); for (int i = 0; i < docs; i++) { - client().prepareIndex(indexName).setSource("test", "init").get(); + prepareIndex(indexName).setSource("test", "init").get(); } final Path repoPath = randomRepoPath(); @@ -798,7 +798,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest docs = between(1, 5); for (int i = 0; i < docs; i++) { - client().prepareIndex(indexName).setSource("test", "test" + i).get(); + prepareIndex(indexName).setSource("test", "test" + i).get(); } logger.info("--> restart random data node and add new data node to change index allocation"); @@ -815,7 +815,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest // index to some other field to trigger a change in index metadata for (int i = 0; i < docs; i++) { - client().prepareIndex(indexName).setSource("new_field", "test" + i).get(); + prepareIndex(indexName).setSource("new_field", "test" + i).get(); } createFullSnapshot(repositoryName, snapshot2); @@ -958,7 +958,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest logger.debug("--> indexing {} docs into {}", snapshotDocCount, indexName); IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[snapshotDocCount]; for (int i = 0; i < snapshotDocCount; i++) { - indexRequestBuilders[i] = client().prepareIndex(indexName).setSource("field", "value"); + indexRequestBuilders[i] = prepareIndex(indexName).setSource("field", "value"); } indexRandom(true, indexRequestBuilders); assertDocCount(indexName, snapshotDocCount); @@ -983,7 +983,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest logger.debug("--> indexing {} extra docs into {}", extraDocCount, indexName); indexRequestBuilders = new IndexRequestBuilder[extraDocCount]; for (int i = 0; i < extraDocCount; i++) { - indexRequestBuilders[i] = client().prepareIndex(indexName).setSource("field", "value"); + indexRequestBuilders[i] = prepareIndex(indexName).setSource("field", "value"); } indexRandom(true, indexRequestBuilders); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java index d171dd2c89c7..3b129455d4ee 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/MetadataLoadingDuringSnapshotRestoreIT.java @@ -56,11 +56,11 @@ public class MetadataLoadingDuringSnapshotRestoreIT extends AbstractSnapshotInte createIndex("docs"); indexRandom( true, - client().prepareIndex("docs").setId("1").setSource("rank", 1), - client().prepareIndex("docs").setId("2").setSource("rank", 2), - client().prepareIndex("docs").setId("3").setSource("rank", 3), - client().prepareIndex("others").setSource("rank", 4), - client().prepareIndex("others").setSource("rank", 5) + prepareIndex("docs").setId("1").setSource("rank", 1), + prepareIndex("docs").setId("2").setSource("rank", 2), + prepareIndex("docs").setId("3").setSource("rank", 3), + prepareIndex("others").setSource("rank", 4), + prepareIndex("others").setSource("rank", 5) ); createRepository("repository", CountingMockRepositoryPlugin.TYPE); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java index 02d3117aef69..20313767c067 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java @@ -669,7 +669,7 @@ public class RestoreSnapshotIT extends AbstractSnapshotIntegTestCase { final int numdocs = randomIntBetween(10, 100); IndexRequestBuilder[] builders = new IndexRequestBuilder[numdocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test-idx").setId(Integer.toString(i)).setSource("field1", "Foo bar " + i); + builders[i] = prepareIndex("test-idx").setId(Integer.toString(i)).setSource("field1", "Foo bar " + i); } indexRandom(true, builders); flushAndRefresh(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index 1ad66a63ef3d..abc2bf8fb721 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -1510,9 +1510,9 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas logger.info("--> indexing some data"); indexRandom( true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar"), - client().prepareIndex("test-idx-3").setSource("foo", "bar") + prepareIndex("test-idx-1").setSource("foo", "bar"), + prepareIndex("test-idx-2").setSource("foo", "bar"), + prepareIndex("test-idx-3").setSource("foo", "bar") ); createSnapshot("test-repo", "test-snap-1", Collections.singletonList("test-idx-*")); @@ -1553,9 +1553,9 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas createIndex("test-idx-1", "test-idx-2"); indexRandom( true, - client().prepareIndex("test-idx-1").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar"), - client().prepareIndex("test-idx-2").setSource("foo", "bar") + prepareIndex("test-idx-1").setSource("foo", "bar"), + prepareIndex("test-idx-2").setSource("foo", "bar"), + prepareIndex("test-idx-2").setSource("foo", "bar") ); flushAndRefresh("test-idx-1", "test-idx-2"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java b/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java index d6dad537afae..841f77ea7efa 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java @@ -48,17 +48,16 @@ public class SimpleThreadPoolIT extends ESIntegTestCase { int numDocs = randomIntBetween(2, 100); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; ++i) { - builders[i] = client().prepareIndex("idx") - .setSource( - jsonBuilder().startObject() - .field("str_value", "s" + i) - .array("str_values", new String[] { "s" + (i * 2), "s" + (i * 2 + 1) }) - .field("l_value", i) - .array("l_values", new int[] { i * 2, i * 2 + 1 }) - .field("d_value", i) - .array("d_values", new double[] { i * 2, i * 2 + 1 }) - .endObject() - ); + builders[i] = prepareIndex("idx").setSource( + jsonBuilder().startObject() + .field("str_value", "s" + i) + .array("str_values", new String[] { "s" + (i * 2), "s" + (i * 2 + 1) }) + .field("l_value", i) + .array("l_values", new int[] { i * 2, i * 2 + 1 }) + .field("d_value", i) + .array("d_values", new double[] { i * 2, i * 2 + 1 }) + .endObject() + ); } indexRandom(true, builders); int numSearches = randomIntBetween(2, 100); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/timeseries/support/TimeSeriesDimensionsLimitIT.java b/server/src/internalClusterTest/java/org/elasticsearch/timeseries/support/TimeSeriesDimensionsLimitIT.java index b3cb2e5f178c..a62560588bdb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/timeseries/support/TimeSeriesDimensionsLimitIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/timeseries/support/TimeSeriesDimensionsLimitIT.java @@ -46,18 +46,16 @@ public class TimeSeriesDimensionsLimitIT extends ESIntegTestCase { ); final Exception ex = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex("test") - .setSource( - "routing_field", - randomAlphaOfLength(10), - dimensionFieldName, - randomAlphaOfLength(1024), - "gauge", - randomIntBetween(10, 20), - "@timestamp", - Instant.now().toEpochMilli() - ) - .get() + () -> prepareIndex("test").setSource( + "routing_field", + randomAlphaOfLength(10), + dimensionFieldName, + randomAlphaOfLength(1024), + "gauge", + randomIntBetween(10, 20), + "@timestamp", + Instant.now().toEpochMilli() + ).get() ); assertThat( ex.getCause().getMessage(), @@ -76,14 +74,18 @@ public class TimeSeriesDimensionsLimitIT extends ESIntegTestCase { dimensionFieldLimit ); long startTime = Instant.now().toEpochMilli(); - client().prepareIndex("test") - .setSource("field", randomAlphaOfLength(1024), "gauge", randomIntBetween(10, 20), "@timestamp", startTime) + prepareIndex("test").setSource("field", randomAlphaOfLength(1024), "gauge", randomIntBetween(10, 20), "@timestamp", startTime) .get(); final Exception ex = expectThrows( DocumentParsingException.class, - () -> client().prepareIndex("test") - .setSource("field", randomAlphaOfLength(1025), "gauge", randomIntBetween(10, 20), "@timestamp", startTime + 1) - .get() + () -> prepareIndex("test").setSource( + "field", + randomAlphaOfLength(1025), + "gauge", + randomIntBetween(10, 20), + "@timestamp", + startTime + 1 + ).get() ); assertThat(ex.getCause().getMessage(), equalTo("Dimension fields must be less than [1024] bytes but was [1025].")); } @@ -141,7 +143,7 @@ public class TimeSeriesDimensionsLimitIT extends ESIntegTestCase { for (int i = 0; i < dimensionFieldLimit; i++) { source.put(dimensionFieldNames.get(i), randomAlphaOfLength(1024)); } - final DocWriteResponse indexResponse = client().prepareIndex("test").setSource(source).get(); + final DocWriteResponse indexResponse = prepareIndex("test").setSource(source).get(); assertEquals(RestStatus.CREATED.getStatus(), indexResponse.status().getStatus()); } @@ -167,7 +169,7 @@ public class TimeSeriesDimensionsLimitIT extends ESIntegTestCase { for (int i = 0; i < dimensionFieldLimit; i++) { source.put(dimensionFieldNames.get(i), randomAlphaOfLength(1024)); } - final Exception ex = expectThrows(DocumentParsingException.class, () -> client().prepareIndex("test").setSource(source).get()); + final Exception ex = expectThrows(DocumentParsingException.class, () -> prepareIndex("test").setSource(source).get()); assertEquals("_tsid longer than [32766] bytes [33903].", ex.getCause().getMessage()); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java index de9111c7013f..813ff8b4227b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/update/UpdateIT.java @@ -301,7 +301,7 @@ public class UpdateIT extends ESIntegTestCase { ); assertEquals("[1]: document missing", ex.getMessage()); - client().prepareIndex("test").setId("1").setSource("field", 1).get(); + prepareIndex("test").setId("1").setSource("field", 1).get(); UpdateResponse updateResponse = client().prepareUpdate(indexOrAlias(), "1").setScript(fieldIncScript).get(); assertThat(updateResponse.getVersion(), equalTo(2L)); @@ -369,7 +369,7 @@ public class UpdateIT extends ESIntegTestCase { } // check _source parameter - client().prepareIndex("test").setId("1").setSource("field1", 1, "field2", 2).get(); + prepareIndex("test").setId("1").setSource("field1", 1, "field2", 2).get(); updateResponse = client().prepareUpdate(indexOrAlias(), "1") .setScript(new Script(ScriptType.INLINE, UPDATE_SCRIPTS, FIELD_INC_SCRIPT, Collections.singletonMap("field", "field1"))) .setFetchSource("field1", "field2") @@ -384,7 +384,7 @@ public class UpdateIT extends ESIntegTestCase { // check updates without script // add new field - client().prepareIndex("test").setId("1").setSource("field", 1).get(); + prepareIndex("test").setId("1").setSource("field", 1).get(); client().prepareUpdate(indexOrAlias(), "1") .setDoc(XContentFactory.jsonBuilder().startObject().field("field2", 2).endObject()) .get(); @@ -412,7 +412,7 @@ public class UpdateIT extends ESIntegTestCase { testMap.put("commonkey", testMap2); testMap.put("map1", 8); - client().prepareIndex("test").setId("1").setSource("map", testMap).get(); + prepareIndex("test").setId("1").setSource("map", testMap).get(); client().prepareUpdate(indexOrAlias(), "1") .setDoc(XContentFactory.jsonBuilder().startObject().field("map", testMap3).endObject()) .get(); @@ -435,7 +435,7 @@ public class UpdateIT extends ESIntegTestCase { createTestIndex(); ensureGreen(); - DocWriteResponse result = client().prepareIndex("test").setId("1").setSource("field", 1).get(); + DocWriteResponse result = prepareIndex("test").setId("1").setSource("field", 1).get(); expectThrows( VersionConflictEngineException.class, () -> client().prepareUpdate(indexOrAlias(), "1") @@ -510,9 +510,8 @@ public class UpdateIT extends ESIntegTestCase { ensureGreen(); // Index some documents - client().prepareIndex().setIndex("test").setId("id1").setRouting("routing1").setSource("field1", 1, "content", "foo").get(); - - client().prepareIndex().setIndex("test").setId("id2").setSource("field1", 0, "content", "bar").get(); + prepareIndex("test").setId("id1").setRouting("routing1").setSource("field1", 1, "content", "foo").get(); + prepareIndex("test").setId("id2").setSource("field1", 0, "content", "bar").get(); // Update the first object and note context variables values UpdateResponse updateResponse = client().prepareUpdate("test", "id1") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/validate/SimpleValidateQueryIT.java index c6130d279aa1..603bfbeaa3df 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/validate/SimpleValidateQueryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/validate/SimpleValidateQueryIT.java @@ -138,7 +138,7 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { .get(); for (int i = 0; i < 10; i++) { - client().prepareIndex("test").setSource("foo", "text", "bar", i, "baz", "blort").setId(Integer.toString(i)).get(); + prepareIndex("test").setSource("foo", "text", "bar", i, "baz", "blort").setId(Integer.toString(i)).get(); } refresh(); @@ -183,7 +183,7 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { String aMonthAgo = DateTimeFormatter.ISO_LOCAL_DATE.format(now.plus(1, ChronoUnit.MONTHS)); String aMonthFromNow = DateTimeFormatter.ISO_LOCAL_DATE.format(now.minus(1, ChronoUnit.MONTHS)); - client().prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); + prepareIndex("test").setId("1").setSource("past", aMonthAgo, "future", aMonthFromNow).get(); refresh(); @@ -244,10 +244,10 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { .setMapping("field", "type=text,analyzer=whitespace") .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1)) .get(); - client().prepareIndex("test").setId("1").setSource("field", "quick lazy huge brown pidgin").get(); - client().prepareIndex("test").setId("2").setSource("field", "the quick brown fox").get(); - client().prepareIndex("test").setId("3").setSource("field", "the quick lazy huge brown fox jumps over the tree").get(); - client().prepareIndex("test").setId("4").setSource("field", "the lazy dog quacks like a duck").get(); + prepareIndex("test").setId("1").setSource("field", "quick lazy huge brown pidgin").get(); + prepareIndex("test").setId("2").setSource("field", "the quick brown fox").get(); + prepareIndex("test").setId("3").setSource("field", "the quick lazy huge brown fox jumps over the tree").get(); + prepareIndex("test").setId("4").setSource("field", "the lazy dog quacks like a duck").get(); refresh(); // prefix queries @@ -290,10 +290,10 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { .get(); // We are relying on specific routing behaviors for the result to be right, so // we cannot randomize the number of shards or change ids here. - client().prepareIndex("test").setId("1").setSource("field", "quick lazy huge brown pidgin").get(); - client().prepareIndex("test").setId("2").setSource("field", "the quick brown fox").get(); - client().prepareIndex("test").setId("3").setSource("field", "the quick lazy huge brown fox jumps over the tree").get(); - client().prepareIndex("test").setId("4").setSource("field", "the lazy dog quacks like a duck").get(); + prepareIndex("test").setId("1").setSource("field", "quick lazy huge brown pidgin").get(); + prepareIndex("test").setId("2").setSource("field", "the quick brown fox").get(); + prepareIndex("test").setId("3").setSource("field", "the quick lazy huge brown fox jumps over the tree").get(); + prepareIndex("test").setId("4").setSource("field", "the lazy dog quacks like a duck").get(); refresh(); // prefix queries @@ -368,7 +368,7 @@ public class SimpleValidateQueryIT extends ESIntegTestCase { .setMapping("user", "type=integer", "followers", "type=integer") .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 2).put("index.number_of_routing_shards", 2)) .get(); - client().prepareIndex("twitter").setId("1").setSource("followers", new int[] { 1, 2, 3 }).get(); + prepareIndex("twitter").setId("1").setSource("followers", new int[] { 1, 2, 3 }).get(); refresh(); TermsQueryBuilder termsLookupQuery = QueryBuilders.termsLookupQuery("user", new TermsLookup("twitter", "1", "followers")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index e2fbf85b3a67..69c10edf8980 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -31,7 +31,7 @@ public class ConcurrentDocumentOperationIT extends ESIntegTestCase { final AtomicReference failure = new AtomicReference<>(); final CountDownLatch latch = new CountDownLatch(numberOfUpdates); for (int i = 0; i < numberOfUpdates; i++) { - client().prepareIndex("test").setId("1").setSource("field1", i).execute(new ActionListener<>() { + prepareIndex("test").setId("1").setSource("field1", i).execute(new ActionListener<>() { @Override public void onResponse(DocWriteResponse response) { latch.countDown(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java index 3fca413ea5c4..2b804293cd50 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/ConcurrentSeqNoVersioningIT.java @@ -136,7 +136,7 @@ public class ConcurrentSeqNoVersioningIT extends AbstractDisruptionTestCase { logger.info("--> Indexing initial doc for {} keys", numberOfKeys); List partitions = IntStream.range(0, numberOfKeys) - .mapToObj(i -> client().prepareIndex("test").setId("ID:" + i).setSource("value", -1).get()) + .mapToObj(i -> prepareIndex("test").setId("ID:" + i).setSource("value", -1).get()) .map(response -> new Partition(response.getId(), new Version(response.getPrimaryTerm(), response.getSeqNo()))) .toList(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java index a36ba897f54b..985b42cd07f9 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -52,17 +52,11 @@ public class SimpleVersioningIT extends ESIntegTestCase { // this should conflict with the delete command transaction which told us that the object was deleted at version 17. assertFutureThrows( - client().prepareIndex("test") - .setId("1") - .setSource("field1", "value1_1") - .setVersion(13) - .setVersionType(VersionType.EXTERNAL) - .execute(), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setVersion(13).setVersionType(VersionType.EXTERNAL).execute(), VersionConflictEngineException.class ); - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(18) .setVersionType(VersionType.EXTERNAL) @@ -73,24 +67,21 @@ public class SimpleVersioningIT extends ESIntegTestCase { public void testExternalGTE() throws Exception { createIndex("test"); - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(12) .setVersionType(VersionType.EXTERNAL_GTE) .get(); assertThat(indexResponse.getVersion(), equalTo(12L)); - indexResponse = client().prepareIndex("test") - .setId("1") + indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_2") .setVersion(12) .setVersionType(VersionType.EXTERNAL_GTE) .get(); assertThat(indexResponse.getVersion(), equalTo(12L)); - indexResponse = client().prepareIndex("test") - .setId("1") + indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_2") .setVersion(14) .setVersionType(VersionType.EXTERNAL_GTE) @@ -98,11 +89,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { assertThat(indexResponse.getVersion(), equalTo(14L)); assertRequestBuilderThrows( - client().prepareIndex("test") - .setId("1") - .setSource("field1", "value1_1") - .setVersion(13) - .setVersionType(VersionType.EXTERNAL_GTE), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setVersion(13).setVersionType(VersionType.EXTERNAL_GTE), VersionConflictEngineException.class ); @@ -142,16 +129,14 @@ public class SimpleVersioningIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test") - .setId("1") + DocWriteResponse indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(12) .setVersionType(VersionType.EXTERNAL) .get(); assertThat(indexResponse.getVersion(), equalTo(12L)); - indexResponse = client().prepareIndex("test") - .setId("1") + indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(14) .setVersionType(VersionType.EXTERNAL) @@ -159,12 +144,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { assertThat(indexResponse.getVersion(), equalTo(14L)); assertFutureThrows( - client().prepareIndex("test") - .setId("1") - .setSource("field1", "value1_1") - .setVersion(13) - .setVersionType(VersionType.EXTERNAL) - .execute(), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setVersion(13).setVersionType(VersionType.EXTERNAL).execute(), VersionConflictEngineException.class ); @@ -199,8 +179,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { // TODO: This behavior breaks rest api returning http status 201 // good news is that it this is only the case until deletes GC kicks in. - indexResponse = client().prepareIndex("test") - .setId("1") + indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(19) .setVersionType(VersionType.EXTERNAL) @@ -216,8 +195,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { Thread.sleep(300); // gc works based on estimated sampled time. Give it a chance... // And now we have previous version return -1 - indexResponse = client().prepareIndex("test") - .setId("1") + indexResponse = prepareIndex("test").setId("1") .setSource("field1", "value1_1") .setVersion(20) .setVersionType(VersionType.EXTERNAL) @@ -251,7 +229,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { VersionConflictEngineException.class ); - DocWriteResponse indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_1").setCreate(true).get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_1").setCreate(true).get(); assertThat(indexResponse.getVersion(), equalTo(1L)); } @@ -259,26 +237,26 @@ public class SimpleVersioningIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); assertThat(indexResponse.getSeqNo(), equalTo(0L)); assertThat(indexResponse.getPrimaryTerm(), equalTo(1L)); - indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_2").setIfSeqNo(0L).setIfPrimaryTerm(1).get(); + indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_2").setIfSeqNo(0L).setIfPrimaryTerm(1).get(); assertThat(indexResponse.getSeqNo(), equalTo(1L)); assertThat(indexResponse.getPrimaryTerm(), equalTo(1L)); assertFutureThrows( - client().prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(10).setIfPrimaryTerm(1).execute(), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(10).setIfPrimaryTerm(1).execute(), VersionConflictEngineException.class ); assertFutureThrows( - client().prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(10).setIfPrimaryTerm(2).execute(), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(10).setIfPrimaryTerm(2).execute(), VersionConflictEngineException.class ); assertFutureThrows( - client().prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(1).setIfPrimaryTerm(2).execute(), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(1).setIfPrimaryTerm(2).execute(), VersionConflictEngineException.class ); @@ -344,21 +322,21 @@ public class SimpleVersioningIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - DocWriteResponse indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); + DocWriteResponse indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_1").get(); assertThat(indexResponse.getSeqNo(), equalTo(0L)); client().admin().indices().prepareFlush().get(); - indexResponse = client().prepareIndex("test").setId("1").setSource("field1", "value1_2").setIfSeqNo(0).setIfPrimaryTerm(1).get(); + indexResponse = prepareIndex("test").setId("1").setSource("field1", "value1_2").setIfSeqNo(0).setIfPrimaryTerm(1).get(); assertThat(indexResponse.getSeqNo(), equalTo(1L)); client().admin().indices().prepareFlush().get(); assertRequestBuilderThrows( - client().prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(0).setIfPrimaryTerm(1), + prepareIndex("test").setId("1").setSource("field1", "value1_1").setIfSeqNo(0).setIfPrimaryTerm(1), VersionConflictEngineException.class ); assertRequestBuilderThrows( - client().prepareIndex("test").setId("1").setCreate(true).setSource("field1", "value1_1"), + prepareIndex("test").setId("1").setCreate(true).setSource("field1", "value1_1"), VersionConflictEngineException.class ); @@ -385,9 +363,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { createIndex("test"); ensureGreen(); - BulkResponse bulkResponse = client().prepareBulk() - .add(client().prepareIndex("test").setId("1").setSource("field1", "value1_1")) - .get(); + BulkResponse bulkResponse = client().prepareBulk().add(prepareIndex("test").setId("1").setSource("field1", "value1_1")).get(); assertThat(bulkResponse.hasFailures(), equalTo(false)); assertThat(bulkResponse.getItems().length, equalTo(1)); IndexResponse indexResponse = bulkResponse.getItems()[0].getResponse(); @@ -667,8 +643,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { } } else { try { - idVersion.response = client().prepareIndex("test") - .setId(id) + idVersion.response = prepareIndex("test").setId(id) .setSource("foo", "bar") .setVersion(version) .setVersionType(VersionType.EXTERNAL) @@ -743,8 +718,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { updateIndexSettings(Settings.builder().put("index.gc_deletes", "10ms").put("index.refresh_interval", "-1"), "test"); // Index a doc: - client().prepareIndex("test") - .setId("id") + prepareIndex("test").setId("id") .setSource("foo", "bar") .setOpType(DocWriteRequest.OpType.INDEX) .setVersion(10) @@ -780,8 +754,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { // We test deletes, but can't rely on wall-clock delete GC: updateIndexSettings(Settings.builder().put("index.gc_deletes", "0ms"), "test"); // Index a doc: - client().prepareIndex("test") - .setId("id") + prepareIndex("test").setId("id") .setSource("foo", "bar") .setOpType(DocWriteRequest.OpType.INDEX) .setVersion(10) @@ -803,30 +776,26 @@ public class SimpleVersioningIT extends ESIntegTestCase { public void testSpecialVersioning() { internalCluster().ensureAtLeastNumDataNodes(2); createIndex("test", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).build()); - DocWriteResponse doc1 = client().prepareIndex("test") - .setId("1") + DocWriteResponse doc1 = prepareIndex("test").setId("1") .setSource("field", "value1") .setVersion(0) .setVersionType(VersionType.EXTERNAL) .get(); assertThat(doc1.getVersion(), equalTo(0L)); - DocWriteResponse doc2 = client().prepareIndex("test") - .setId("1") + DocWriteResponse doc2 = prepareIndex("test").setId("1") .setSource("field", "value2") .setVersion(Versions.MATCH_ANY) .setVersionType(VersionType.INTERNAL) .get(); assertThat(doc2.getVersion(), equalTo(1L)); client().prepareDelete("test", "1").get(); // v2 - DocWriteResponse doc3 = client().prepareIndex("test") - .setId("1") + DocWriteResponse doc3 = prepareIndex("test").setId("1") .setSource("field", "value3") .setVersion(Versions.MATCH_DELETED) .setVersionType(VersionType.INTERNAL) .get(); assertThat(doc3.getVersion(), equalTo(3L)); - DocWriteResponse doc4 = client().prepareIndex("test") - .setId("1") + DocWriteResponse doc4 = prepareIndex("test").setId("1") .setSource("field", "value4") .setVersion(4L) .setVersionType(VersionType.EXTERNAL_GTE) diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java index 7190b7ec216c..065dea4be743 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java @@ -39,7 +39,7 @@ public class IndicesSegmentsRequestTests extends ESSingleNodeTestCase { int numDocs = scaledRandomIntBetween(100, 1000); for (int j = 0; j < numDocs; ++j) { String id = Integer.toString(j); - client().prepareIndex("test").setId(id).setSource("text", "sometext").get(); + prepareIndex("test").setId(id).setSource("text", "sometext").get(); } client().admin().indices().prepareFlush("test").get(); client().admin().indices().prepareRefresh().get(); diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java index de28a7c7bd99..661727d83274 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java @@ -72,7 +72,7 @@ public class IndicesStatsTests extends ESSingleNodeTestCase { .setSettings(Settings.builder().put("index.store.type", storeType.getSettingsKey())) ); ensureGreen("test"); - client().prepareIndex("test").setId("1").setSource("foo", "bar", "bar", "baz", "baz", 42).get(); + prepareIndex("test").setId("1").setSource("foo", "bar", "bar", "baz", "baz", 42).get(); indicesAdmin().prepareRefresh("test").get(); IndicesStatsResponse rsp = indicesAdmin().prepareStats("test").get(); @@ -80,7 +80,7 @@ public class IndicesStatsTests extends ESSingleNodeTestCase { assertThat(stats.getCount(), greaterThan(0L)); // now check multiple segments stats are merged together - client().prepareIndex("test").setId("2").setSource("foo", "bar", "bar", "baz", "baz", 43).get(); + prepareIndex("test").setId("2").setSource("foo", "bar", "bar", "baz", "baz", 43).get(); indicesAdmin().prepareRefresh("test").get(); rsp = indicesAdmin().prepareStats("test").get(); @@ -107,8 +107,7 @@ public class IndicesStatsTests extends ESSingleNodeTestCase { createIndex("test", Settings.builder().put("refresh_interval", -1).build()); // Index a document asynchronously so the request will only return when document is refreshed - ActionFuture index = client().prepareIndex("test") - .setId("test") + ActionFuture index = prepareIndex("test").setId("test") .setSource("test", "test") .setRefreshPolicy(RefreshPolicy.WAIT_UNTIL) .execute(); diff --git a/server/src/test/java/org/elasticsearch/action/search/KnnSearchSingleNodeTests.java b/server/src/test/java/org/elasticsearch/action/search/KnnSearchSingleNodeTests.java index ee42be5cc92d..e6abe2f041a4 100644 --- a/server/src/test/java/org/elasticsearch/action/search/KnnSearchSingleNodeTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/KnnSearchSingleNodeTests.java @@ -53,8 +53,8 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index").setId(Integer.toString(doc)).setSource("vector", randomVector(), "text", "hello world").get(); - client().prepareIndex("index").setSource("text", "goodnight world").get(); + prepareIndex("index").setId(Integer.toString(doc)).setSource("vector", randomVector(), "text", "hello world").get(); + prepareIndex("index").setSource("text", "goodnight world").get(); } indicesAdmin().prepareRefresh("index").get(); @@ -96,8 +96,8 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index").setSource("vector", randomVector(), "text", "hello world").get(); - client().prepareIndex("index").setSource("text", "goodnight world").get(); + prepareIndex("index").setSource("vector", randomVector(), "text", "hello world").get(); + prepareIndex("index").setSource("text", "goodnight world").get(); } indicesAdmin().prepareRefresh("index").get(); @@ -141,7 +141,7 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { for (int doc = 0; doc < 10; doc++) { String value = doc % 2 == 0 ? "first" : "second"; - client().prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", value).get(); + prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", value).get(); } indicesAdmin().prepareRefresh("index").get(); @@ -183,9 +183,9 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "value").get(); + prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "value").get(); } - client().prepareIndex("index").setId("lookup-doc").setSource("other-field", "value").get(); + prepareIndex("index").setId("lookup-doc").setSource("other-field", "value").get(); indicesAdmin().prepareRefresh("index").get(); @@ -230,9 +230,9 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index").setSource("vector", randomVector(1.0f, 2.0f), "text", "hello world", "number", 1).get(); - client().prepareIndex("index").setSource("vector_2", randomVector(20f, 21f), "text", "hello world", "number", 2).get(); - client().prepareIndex("index").setSource("text", "goodnight world", "number", 3).get(); + prepareIndex("index").setSource("vector", randomVector(1.0f, 2.0f), "text", "hello world", "number", 1).get(); + prepareIndex("index").setSource("vector_2", randomVector(20f, 21f), "text", "hello world", "number", 2).get(); + prepareIndex("index").setSource("text", "goodnight world", "number", 3).get(); } indicesAdmin().prepareRefresh("index").get(); @@ -290,7 +290,7 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { for (int doc = 0; doc < 10; doc++) { // Make them have hte same vector. This will allow us to test the recall is the same but scores take into account both fields float[] vector = randomVector(); - client().prepareIndex("index").setSource("vector", vector, "vector_2", vector, "number", doc).get(); + prepareIndex("index").setSource("vector", vector, "vector_2", vector, "number", doc).get(); } indicesAdmin().prepareRefresh("index").get(); @@ -356,10 +356,10 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { int expectedHits = 0; for (int doc = 0; doc < 10; doc++) { if (randomBoolean()) { - client().prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "hit").get(); + prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "hit").get(); ++expectedHits; } else { - client().prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "not hit").get(); + prepareIndex("index").setId(String.valueOf(doc)).setSource("vector", randomVector(), "field", "not hit").get(); } } indicesAdmin().prepareRefresh("index").get(); @@ -389,8 +389,8 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index2", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index1").setId(String.valueOf(doc)).setSource("vector", randomVector()).get(); - client().prepareIndex("index2").setId(String.valueOf(doc)).setSource("vector", randomVector()).get(); + prepareIndex("index1").setId(String.valueOf(doc)).setSource("vector", randomVector()).get(); + prepareIndex("index2").setId(String.valueOf(doc)).setSource("vector", randomVector()).get(); } indicesAdmin().prepareForceMerge("index1", "index2").setMaxNumSegments(1).get(); @@ -427,7 +427,7 @@ public class KnnSearchSingleNodeTests extends ESSingleNodeTestCase { createIndex("index", indexSettings, builder); for (int doc = 0; doc < 10; doc++) { - client().prepareIndex("index").setSource("vector", randomVector(4096)).get(); + prepareIndex("index").setSource("vector", randomVector(4096)).get(); } indicesAdmin().prepareRefresh("index").get(); diff --git a/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java index 45bfc53c4148..f1bf8d1dcb0d 100644 --- a/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java +++ b/server/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsTests.java @@ -165,8 +165,7 @@ public class GetTermVectorsTests extends ESSingleNodeTestCase { .build(); createIndex("test", setting, mapping); - client().prepareIndex("test") - .setId(Integer.toString(1)) + prepareIndex("test").setId(Integer.toString(1)) .setSource(jsonBuilder().startObject().field("field", queryString).endObject()) .get(); client().admin().indices().prepareRefresh().get(); diff --git a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java index e60142a64ff5..d2304908a933 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java @@ -275,7 +275,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { assertEquals(1000, refreshTask.getInterval().millis()); assertTrue(indexService.getRefreshTask().mustReschedule()); IndexShard shard = indexService.getShard(0); - client().prepareIndex("test").setId("0").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("0").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); // now disable the refresh indicesAdmin().prepareUpdateSettings("test") .setSettings(Settings.builder().put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), -1)) @@ -294,7 +294,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { }); assertFalse(refreshTask.isClosed()); // refresh every millisecond - client().prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); indicesAdmin().prepareUpdateSettings("test") .setSettings(Settings.builder().put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "1ms")) .get(); @@ -306,7 +306,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { assertEquals(2, search.totalHits.value); } }); - client().prepareIndex("test").setId("2").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("2").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); assertBusy(() -> { // this one becomes visible due to the scheduled refresh try (Engine.Searcher searcher = shard.acquireSearcher("test")) { @@ -324,7 +324,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { IndexService indexService = createIndex("test", settings); ensureGreen("test"); assertTrue(indexService.getRefreshTask().mustReschedule()); - client().prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); IndexShard shard = indexService.getShard(0); assertBusy(() -> assertFalse(shard.isSyncNeeded())); } @@ -344,7 +344,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { assertNotNull(indexService.getFsyncTask()); assertTrue(indexService.getFsyncTask().mustReschedule()); - client().prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); assertNotNull(indexService.getFsyncTask()); final IndexShard shard = indexService.getShard(0); assertBusy(() -> assertFalse(shard.isSyncNeeded())); @@ -367,7 +367,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { IndexService indexService = createIndex("test", settings); ensureGreen("test"); assertTrue(indexService.getTrimTranslogTask().mustReschedule()); - client().prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex("test").setId("1").setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); indicesAdmin().prepareFlush("test").get(); IndexShard shard = indexService.getShard(0); assertBusy(() -> assertThat(IndexShardTestCase.getTranslog(shard).totalOperations(), equalTo(0))); @@ -384,7 +384,7 @@ public class IndexServiceTests extends ESSingleNodeTestCase { int translogOps = 0; final int numDocs = scaledRandomIntBetween(10, 100); for (int i = 0; i < numDocs; i++) { - client().prepareIndex().setIndex(indexName).setId(String.valueOf(i)).setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); + prepareIndex(indexName).setId(String.valueOf(i)).setSource("{\"foo\": \"bar\"}", XContentType.JSON).get(); translogOps++; if (randomBoolean()) { indicesAdmin().prepareFlush(indexName).get(); diff --git a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java index e79b088893ac..a0eff567274d 100644 --- a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java +++ b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java @@ -94,7 +94,7 @@ public class FieldStatsProviderRefreshTests extends ESSingleNodeTestCase { } private void indexDocument(String id, String sValue) { - DocWriteResponse response = client().prepareIndex("index").setId(id).setSource("s", sValue).get(); + DocWriteResponse response = prepareIndex("index").setId(id).setSource("s", sValue).get(); assertThat(response.status(), anyOf(equalTo(RestStatus.OK), equalTo(RestStatus.CREATED))); } } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSearchTests.java b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSearchTests.java index 20d307a0d4cb..2c4c620c057b 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSearchTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/flattened/FlattenedFieldSearchTests.java @@ -74,8 +74,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testMatchQuery() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -96,8 +95,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testMultiMatchQuery() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -117,8 +115,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testQueryStringQuery() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -140,8 +137,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testSimpleQueryStringQuery() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -160,8 +156,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testExists() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -202,7 +197,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } for (int i = 0; i < 10; i++) { - bulkRequest.add(client().prepareIndex("test").setSource("other_field", "1")); + bulkRequest.add(prepareIndex("test").setSource("other_field", "1")); } BulkResponse bulkResponse = bulkRequest.get(); @@ -331,8 +326,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testLoadDocValuesFields() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -361,8 +355,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { } public void testFieldSort() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -375,8 +368,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource( XContentFactory.jsonBuilder() @@ -389,8 +381,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { ) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setRefreshPolicy(RefreshPolicy.IMMEDIATE) .setSource(XContentFactory.jsonBuilder().startObject().startObject("flattened").field("other_key", "E").endObject().endObject()) .get(); @@ -417,7 +408,7 @@ public class FlattenedFieldSearchTests extends ESSingleNodeTestCase { headers.put("origin", "https://www.elastic.co"); Map source = Collections.singletonMap("headers", headers); - client().prepareIndex("test").setId("1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).setSource(source).get(); + prepareIndex("test").setId("1").setRefreshPolicy(RefreshPolicy.IMMEDIATE).setSource(source).get(); SearchResponse response = client().prepareSearch("test").setFetchSource(true).get(); assertThat(response.getHits().getAt(0).getSourceAsMap(), equalTo(source)); diff --git a/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java index c7d52e197a1c..b51c869fc73c 100644 --- a/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java @@ -48,7 +48,7 @@ public class TermVectorsServiceTests extends ESSingleNodeTestCase { createIndex("test", Settings.EMPTY, mapping); ensureGreen(); - client().prepareIndex("test").setId("0").setSource("field", "foo bar").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("0").setSource("field", "foo bar").setRefreshPolicy(IMMEDIATE).get(); IndicesService indicesService = getInstanceFromNode(IndicesService.class); IndexService test = indicesService.indexService(resolveIndex("test")); @@ -82,9 +82,7 @@ public class TermVectorsServiceTests extends ESSingleNodeTestCase { int max = between(3, 10); BulkRequestBuilder bulk = client().prepareBulk(); for (int i = 0; i < max; i++) { - bulk.add( - client().prepareIndex("test").setId(Integer.toString(i)).setSource("text", "the quick brown fox jumped over the lazy dog") - ); + bulk.add(prepareIndex("test").setId(Integer.toString(i)).setSource("text", "the quick brown fox jumped over the lazy dog")); } bulk.get(); @@ -123,9 +121,7 @@ public class TermVectorsServiceTests extends ESSingleNodeTestCase { int max = between(3, 10); BulkRequestBuilder bulk = client().prepareBulk(); for (int i = 0; i < max; i++) { - bulk.add( - client().prepareIndex("test").setId(Integer.toString(i)).setSource("text", "the quick brown fox jumped over the lazy dog") - ); + bulk.add(prepareIndex("test").setId(Integer.toString(i)).setSource("text", "the quick brown fox jumped over the lazy dog")); } bulk.get(); diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 025f5e89e946..846625fc4f79 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -268,7 +268,7 @@ public class IndicesServiceTests extends ESSingleNodeTestCase { assertNull(meta.index("test")); test = createIndex("test"); - client().prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); client().admin().indices().prepareFlush("test").get(); assertHitCount(client().prepareSearch("test"), 1); IndexMetadata secondMetadata = clusterService.state().metadata().index("test"); diff --git a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java index d342f8c3dd34..9dd4fa4bfb84 100644 --- a/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java +++ b/server/src/test/java/org/elasticsearch/repositories/blobstore/BlobStoreRepositoryTests.java @@ -104,7 +104,7 @@ public class BlobStoreRepositoryTests extends ESSingleNodeTestCase { int numDocs = randomIntBetween(10, 20); for (int i = 0; i < numDocs; i++) { String id = Integer.toString(i); - client().prepareIndex(indexName).setId(id).setSource("text", "sometext").get(); + prepareIndex(indexName).setId(id).setSource("text", "sometext").get(); } indicesAdmin().prepareFlush(indexName).get(); diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index 4618b9d5bd1a..becc9b9e5323 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -247,7 +247,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testClearOnClose() { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchResponse searchResponse = client().prepareSearch("index").setSize(1).setScroll("1m").get(); assertThat(searchResponse.getScrollId(), is(notNullValue())); SearchService service = getInstanceFromNode(SearchService.class); @@ -259,7 +259,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testClearOnStop() { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchResponse searchResponse = client().prepareSearch("index").setSize(1).setScroll("1m").get(); assertThat(searchResponse.getScrollId(), is(notNullValue())); SearchService service = getInstanceFromNode(SearchService.class); @@ -271,7 +271,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testClearIndexDelete() { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchResponse searchResponse = client().prepareSearch("index").setSize(1).setScroll("1m").get(); assertThat(searchResponse.getScrollId(), is(notNullValue())); SearchService service = getInstanceFromNode(SearchService.class); @@ -284,7 +284,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testCloseSearchContextOnRewriteException() { // if refresh happens while checking the exception, the subsequent reference count might not match, so we switch it off createIndex("index", Settings.builder().put("index.refresh_interval", -1).build()); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchService service = getInstanceFromNode(SearchService.class); IndicesService indicesService = getInstanceFromNode(IndicesService.class); @@ -303,7 +303,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testSearchWhileIndexDeleted() throws InterruptedException { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchService service = getInstanceFromNode(SearchService.class); IndicesService indicesService = getInstanceFromNode(IndicesService.class); @@ -336,8 +336,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { } catch (InterruptedException e) { throw new AssertionError(e); } - client().prepareIndex("index") - .setSource("field", "value") + prepareIndex("index").setSource("field", "value") .setRefreshPolicy(randomFrom(WriteRequest.RefreshPolicy.values())) .execute(new ActionListener() { @Override @@ -428,7 +427,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testSearchWhileIndexDeletedDoesNotLeakSearchContext() throws ExecutionException, InterruptedException { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); IndicesService indicesService = getInstanceFromNode(IndicesService.class); IndexService indexService = indicesService.indexServiceSafe(resolveIndex("index")); @@ -483,7 +482,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testBeforeShardLockDuringShardCreate() { IndexService indexService = createIndex("index", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).build()); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); SearchResponse searchResponse = client().prepareSearch("index").setSize(1).setScroll("1m").get(); assertThat(searchResponse.getScrollId(), is(notNullValue())); SearchService service = getInstanceFromNode(SearchService.class); @@ -581,7 +580,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testMaxDocvalueFieldsSearch() throws IOException { final Settings settings = Settings.builder().put(IndexSettings.MAX_DOCVALUE_FIELDS_SEARCH_SETTING.getKey(), 1).build(); createIndex("index", settings, null, "field1", "keyword", "field2", "keyword"); - client().prepareIndex("index").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); final SearchService service = getInstanceFromNode(SearchService.class); final IndicesService indicesService = getInstanceFromNode(IndicesService.class); @@ -635,11 +634,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testDeduplicateDocValuesFields() throws Exception { createIndex("index", Settings.EMPTY, "_doc", "field1", "type=date", "field2", "type=date"); - client().prepareIndex("index") - .setId("1") - .setSource("field1", "2022-08-03", "field2", "2022-08-04") - .setRefreshPolicy(IMMEDIATE) - .get(); + prepareIndex("index").setId("1").setSource("field1", "2022-08-03", "field2", "2022-08-04").setRefreshPolicy(IMMEDIATE).get(); SearchService service = getInstanceFromNode(SearchService.class); IndicesService indicesService = getInstanceFromNode(IndicesService.class); IndexService indexService = indicesService.indexServiceSafe(resolveIndex("index")); @@ -785,7 +780,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { */ public void testMaxOpenScrollContexts() throws Exception { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); final SearchService service = getInstanceFromNode(SearchService.class); final IndicesService indicesService = getInstanceFromNode(IndicesService.class); @@ -1022,7 +1017,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { ).canMatch() ); // the source can match and can be rewritten to a match_none, but not the alias filter - final DocWriteResponse response = client().prepareIndex("index").setSource("id", "1").get(); + final DocWriteResponse response = prepareIndex("index").setSource("id", "1").get(); assertEquals(RestStatus.CREATED, response.status()); searchRequest.indices("alias").source(new SearchSourceBuilder().query(new TermQueryBuilder("id", "1"))); assertFalse( @@ -1118,7 +1113,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { final SearchService service = getInstanceFromNode(SearchService.class); Index index = resolveIndex("throttled_threadpool_index"); assertTrue(service.getIndicesService().indexServiceSafe(index).getIndexSettings().isSearchThrottled()); - client().prepareIndex("throttled_threadpool_index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("throttled_threadpool_index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertSearchHits( client().prepareSearch("throttled_threadpool_index") .setIndicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED) @@ -1207,7 +1202,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { ) ).actionGet(); - client().prepareIndex("throttled_threadpool_index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("throttled_threadpool_index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertHitCount(client().prepareSearch(), 1L); assertHitCount(client().prepareSearch().setIndicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED), 1L); } @@ -1220,7 +1215,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { new InternalOrPrivateSettingsPlugin.UpdateInternalOrPrivateAction.Request(indexName, "index.frozen", "true") ).actionGet(); - client().prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertHitCount(client().prepareSearch(), 0L); assertHitCount(client().prepareSearch().setIndicesOptions(IndicesOptions.STRICT_EXPAND_OPEN_FORBID_CLOSED), 1L); assertWarnings(TransportSearchAction.FROZEN_INDICES_DEPRECATION_MESSAGE.replace("{}", indexName)); @@ -1435,7 +1430,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { createIndex("test"); int numDocs = randomIntBetween(1, 20); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setSource("f", "v").get(); + prepareIndex("test").setSource("f", "v").get(); } indicesAdmin().prepareRefresh("test").get(); AtomicBoolean stopped = new AtomicBoolean(false); @@ -1706,7 +1701,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { searchRequest.setWaitForCheckpointsTimeout(TimeValue.timeValueSeconds(30)); searchRequest.setWaitForCheckpoints(Collections.singletonMap("index", new long[] { 0 })); - final DocWriteResponse response = client().prepareIndex("index").setSource("id", "1").get(); + final DocWriteResponse response = prepareIndex("index").setSource("id", "1").get(); assertEquals(RestStatus.CREATED, response.status()); SearchShardTask task = new SearchShardTask(123L, "", "", "", null, Collections.emptyMap()); @@ -1743,7 +1738,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { searchRequest.setWaitForCheckpointsTimeout(TimeValue.timeValueSeconds(30)); searchRequest.setWaitForCheckpoints(Collections.singletonMap("index", new long[] { 0 })); - final DocWriteResponse response = client().prepareIndex("index").setSource("id", "1").get(); + final DocWriteResponse response = prepareIndex("index").setSource("id", "1").get(); assertEquals(RestStatus.CREATED, response.status()); SearchShardTask task = new SearchShardTask(123L, "", "", "", null, Collections.emptyMap()); @@ -1779,7 +1774,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { searchRequest.setWaitForCheckpointsTimeout(TimeValue.timeValueMillis(randomIntBetween(10, 100))); searchRequest.setWaitForCheckpoints(Collections.singletonMap("index", new long[] { 1 })); - final DocWriteResponse response = client().prepareIndex("index").setSource("id", "1").get(); + final DocWriteResponse response = prepareIndex("index").setSource("id", "1").get(); assertEquals(RestStatus.CREATED, response.status()); SearchShardTask task = new SearchShardTask(123L, "", "", "", null, Collections.emptyMap()); @@ -1816,7 +1811,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { searchRequest.setWaitForCheckpointsTimeout(TimeValue.timeValueMillis(randomIntBetween(10, 100))); searchRequest.setWaitForCheckpoints(Collections.singletonMap("index", new long[] { 0 })); - final DocWriteResponse response = client().prepareIndex("index").setSource("id", "1").get(); + final DocWriteResponse response = prepareIndex("index").setSource("id", "1").get(); assertEquals(RestStatus.CREATED, response.status()); SearchShardTask task = new SearchShardTask(123L, "", "", "", null, Collections.emptyMap()); @@ -1844,7 +1839,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { createIndex("test"); int numDocs = between(0, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setSource("id", Integer.toString(i)).get(); + prepareIndex("test").setSource("id", Integer.toString(i)).get(); } indicesAdmin().prepareRefresh("test").get(); @@ -1876,7 +1871,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { public void testDfsQueryPhaseRewrite() { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); final SearchService service = getInstanceFromNode(SearchService.class); final IndicesService indicesService = getInstanceFromNode(IndicesService.class); final IndexService indexService = indicesService.indexServiceSafe(resolveIndex("index")); @@ -2047,7 +2042,7 @@ public class SearchServiceTests extends ESSingleNodeTestCase { executor.setMaximumPoolSize(configuredMaxPoolSize); // We set this explicitly to be independent of CPU cores. int numDocs = randomIntBetween(50, 100); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("index").setId(String.valueOf(i)).setSource("field", "value").get(); + prepareIndex("index").setId(String.valueOf(i)).setSource("field", "value").get(); if (i % 5 == 0) { indicesAdmin().prepareRefresh("index").get(); } 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 f5912872e004..549461418cab 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 @@ -91,8 +91,7 @@ public abstract class ShardSizeTestCase extends ESIntegTestCase { protected List indexDoc(String shard, String key, int times) throws Exception { IndexRequestBuilder[] builders = new IndexRequestBuilder[times]; for (int i = 0; i < times; i++) { - builders[i] = client().prepareIndex("idx") - .setRouting(shard) + builders[i] = prepareIndex("idx").setRouting(shard) .setSource(jsonBuilder().startObject().field("key", key).field("value", 1).endObject()); } return Arrays.asList(builders); diff --git a/server/src/test/java/org/elasticsearch/search/geo/GeoPointShapeQueryTests.java b/server/src/test/java/org/elasticsearch/search/geo/GeoPointShapeQueryTests.java index 139e88aa5aeb..cfa0087731b6 100644 --- a/server/src/test/java/org/elasticsearch/search/geo/GeoPointShapeQueryTests.java +++ b/server/src/test/java/org/elasticsearch/search/geo/GeoPointShapeQueryTests.java @@ -73,8 +73,7 @@ public class GeoPointShapeQueryTests extends BasePointShapeQueryTestCase docs = new ArrayList<>(); for (int i = 0; i < 100; i++) { - docs.add(client().prepareIndex("index").setSource("field", "term" + i % 5)); + docs.add(prepareIndex("index").setSource("field", "term" + i % 5)); } indexRandom(true, docs); 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 6fc6b349fc98..b12bcd8b5588 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 @@ -122,14 +122,14 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase // is a mix of file chunks and translog ops int threeFourths = (int) (numDocs * 0.75); for (int i = 0; i < threeFourths; i++) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); flush(indexName); requests.clear(); for (int i = threeFourths; i < numDocs; i++) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); ensureSearchable(indexName); @@ -225,7 +225,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase List requests = new ArrayList<>(); int numDocs = scaledRandomIntBetween(25, 250); for (int i = 0; i < numDocs; i++) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); ensureSearchable(indexName); @@ -326,7 +326,7 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase List requests = new ArrayList<>(); int numDocs = scaledRandomIntBetween(25, 250); for (int i = 0; i < numDocs; i++) { - requests.add(client().prepareIndex(indexName).setSource("{}", XContentType.JSON)); + requests.add(prepareIndex(indexName).setSource("{}", XContentType.JSON)); } indexRandom(true, requests); ensureSearchable(indexName); diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java index 7d66a2d06a5b..2c91addd0839 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/AbstractThirdPartyRepositoryTestCase.java @@ -95,9 +95,9 @@ public abstract class AbstractThirdPartyRepositoryTestCase extends ESSingleNodeT logger.info("--> indexing some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); } client().admin().indices().prepareRefresh().get(); @@ -180,9 +180,9 @@ public abstract class AbstractThirdPartyRepositoryTestCase extends ESSingleNodeT logger.info("--> indexing some data"); for (int i = 0; i < 100; i++) { - client().prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); - client().prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-1").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-2").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); + prepareIndex("test-idx-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get(); } client().admin().indices().prepareRefresh().get(); 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 05795b4b6c5d..3baadbc7d68b 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 @@ -621,8 +621,7 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase protected void addRandomDocuments(String name, int numDocs) throws InterruptedException { IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < numDocs; i++) { - indexRequestBuilders[i] = client().prepareIndex(name) - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex(name).setId(Integer.toString(i)) .setRouting(randomAlphaOfLength(randomIntBetween(1, 10))) .setSource("field", "value"); } 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 2138c0f750ac..7fc182695247 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 @@ -121,24 +121,23 @@ public abstract class AbstractGeoTestCase extends ESIntegTestCase { allMultiVal[2 * i] = multiValues[i % numUniqueGeoPoints]; allMultiVal[2 * i + 1] = multiValues[(i + 1) % numUniqueGeoPoints]; builders.add( - client().prepareIndex(IDX_NAME) - .setSource( - jsonBuilder().startObject() - .array(SINGLE_VALUED_FIELD_NAME, allSingleVal[i].getX(), allSingleVal[i].getY()) - .startArray(MULTI_VALUED_FIELD_NAME) - .startArray() - .value(allMultiVal[2 * i].getX()) - .value(allMultiVal[2 * i].getY()) - .endArray() - .startArray() - .value(allMultiVal[2 * i + 1].getX()) - .value(allMultiVal[2 * i + 1].getY()) - .endArray() - .endArray() - .field(NUMBER_FIELD_NAME, i) - .field("tag", "tag" + i) - .endObject() - ) + prepareIndex(IDX_NAME).setSource( + jsonBuilder().startObject() + .array(SINGLE_VALUED_FIELD_NAME, allSingleVal[i].getX(), allSingleVal[i].getY()) + .startArray(MULTI_VALUED_FIELD_NAME) + .startArray() + .value(allMultiVal[2 * i].getX()) + .value(allMultiVal[2 * i].getY()) + .endArray() + .startArray() + .value(allMultiVal[2 * i + 1].getX()) + .value(allMultiVal[2 * i + 1].getY()) + .endArray() + .endArray() + .field(NUMBER_FIELD_NAME, i) + .field("tag", "tag" + i) + .endObject() + ) ); } singleCentroid = computeCentroid(allSingleVal); @@ -167,14 +166,13 @@ public abstract class AbstractGeoTestCase extends ESIntegTestCase { for (int i = 0; i < 5; i++) { builders.add( - client().prepareIndex(DATELINE_IDX_NAME) - .setSource( - jsonBuilder().startObject() - .array(SINGLE_VALUED_FIELD_NAME, geoValues[i].getX(), geoValues[i].getY()) - .field(NUMBER_FIELD_NAME, i) - .field("tag", "tag" + i) - .endObject() - ) + prepareIndex(DATELINE_IDX_NAME).setSource( + jsonBuilder().startObject() + .array(SINGLE_VALUED_FIELD_NAME, geoValues[i].getX(), geoValues[i].getY()) + .field(NUMBER_FIELD_NAME, i) + .field("tag", "tag" + i) + .endObject() + ) ); } assertAcked( @@ -194,31 +192,29 @@ public abstract class AbstractGeoTestCase extends ESIntegTestCase { for (int i = 0; i < 2000; i++) { SpatialPoint singleVal = singleValues[i % numUniqueGeoPoints]; builders.add( - client().prepareIndex(HIGH_CARD_IDX_NAME) - .setSource( - jsonBuilder().startObject() - .array(SINGLE_VALUED_FIELD_NAME, singleVal.getX(), singleVal.getY()) - .startArray(MULTI_VALUED_FIELD_NAME) - .startArray() - .value(multiValues[i % numUniqueGeoPoints].getX()) - .value(multiValues[i % numUniqueGeoPoints].getY()) - .endArray() - .startArray() - .value(multiValues[(i + 1) % numUniqueGeoPoints].getX()) - .value(multiValues[(i + 1) % numUniqueGeoPoints].getY()) - .endArray() - .endArray() - .field(NUMBER_FIELD_NAME, i) - .field("tag", "tag" + i) - .endObject() - ) + prepareIndex(HIGH_CARD_IDX_NAME).setSource( + jsonBuilder().startObject() + .array(SINGLE_VALUED_FIELD_NAME, singleVal.getX(), singleVal.getY()) + .startArray(MULTI_VALUED_FIELD_NAME) + .startArray() + .value(multiValues[i % numUniqueGeoPoints].getX()) + .value(multiValues[i % numUniqueGeoPoints].getY()) + .endArray() + .startArray() + .value(multiValues[(i + 1) % numUniqueGeoPoints].getX()) + .value(multiValues[(i + 1) % numUniqueGeoPoints].getY()) + .endArray() + .endArray() + .field(NUMBER_FIELD_NAME, i) + .field("tag", "tag" + i) + .endObject() + ) ); updateGeohashBucketsCentroid(singleVal); } builders.add( - client().prepareIndex(IDX_ZERO_NAME) - .setSource(jsonBuilder().startObject().array(SINGLE_VALUED_FIELD_NAME, 0.0, 1.0).endObject()) + prepareIndex(IDX_ZERO_NAME).setSource(jsonBuilder().startObject().array(SINGLE_VALUED_FIELD_NAME, 0.0, 1.0).endObject()) ); assertAcked(prepareCreate(IDX_ZERO_NAME).setMapping(SINGLE_VALUED_FIELD_NAME, "type=" + fieldTypeName())); diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTestCase.java index e26a350753c6..a41c60cba4a4 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTestCase.java @@ -29,8 +29,7 @@ public abstract class AbstractNumericTestCase extends ESIntegTestCase { final int numDocs = 10; for (int i = 0; i < numDocs; i++) { // TODO randomize the size and the params in here? builders.add( - client().prepareIndex("idx") - .setId(String.valueOf(i)) + prepareIndex("idx").setId(String.valueOf(i)) .setSource( jsonBuilder().startObject() .field("value", i + 1) @@ -56,8 +55,7 @@ public abstract class AbstractNumericTestCase extends ESIntegTestCase { builders = new ArrayList<>(); for (int i = 0; i < 2; i++) { builders.add( - client().prepareIndex("empty_bucket_idx") - .setId(String.valueOf(i)) + prepareIndex("empty_bucket_idx").setId(String.valueOf(i)) .setSource(jsonBuilder().startObject().field("value", i * 2).endObject()) ); } diff --git a/test/framework/src/main/java/org/elasticsearch/search/geo/BasePointShapeQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/geo/BasePointShapeQueryTestCase.java index ed6f0e1c87f2..3f394c138443 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/geo/BasePointShapeQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/geo/BasePointShapeQueryTestCase.java @@ -85,8 +85,7 @@ public abstract class BasePointShapeQueryTestCase randomQueryCollection = makeRandomGeometryCollection(); @@ -314,8 +312,7 @@ public abstract class BaseShapeQueryTestCase indexing [{}] documents into [{}]", numdocs, index); IndexRequestBuilder[] builders = new IndexRequestBuilder[numdocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(index).setId(Integer.toString(i)).setSource("field1", "bar " + i); + builders[i] = prepareIndex(index).setId(Integer.toString(i)).setSource("field1", "bar " + i); } indexRandom(true, builders); flushAndRefresh(index); diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractSearchCancellationTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractSearchCancellationTestCase.java index 3422241450e9..7049954dc43f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractSearchCancellationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractSearchCancellationTestCase.java @@ -74,7 +74,7 @@ public class AbstractSearchCancellationTestCase extends ESIntegTestCase { // Make sure we have a few segments BulkRequestBuilder bulkRequestBuilder = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); for (int j = 0; j < 20; j++) { - bulkRequestBuilder.add(client().prepareIndex("test").setId(Integer.toString(i * 5 + j)).setSource("field", "value")); + bulkRequestBuilder.add(prepareIndex("test").setId(Integer.toString(i * 5 + j)).setSource("field", "value")); } assertNoFailures(bulkRequestBuilder.get()); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 95cd301cbf8b..2f6286092b53 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -1389,6 +1389,10 @@ public abstract class ESIntegTestCase extends ESTestCase { NetworkDisruption.ensureFullyConnectedCluster(internalCluster()); } + protected static IndexRequestBuilder prepareIndex(String index) { + return client().prepareIndex(index); + } + /** * Syntactic sugar for: * 
@@ -1396,7 +1400,7 @@ public abstract class ESIntegTestCase extends ESTestCase {
      *
*/ protected final DocWriteResponse index(String index, XContentBuilder source) { - return client().prepareIndex(index).setSource(source).get(); + return prepareIndex(index).setSource(source).get(); } /** @@ -1406,7 +1410,7 @@ public abstract class ESIntegTestCase extends ESTestCase { * */ protected final DocWriteResponse index(String index, String id, Map source) { - return client().prepareIndex(index).setId(id).setSource(source).get(); + return prepareIndex(index).setId(id).setSource(source).get(); } /** @@ -1416,7 +1420,7 @@ public abstract class ESIntegTestCase extends ESTestCase { * */ protected final DocWriteResponse index(String index, String id, XContentBuilder source) { - return client().prepareIndex(index).setId(id).setSource(source).get(); + return prepareIndex(index).setId(id).setSource(source).get(); } /** @@ -1426,7 +1430,7 @@ public abstract class ESIntegTestCase extends ESTestCase { * */ protected final DocWriteResponse indexDoc(String index, String id, Object... source) { - return client().prepareIndex(index).setId(id).setSource(source).get(); + return prepareIndex(index).setId(id).setSource(source).get(); } /** @@ -1438,7 +1442,7 @@ public abstract class ESIntegTestCase extends ESTestCase { * where source is a JSON String. */ protected final DocWriteResponse index(String index, String id, String source) { - return client().prepareIndex(index).setId(id).setSource(source, XContentType.JSON).get(); + return prepareIndex(index).setId(id).setSource(source, XContentType.JSON).get(); } /** @@ -1549,7 +1553,7 @@ public abstract class ESIntegTestCase extends ESTestCase { public void indexRandom(boolean forceRefresh, String index, int numDocs) throws InterruptedException { IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(index).setSource("field", "value"); + builders[i] = prepareIndex(index).setSource("field", "value"); } indexRandom(forceRefresh, Arrays.asList(builders)); } @@ -1632,7 +1636,7 @@ public abstract class ESIntegTestCase extends ESTestCase { String index = RandomPicks.randomFrom(random, indices); bogusIds.add(Arrays.asList(index, id)); // We configure a routing key in case the mapping requires it - builders.add(client().prepareIndex().setIndex(index).setId(id).setSource("{}", XContentType.JSON).setRouting(id)); + builders.add(prepareIndex(index).setId(id).setSource("{}", XContentType.JSON).setRouting(id)); } } Collections.shuffle(builders, random()); diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index b5ac94b53d3c..1517571878fa 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -16,6 +16,7 @@ import org.elasticsearch.action.admin.indices.get.GetIndexResponse; import org.elasticsearch.action.admin.indices.template.delete.DeleteComponentTemplateAction; import org.elasticsearch.action.admin.indices.template.delete.DeleteComposableIndexTemplateAction; import org.elasticsearch.action.datastreams.DeleteDataStreamAction; +import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.client.internal.AdminClient; @@ -382,6 +383,10 @@ public abstract class ESSingleNodeTestCase extends ESTestCase { return new Index(index, uuid); } + protected IndexRequestBuilder prepareIndex(String index) { + return client().prepareIndex(index); + } + /** * Create a new search context. */ 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 f8b276dbbf6a..6f13b3b4bc52 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 @@ -43,8 +43,7 @@ public class MultiTermsWithRequestBreakerIT extends ESIntegTestCase { true, IntStream.range(0, randomIntBetween(10, 1000)) .mapToObj( - i -> client().prepareIndex("test") - .setId("id_" + i) + i -> prepareIndex("test").setId("id_" + i) .setSource(Map.of("field0", randomAlphaOfLength(5), "field1", randomAlphaOfLength(5))) ) .toArray(IndexRequestBuilder[]::new) diff --git a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistogramPercentileAggregationTests.java b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistogramPercentileAggregationTests.java index a1d464fa9bf4..eb7248092793 100644 --- a/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistogramPercentileAggregationTests.java +++ b/x-pack/plugin/analytics/src/test/java/org/elasticsearch/xpack/analytics/aggregations/metrics/HistogramPercentileAggregationTests.java @@ -100,7 +100,7 @@ public class HistogramPercentileAggregationTests extends ESSingleNodeTestCase { .field("counts", counts.toArray(new Integer[counts.size()])) .endObject() .endObject(); - client().prepareIndex("pre_agg").setSource(preAggDoc).get(); + prepareIndex("pre_agg").setSource(preAggDoc).get(); histogram.reset(); } } @@ -205,7 +205,7 @@ public class HistogramPercentileAggregationTests extends ESSingleNodeTestCase { .endObject() .endObject() .endObject(); - client().prepareIndex("pre_agg").setSource(preAggDoc).get(); + prepareIndex("pre_agg").setSource(preAggDoc).get(); histogram = TDigestState.create(compression); } } diff --git a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java index 7e161c3154fa..dcf47deeebc2 100644 --- a/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java +++ b/x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/AsyncSearchActionIT.java @@ -89,7 +89,7 @@ public class AsyncSearchActionIT extends AsyncSearchIntegTestCase { v.incrementAndGet(); return v; }); - reqs.add(client().prepareIndex(indexName).setSource("terms", keyword, "metric", metric)); + reqs.add(prepareIndex(indexName).setSource("terms", keyword, "metric", metric)); } indexRandom(true, true, reqs); } diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AbstractFrozenAutoscalingIntegTestCase.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AbstractFrozenAutoscalingIntegTestCase.java index b3dca2688d42..656b1ddd4d95 100644 --- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AbstractFrozenAutoscalingIntegTestCase.java +++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/AbstractFrozenAutoscalingIntegTestCase.java @@ -87,7 +87,7 @@ public abstract class AbstractFrozenAutoscalingIntegTestCase extends AbstractSna assertAcked(prepareCreate(indexName, Settings.builder().put(INDEX_SOFT_DELETES_SETTING.getKey(), true))); indexRandom( randomBoolean(), - IntStream.range(0, 10).mapToObj(i -> client().prepareIndex(indexName).setSource()).collect(Collectors.toList()) + IntStream.range(0, 10).mapToObj(i -> prepareIndex(indexName).setSource()).collect(Collectors.toList()) ); final SnapshotInfo snapshotInfo = createFullSnapshot(fsRepoName, snapshotName); diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java index 2cbe06000422..c5e062df5e77 100644 --- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java +++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ProactiveStorageIT.java @@ -53,8 +53,7 @@ public class ProactiveStorageIT extends AutoscalingStorageIntegTestCase { false, IntStream.range(1, 100) .mapToObj( - unused -> client().prepareIndex(dsName) - .setCreate(true) + unused -> prepareIndex(dsName).setCreate(true) .setSource("@timestamp", DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(randomMillisUpToYear9999())) ) .toArray(IndexRequestBuilder[]::new) diff --git a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java index 51d0c2c0aef8..5c097cdc24ed 100644 --- a/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java +++ b/x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java @@ -68,7 +68,7 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase { indexRandom( true, IntStream.range(1, 100) - .mapToObj(i -> client().prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) + .mapToObj(i -> prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) .toArray(IndexRequestBuilder[]::new) ); forceMerge(); @@ -267,7 +267,7 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase { indexRandom( true, IntStream.range(1, 100) - .mapToObj(i -> client().prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) + .mapToObj(i -> prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) .toArray(IndexRequestBuilder[]::new) ); forceMerge(); @@ -420,7 +420,7 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase { indexRandom( true, IntStream.range(1, 100) - .mapToObj(i -> client().prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) + .mapToObj(i -> prepareIndex(indexName).setSource("field", randomAlphaOfLength(50))) .toArray(IndexRequestBuilder[]::new) ); forceMerge(); diff --git a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java index 3afa7722e531..d609b606238b 100644 --- a/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java +++ b/x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/LocalIndexFollowingIT.java @@ -47,7 +47,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { final long firstBatchNumDocs = randomIntBetween(2, 64); for (int i = 0; i < firstBatchNumDocs; i++) { - client().prepareIndex("leader").setSource("{}", XContentType.JSON).get(); + prepareIndex("leader").setSource("{}", XContentType.JSON).get(); } final PutFollowAction.Request followRequest = getPutFollowRequest("leader", "follower"); @@ -59,7 +59,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { final long secondBatchNumDocs = randomIntBetween(2, 64); for (int i = 0; i < secondBatchNumDocs; i++) { - client().prepareIndex("leader").setSource("{}", XContentType.JSON).get(); + prepareIndex("leader").setSource("{}", XContentType.JSON).get(); } assertBusy(() -> { @@ -74,7 +74,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { final long thirdBatchNumDocs = randomIntBetween(2, 64); for (int i = 0; i < thirdBatchNumDocs; i++) { - client().prepareIndex("leader").setSource("{}", XContentType.JSON).get(); + prepareIndex("leader").setSource("{}", XContentType.JSON).get(); } client().execute(ResumeFollowAction.INSTANCE, getResumeFollowRequest("follower")).get(); @@ -99,7 +99,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { for (int i = 0; i < firstBatchNumDocs; i++) { BytesArray source = new BytesArray("{}"); sourceSize += source.length(); - client().prepareIndex("leader").setSource(source, XContentType.JSON).get(); + prepareIndex("leader").setSource(source, XContentType.JSON).get(); } ThreadPool nodeThreadPool = getInstanceFromNode(ThreadPool.class); @@ -163,7 +163,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { .put(IndexMetadata.INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), 0) .build(); createIndex("logs-20200101", leaderIndexSettings); - client().prepareIndex("logs-20200101").setSource("{}", XContentType.JSON).get(); + prepareIndex("logs-20200101").setSource("{}", XContentType.JSON).get(); assertBusy(() -> { CcrStatsAction.Response response = client().execute(CcrStatsAction.INSTANCE, new CcrStatsAction.Request()).actionGet(); assertThat( @@ -182,7 +182,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { // This new index should be picked up by auto follow coordinator createIndex("logs-20200102", leaderIndexSettings); // This new document should be replicated to follower index: - client().prepareIndex("logs-20200101").setSource("{}", XContentType.JSON).get(); + prepareIndex("logs-20200101").setSource("{}", XContentType.JSON).get(); assertBusy(() -> { CcrStatsAction.Response response = client().execute(CcrStatsAction.INSTANCE, new CcrStatsAction.Request()).actionGet(); assertThat( @@ -207,7 +207,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { ensureGreen("index-1"); int numDocs = between(1, 100); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("index-1").setSource("{}", XContentType.JSON).get(); + prepareIndex("index-1").setSource("{}", XContentType.JSON).get(); } client().execute(PutFollowAction.INSTANCE, getPutFollowRequest("index-1", "index-2")).get(); assertBusy(() -> assertThat(client().prepareSearch("index-2").get().getHits().getTotalHits().value, equalTo((long) numDocs))); @@ -221,7 +221,7 @@ public class LocalIndexFollowingIT extends CcrSingleNodeTestCase { newDocs = numDocs + randomIntBetween(1, 100); } for (int i = 0; i < newDocs; i++) { - client().prepareIndex("index-0").setSource("{}", XContentType.JSON).get(); + prepareIndex("index-0").setSource("{}", XContentType.JSON).get(); } if (randomBoolean()) { client().admin().indices().prepareFlush("index-0").get(); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java index 06a3a39b0850..6f6131c8ea4e 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java @@ -51,7 +51,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { final int numWrites = randomIntBetween(10, 4096); for (int i = 0; i < numWrites; i++) { - client().prepareIndex("index").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } // A number of times, get operations within a range that exists: @@ -169,7 +169,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { final long numWrites = 32; for (int i = 0; i < numWrites; i++) { - client().prepareIndex("index").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } final IndexShard indexShard = indexService.getShard(0); @@ -195,7 +195,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { public void testGetOperationsAlwaysReturnAtLeastOneOp() throws Exception { final IndexService indexService = createIndex("index", indexSettings(1, 0).build()); - client().prepareIndex("index").setId("0").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("0").setSource("{}", XContentType.JSON).get(); final IndexShard indexShard = indexService.getShard(0); final Translog.Operation[] operations = ShardChangesAction.getOperations( diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java index a8f3febfd194..2f0643ef16c1 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java @@ -49,9 +49,9 @@ public class ShardChangesTests extends ESSingleNodeTestCase { public void testGetOperationsBasedOnGlobalSequenceId() throws Exception { client().admin().indices().prepareCreate("index").setSettings(Settings.builder().put("index.number_of_shards", 1)).get(); - client().prepareIndex("index").setId("1").setSource("{}", XContentType.JSON).get(); - client().prepareIndex("index").setId("2").setSource("{}", XContentType.JSON).get(); - client().prepareIndex("index").setId("3").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("2").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("3").setSource("{}", XContentType.JSON).get(); ShardStats shardStats = client().admin().indices().prepareStats("index").get().getIndex("index").getShards()[0]; long globalCheckPoint = shardStats.getSeqNoStats().getGlobalCheckpoint(); @@ -75,9 +75,9 @@ public class ShardChangesTests extends ESSingleNodeTestCase { assertThat(operation.seqNo(), equalTo(2L)); assertThat(operation.id(), equalTo("3")); - client().prepareIndex("index").setId("3").setSource("{}", XContentType.JSON).get(); - client().prepareIndex("index").setId("4").setSource("{}", XContentType.JSON).get(); - client().prepareIndex("index").setId("5").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("3").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("4").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("5").setSource("{}", XContentType.JSON).get(); shardStats = client().admin().indices().prepareStats("index").get().getIndex("index").getShards()[0]; globalCheckPoint = shardStats.getSeqNoStats().getGlobalCheckpoint(); @@ -110,7 +110,7 @@ public class ShardChangesTests extends ESSingleNodeTestCase { .get(); for (int i = 0; i < 32; i++) { - client().prepareIndex("index").setId("1").setSource("{}", XContentType.JSON).get(); + prepareIndex("index").setId("1").setSource("{}", XContentType.JSON).get(); client().prepareDelete("index", "1").get(); client().admin().indices().flush(new FlushRequest("index").force(true)).actionGet(); } 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 02f61498fa93..eca3bdea374b 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 @@ -169,10 +169,10 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { final String indexName = "test-idx"; createIndex(indexName); - client().prepareIndex(indexName).setSource("foo", "bar").get(); + prepareIndex(indexName).setSource("foo", "bar").get(); assertSuccessful(startFullSnapshot(repo, "snapshot-1")); - client().prepareIndex(indexName).setSource("foo", "baz").get(); + prepareIndex(indexName).setSource("foo", "baz").get(); assertSuccessful(startFullSnapshot(repo, "snapshot-2")); logger.info("--> randomly deleting files from the local _snapshot path to simulate corruption"); @@ -332,7 +332,7 @@ public class SourceOnlySnapshotIT extends AbstractSnapshotIntegTestCase { source.endArray(); } source.endObject(); - builders[i] = client().prepareIndex(sourceIdx).setId(Integer.toString(i)).setSource(source).setRouting("r" + i); + builders[i] = prepareIndex(sourceIdx).setId(Integer.toString(i)).setSource(source).setRouting("r" + i); } indexRandom(true, builders); flushAndRefresh(); diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java index 2041198e8487..f46c97e0ffda 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java @@ -369,9 +369,9 @@ public class DataTierAllocationDeciderIT extends ESIntegTestCase { indicesAdmin().prepareCreate(index + "2").setSettings(indexSettings(1, 1)).setWaitForActiveShards(0).get(); ensureGreen(); - client().prepareIndex(index).setSource("foo", "bar").get(); - client().prepareIndex(index + "2").setSource("foo", "bar").get(); - client().prepareIndex(index + "2").setSource("foo", "bar").get(); + prepareIndex(index).setSource("foo", "bar").get(); + prepareIndex(index + "2").setSource("foo", "bar").get(); + prepareIndex(index + "2").setSource("foo", "bar").get(); refresh(index, index + "2"); DataTiersFeatureSetUsage usage = getUsage(); diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java index 82784d9112a1..628e2c18de2f 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierShardAvailabilityHealthIndicatorIT.java @@ -171,7 +171,7 @@ public class DataTierShardAvailabilityHealthIndicatorIT extends ESIntegTestCase int numDocs = scaledRandomIntBetween(100, 1000); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(indexName).setSource("field", "value"); + builders[i] = prepareIndex(indexName).setSource("field", "value"); } // we want to test both full divergent copies of the shard in terms of segments, and // a case where they are the same (using sync flush), index Random does all this goodness diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TermsEnumTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TermsEnumTests.java index 435d5c2f36bd..c8983c9a4a5c 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TermsEnumTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TermsEnumTests.java @@ -109,8 +109,7 @@ public class TermsEnumTests extends ESSingleNodeTestCase { } private void indexAndRefresh(String indexName, String id, String field, String value) throws IOException { - client().prepareIndex(indexName) - .setId(id) + prepareIndex(indexName).setId(id) .setSource(jsonBuilder().startObject().field(field, value).endObject()) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); @@ -206,8 +205,9 @@ public class TermsEnumTests extends ESSingleNodeTestCase { for (int i = 0; i < numDocs; i++) { randomIps[i] = randomIp(randomBoolean()); bulkRequestBuilder.add( - client().prepareIndex(indexName) - .setSource(jsonBuilder().startObject().field("ip_addr", NetworkAddress.format(randomIps[i])).endObject()) + prepareIndex(indexName).setSource( + jsonBuilder().startObject().field("ip_addr", NetworkAddress.format(randomIps[i])).endObject() + ) ); } assertNoFailures(bulkRequestBuilder.get()); diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunnerTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunnerTests.java index 1818fa775cb7..f95c4959be77 100644 --- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunnerTests.java +++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/enrich/EnrichPolicyRunnerTests.java @@ -2145,13 +2145,12 @@ public class EnrichPolicyRunnerTests extends ESSingleNodeTestCase { public void testEnrichFieldsConflictMappingTypes() throws Exception { createIndex("source-1", Settings.EMPTY, "_doc", "user", "type=keyword", "name", "type=text", "zipcode", "type=long"); - client().prepareIndex("source-1") - .setSource("user", "u1", "name", "n", "zipcode", 90000) + prepareIndex("source-1").setSource("user", "u1", "name", "n", "zipcode", 90000) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); createIndex("source-2", Settings.EMPTY, "_doc", "user", "type=keyword", "zipcode", "type=long"); - client().prepareIndex("source-2").setSource(""" + prepareIndex("source-2").setSource(""" { "user": "u2", "name": { @@ -2204,13 +2203,10 @@ public class EnrichPolicyRunnerTests extends ESSingleNodeTestCase { public void testEnrichMappingConflictFormats() throws ExecutionException, InterruptedException { createIndex("source-1", Settings.EMPTY, "_doc", "user", "type=keyword", "date", "type=date,format=yyyy"); - client().prepareIndex("source-1") - .setSource("user", "u1", "date", "2023") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .get(); + prepareIndex("source-1").setSource("user", "u1", "date", "2023").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get(); createIndex("source-2", Settings.EMPTY, "_doc", "user", "type=keyword", "date", "type=date,format=yyyy-MM"); - client().prepareIndex("source-2").setSource(""" + prepareIndex("source-2").setSource(""" { "user": "u2", "date": "2023-05" @@ -2249,8 +2245,7 @@ public class EnrichPolicyRunnerTests extends ESSingleNodeTestCase { public void testEnrichObjectField() throws ExecutionException, InterruptedException { createIndex("source-1", Settings.EMPTY, "_doc", "id", "type=keyword", "name.first", "type=keyword", "name.last", "type=keyword"); - client().prepareIndex("source-1") - .setSource("user", "u1", "name.first", "F1", "name.last", "L1") + prepareIndex("source-1").setSource("user", "u1", "name.first", "F1", "name.last", "L1") .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .get(); EnrichPolicy policy = new EnrichPolicy(EnrichPolicy.MATCH_TYPE, null, List.of("source-1"), "user", List.of("name")); diff --git a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AsyncEqlSearchActionIT.java b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AsyncEqlSearchActionIT.java index 3a631c7724d0..646a1e896c47 100644 --- a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AsyncEqlSearchActionIT.java +++ b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AsyncEqlSearchActionIT.java @@ -95,15 +95,14 @@ public class AsyncEqlSearchActionIT extends AbstractEqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .field("i", i) - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .field("i", i) + .endObject() + ) ); } indexRandom(true, builders); diff --git a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlCancellationIT.java b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlCancellationIT.java index 3ec8d02befb5..f2d552fa6bbd 100644 --- a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlCancellationIT.java +++ b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlCancellationIT.java @@ -51,14 +51,13 @@ public class EqlCancellationIT extends AbstractEqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .endObject() + ) ); } diff --git a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/RestEqlCancellationIT.java b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/RestEqlCancellationIT.java index 6de6f83a848a..2f18f16984f9 100644 --- a/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/RestEqlCancellationIT.java +++ b/x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/RestEqlCancellationIT.java @@ -71,14 +71,13 @@ public class RestEqlCancellationIT extends AbstractEqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .endObject() + ) ); } diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java index 55a21cd7e440..3e8ac6fc3d5f 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionBreakerIT.java @@ -100,8 +100,7 @@ public class EsqlActionBreakerIT extends EsqlActionIT { .get(); int numDocs = between(1000, 5000); for (int i = 0; i < numDocs; i++) { - DocWriteResponse response = client().prepareIndex("test_breaker") - .setId(Integer.toString(i)) + DocWriteResponse response = prepareIndex("test_breaker").setId(Integer.toString(i)) .setSource("foo", "foo-" + i, "bar", "bar-" + (i * 2)) .get(); assertThat(Strings.toString(response), response.getResult(), equalTo(DocWriteResponse.Result.CREATED)); diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java index a141db703726..2211512144f9 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java @@ -782,7 +782,7 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase { String id = "id-" + i; long value = randomLongBetween(-100_000, 100_000); docs.put(id, value); - indexRequests.add(client().prepareIndex().setIndex(indexName).setId(id).setSource(Map.of("val", value))); + indexRequests.add(prepareIndex(indexName).setId(id).setSource(Map.of("val", value))); } indexRandom(true, randomBoolean(), indexRequests); String command = "from test_filter | stats avg = avg(val)"; @@ -823,9 +823,7 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase { for (int i = 0; i < numDocs; i++) { Doc d = new Doc(i, "tag-" + randomIntBetween(1, 100)); allDocs.add(d); - indexRequests.add( - client().prepareIndex().setIndex(indexName).setId(Integer.toString(i)).setSource(Map.of("val", d.val, "tag", d.tag)) - ); + indexRequests.add(prepareIndex(indexName).setId(Integer.toString(i)).setSource(Map.of("val", d.val, "tag", d.tag))); } indexRandom(true, randomBoolean(), indexRequests); int limit = randomIntBetween(1, 10); @@ -1175,7 +1173,7 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase { if (values.isEmpty() == false) { source.put("v", values); } - client().prepareIndex(indexName).setSource(source).get(); + prepareIndex(indexName).setSource(source).get(); if (randomInt(100) < 20) { client().admin().indices().prepareRefresh(indexName).get(); } @@ -1213,8 +1211,8 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase { long v = randomIntBetween(1, 10); groups.merge(k, v, Long::sum); groups.merge(null, v, Long::sum); // null group - client().prepareIndex("index-1").setSource("f1", k, "v", v).get(); - client().prepareIndex("index-2").setSource("f2", k, "v", v).get(); + prepareIndex("index-1").setSource("f1", k, "v", v).get(); + prepareIndex("index-2").setSource("f2", k, "v", v).get(); } client().admin().indices().prepareRefresh("index-1", "index-2").get(); for (String field : List.of("f1", "f2")) { diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionRuntimeFieldIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionRuntimeFieldIT.java index be661b51d41d..a362609876ea 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionRuntimeFieldIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionRuntimeFieldIT.java @@ -113,7 +113,7 @@ public class EsqlActionRuntimeFieldIT extends AbstractEsqlIntegTestCase { BulkRequestBuilder bulk = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); for (int i = 0; i < SIZE; i++) { - bulk.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("foo", i)); + bulk.add(prepareIndex("test").setId(Integer.toString(i)).setSource("foo", i)); } bulk.get(); } diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionTaskIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionTaskIT.java index 402ae2722d7c..edebabaf359c 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionTaskIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionTaskIT.java @@ -121,7 +121,7 @@ public class EsqlActionTaskIT extends AbstractEsqlIntegTestCase { BulkRequestBuilder bulk = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); for (int i = 0; i < NUM_DOCS; i++) { - bulk.add(client().prepareIndex("test").setId(Integer.toString(i)).setSource("foo", i)); + bulk.add(prepareIndex("test").setId(Integer.toString(i)).setSource("foo", i)); } bulk.get(); /* diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/SyntheticSourceIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/SyntheticSourceIT.java index 2585b5325df1..b924ad492c0c 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/SyntheticSourceIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/SyntheticSourceIT.java @@ -36,7 +36,7 @@ public class SyntheticSourceIT extends AbstractEsqlIntegTestCase { int numDocs = between(10, 1000); for (int i = 0; i < numDocs; i++) { - IndexRequestBuilder indexRequest = client().prepareIndex("test").setSource("id", "i" + i, "field", "n" + i); + IndexRequestBuilder indexRequest = prepareIndex("test").setSource("id", "i" + i, "field", "n" + i); if (randomInt(100) < 5) { indexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE); } diff --git a/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java b/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java index 4f2a623fa2de..5c87fe8dd6c1 100644 --- a/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java +++ b/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java @@ -74,7 +74,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { final int totalDocuments = shards * 3; for (int i = 0; i < totalDocuments; ++i) { - client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } final GetGlobalCheckpointsAction.Request request2 = new GetGlobalCheckpointsAction.Request( @@ -118,7 +118,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { final int totalDocuments = between(25, 50); new Thread(() -> { for (int i = 0; i < totalDocuments; ++i) { - client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).execute(); + prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).execute(); } }).start(); @@ -147,7 +147,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { final int totalDocuments = 30; for (int i = 0; i < totalDocuments; ++i) { - client().prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); + prepareIndex(indexName).setId(Integer.toString(i)).setSource("{}", XContentType.JSON).get(); } final GetGlobalCheckpointsAction.Request request = new GetGlobalCheckpointsAction.Request( @@ -258,7 +258,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { indicesAdmin().prepareCreate(indexName) .setSettings(indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); - client().prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); + prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); GetGlobalCheckpointsAction.Response response = future.actionGet(); long elapsed = TimeValue.timeValueNanos(System.nanoTime() - start).seconds(); @@ -335,7 +335,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { ActionFuture future = client().execute(GetGlobalCheckpointsAction.INSTANCE, request); Thread.sleep(randomIntBetween(10, 100)); updateIndexSettings(Settings.builder().put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "node", ""), indexName); - client().prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); + prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); GetGlobalCheckpointsAction.Response response = future.actionGet(); long elapsed = TimeValue.timeValueNanos(System.nanoTime() - start).seconds(); @@ -361,7 +361,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { Thread.sleep(randomIntBetween(10, 100)); updateClusterSettings(Settings.builder().putNull(CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING.getKey())); - client().prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); + prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); var response = future.actionGet(); long elapsed = TimeValue.timeValueNanos(System.nanoTime() - start).seconds(); diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java index 716862eee89b..7f2035bef643 100644 --- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java +++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java @@ -74,8 +74,7 @@ public class FrozenIndexIT extends ESIntegTestCase { createIndex("index", 1, 1); - final DocWriteResponse indexResponse = client().prepareIndex("index") - .setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567Z") + final DocWriteResponse indexResponse = prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567Z") .get(); ensureGreen("index"); @@ -172,7 +171,7 @@ public class FrozenIndexIT extends ESIntegTestCase { ensureGreen("index"); if (randomBoolean()) { - client().prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, date).get(); + prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, date).get(); } for (final IndicesService indicesService : internalCluster().getInstances(IndicesService.class)) { @@ -225,7 +224,7 @@ public class FrozenIndexIT extends ESIntegTestCase { ); int numDocs = randomIntBetween(1, 100); for (int i = 0; i < numDocs; i++) { - client().prepareIndex(indexName).setSource("created_date", "2011-02-02").get(); + prepareIndex(indexName).setSource("created_date", "2011-02-02").get(); } assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(indexName)).actionGet()); final OpenPointInTimeRequest openPointInTimeRequest = new OpenPointInTimeRequest(indexName).indicesOptions( @@ -269,13 +268,13 @@ public class FrozenIndexIT extends ESIntegTestCase { int index1 = randomIntBetween(10, 50); for (int i = 0; i < index1; i++) { String id = Integer.toString(i); - client().prepareIndex("index-1").setId(id).setSource("value", i).get(); + prepareIndex("index-1").setId(id).setSource("value", i).get(); } int index2 = randomIntBetween(10, 50); for (int i = 0; i < index2; i++) { String id = Integer.toString(i); - client().prepareIndex("index-2").setId(id).setSource("value", i).get(); + prepareIndex("index-2").setId(id).setSource("value", i).get(); } assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("index-1", "index-2")).actionGet()); @@ -310,7 +309,7 @@ public class FrozenIndexIT extends ESIntegTestCase { int numDocs = randomIntBetween(10, 50); for (int i = 0; i < numDocs; i++) { String id = Integer.toString(i); - client().prepareIndex("test-index").setId(id).setSource("value", i).get(); + prepareIndex("test-index").setId(id).setSource("value", i).get(); } assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("test-index")).actionGet()); // include the frozen indices diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexRecoveryTests.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexRecoveryTests.java index 74655a39089f..8bc32f0171f2 100644 --- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexRecoveryTests.java +++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexRecoveryTests.java @@ -61,9 +61,7 @@ public class FrozenIndexRecoveryTests extends ESIntegTestCase { randomBoolean(), randomBoolean(), randomBoolean(), - IntStream.range(0, randomIntBetween(0, 50)) - .mapToObj(n -> client().prepareIndex(indexName).setSource("num", n)) - .collect(toList()) + IntStream.range(0, randomIntBetween(0, 50)).mapToObj(n -> prepareIndex(indexName).setSource("num", n)).collect(toList()) ); ensureGreen(indexName); indicesAdmin().prepareFlush(indexName).get(); diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java index 48395b75254a..896c0050cd5c 100644 --- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java +++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java @@ -93,13 +93,13 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testCloseFreezeAndOpen() throws Exception { String indexName = "index"; createIndex(indexName, Settings.builder().put("index.number_of_shards", 2).build()); - client().prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex(indexName).setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex(indexName).setId("3").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("3").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(indexName)).actionGet()); expectThrows( ClusterBlockException.class, - () -> client().prepareIndex(indexName).setId("4").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get() + () -> prepareIndex(indexName).setId("4").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get() ); IndicesService indexServices = getInstanceFromNode(IndicesService.class); Index index = resolveIndex(indexName); @@ -180,7 +180,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { String indexName = "index"; createIndex(indexName, Settings.builder().put("index.number_of_shards", 2).build(), mapping); for (int i = 0; i < 10; i++) { - client().prepareIndex(indexName).setId("" + i).setSource("field", "foo bar baz").get(); + prepareIndex(indexName).setId("" + i).setSource("field", "foo bar baz").get(); } assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(indexName)).actionGet()); int numRequests = randomIntBetween(20, 50); @@ -217,9 +217,9 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { final IndexService originalIndexService = createIndex("index", Settings.builder().put("index.number_of_shards", 2).build()); assertThat(originalIndexService.getMetadata().getTimestampRange(), sameInstance(IndexLongFieldRange.UNKNOWN)); - client().prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("index").setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("index").setId("3").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("3").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); if (randomBoolean()) { // sometimes close it @@ -250,7 +250,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { assertThat(engine, Matchers.instanceOf(InternalEngine.class)); assertThat(indexService.getMetadata().getTimestampRange(), sameInstance(IndexLongFieldRange.UNKNOWN)); } - client().prepareIndex("index").setId("4").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("4").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); } private void assertIndexFrozen(String idx) { @@ -278,9 +278,9 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testUnfreezeClosedIndices() { createIndex("idx", Settings.builder().put("index.number_of_shards", 1).build()); - client().prepareIndex("idx").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); createIndex("idx-closed", Settings.builder().put("index.number_of_shards", 1).build()); - client().prepareIndex("idx-closed").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx-closed").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("idx")).actionGet()); assertAcked(indicesAdmin().prepareClose("idx-closed").get()); assertAcked( @@ -298,9 +298,9 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testFreezePattern() { String indexName = "test-idx"; createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build()); - client().prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); createIndex("test-idx-1", Settings.builder().put("index.number_of_shards", 1).build()); - client().prepareIndex("test-idx-1").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test-idx-1").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest(indexName)).actionGet()); assertIndexFrozen(indexName); @@ -322,8 +322,8 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testCanMatch() throws IOException { createIndex("index"); - client().prepareIndex("index").setId("1").setSource("field", "2010-01-05T02:00").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("index").setId("2").setSource("field", "2010-01-06T02:00").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("1").setSource("field", "2010-01-05T02:00").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index").setId("2").setSource("field", "2010-01-06T02:00").setRefreshPolicy(IMMEDIATE).get(); { IndicesService indexServices = getInstanceFromNode(IndicesService.class); Index index = resolveIndex("index"); @@ -460,12 +460,12 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testWriteToFrozenIndex() { createIndex("idx", Settings.builder().put("index.number_of_shards", 1).build()); - client().prepareIndex("idx").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx").setId("1").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("idx")).actionGet()); assertIndexFrozen("idx"); expectThrows( ClusterBlockException.class, - () -> client().prepareIndex("idx").setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get() + () -> prepareIndex("idx").setId("2").setSource("field", "value").setRefreshPolicy(IMMEDIATE).get() ); } @@ -508,7 +508,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testFreezeIndexIncreasesIndexSettingsVersion() { final String index = "test"; createIndex(index, indexSettings(1, 0).build()); - client().prepareIndex(index).setSource("field", "value").get(); + prepareIndex(index).setSource("field", "value").get(); final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index(index).getSettingsVersion(); @@ -548,7 +548,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { final long nbDocs = randomIntBetween(0, 50); for (long i = 0; i < nbDocs; i++) { - final DocWriteResponse indexResponse = client().prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); + final DocWriteResponse indexResponse = prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); assertThat(indexResponse.status(), is(RestStatus.CREATED)); } @@ -579,7 +579,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { final int nbDocs = randomIntBetween(0, 50); int uncommittedOps = 0; for (long i = 0; i < nbDocs; i++) { - final DocWriteResponse indexResponse = client().prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); + final DocWriteResponse indexResponse = prepareIndex(indexName).setId(Long.toString(i)).setSource("field", i).get(); assertThat(indexResponse.status(), is(RestStatus.CREATED)); if (rarely()) { indicesAdmin().prepareFlush(indexName).get(); @@ -613,8 +613,8 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testComputesTimestampRangeFromMilliseconds() { final int shardCount = between(1, 3); createIndex("index", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, shardCount).build()); - client().prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-05T01:02:03.456Z").get(); - client().prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567Z").get(); + prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-05T01:02:03.456Z").get(); + prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567Z").get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("index")).actionGet()); @@ -645,8 +645,8 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { final int shardCount = between(1, 3); createIndex("index", Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, shardCount).build(), mapping); - client().prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-05T01:02:03.456789012Z").get(); - client().prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567890123Z").get(); + prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-05T01:02:03.456789012Z").get(); + prepareIndex("index").setSource(DataStream.TIMESTAMP_FIELD_NAME, "2010-01-06T02:03:04.567890123Z").get(); assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("index")).actionGet()); diff --git a/x-pack/plugin/graph/src/internalClusterTest/java/org/elasticsearch/xpack/graph/test/GraphTests.java b/x-pack/plugin/graph/src/internalClusterTest/java/org/elasticsearch/xpack/graph/test/GraphTests.java index 468251ec8e18..25c22672cf81 100644 --- a/x-pack/plugin/graph/src/internalClusterTest/java/org/elasticsearch/xpack/graph/test/GraphTests.java +++ b/x-pack/plugin/graph/src/internalClusterTest/java/org/elasticsearch/xpack/graph/test/GraphTests.java @@ -89,8 +89,7 @@ public class GraphTests extends ESSingleNodeTestCase { for (DocTemplate dt : socialNetTemplate) { for (int i = 0; i < dt.numDocs; i++) { // Supply a doc ID for deterministic routing of docs to shards - client().prepareIndex("test") - .setId("doc#" + numDocs) + prepareIndex("test").setId("doc#" + numDocs) .setSource("decade", dt.decade, "people", dt.people, "description", dt.description) .get(); numDocs++; diff --git a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeIT.java b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeIT.java index ecbe94fa7521..8ad3458ceca6 100644 --- a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeIT.java +++ b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeIT.java @@ -96,7 +96,7 @@ public class ILMMultiNodeIT extends ESIntegTestCase { PutComposableIndexTemplateAction.INSTANCE, new PutComposableIndexTemplateAction.Request("template").indexTemplate(template) ).actionGet(); - client().prepareIndex(index).setCreate(true).setId("1").setSource("@timestamp", "2020-09-09").get(); + prepareIndex(index).setCreate(true).setId("1").setSource("@timestamp", "2020-09-09").get(); assertBusy(() -> { ExplainLifecycleResponse explain = client().execute(ExplainLifecycleAction.INSTANCE, new ExplainLifecycleRequest().indices("*")) diff --git a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeWithCCRDisabledIT.java b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeWithCCRDisabledIT.java index 1919bd86b508..e10e4a466f7f 100644 --- a/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeWithCCRDisabledIT.java +++ b/x-pack/plugin/ilm/src/internalClusterTest/java/org/elasticsearch/xpack/ilm/ILMMultiNodeWithCCRDisabledIT.java @@ -96,7 +96,7 @@ public class ILMMultiNodeWithCCRDisabledIT extends ESIntegTestCase { PutComposableIndexTemplateAction.INSTANCE, new PutComposableIndexTemplateAction.Request("template").indexTemplate(template) ).actionGet(); - client().prepareIndex(index).setCreate(true).setId("1").setSource("@timestamp", "2020-09-09").get(); + prepareIndex(index).setCreate(true).setId("1").setSource("@timestamp", "2020-09-09").get(); assertBusy(() -> { ExplainLifecycleResponse explain = client().execute(ExplainLifecycleAction.INSTANCE, new ExplainLifecycleRequest().indices("*")) diff --git a/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/SearchIdleTests.java b/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/SearchIdleTests.java index 4ba4a1df7293..24ad009990b0 100644 --- a/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/SearchIdleTests.java +++ b/x-pack/plugin/mapper-constant-keyword/src/test/java/org/elasticsearch/xpack/constantkeyword/mapper/SearchIdleTests.java @@ -116,8 +116,8 @@ public class SearchIdleTests extends ESSingleNodeTestCase { "type=keyword" ); - assertEquals(RestStatus.CREATED, client().prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); - assertEquals(RestStatus.CREATED, client().prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); assertEquals(RestStatus.OK, indicesAdmin().prepareRefresh(idleIndex, activeIndex).get().getStatus()); waitUntil( @@ -185,8 +185,8 @@ public class SearchIdleTests extends ESSingleNodeTestCase { "type=keyword" ); - assertEquals(RestStatus.CREATED, client().prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); - assertEquals(RestStatus.CREATED, client().prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); assertEquals(RestStatus.OK, indicesAdmin().prepareRefresh(idleIndex, activeIndex).get().getStatus()); waitUntil( @@ -251,8 +251,8 @@ public class SearchIdleTests extends ESSingleNodeTestCase { "type=keyword" ); - assertEquals(RestStatus.CREATED, client().prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); - assertEquals(RestStatus.CREATED, client().prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(idleIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(activeIndex).setSource("keyword", randomAlphaOfLength(10)).get().status()); assertEquals(RestStatus.OK, indicesAdmin().prepareRefresh(idleIndex, activeIndex).get().getStatus()); waitUntil( @@ -310,8 +310,8 @@ public class SearchIdleTests extends ESSingleNodeTestCase { "type=constant_keyword,value=test2_value" ); - assertEquals(RestStatus.CREATED, client().prepareIndex(idleIndex).setSource("keyword", "value").get().status()); - assertEquals(RestStatus.CREATED, client().prepareIndex(activeIndex).setSource("keyword", "value").get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(idleIndex).setSource("keyword", "value").get().status()); + assertEquals(RestStatus.CREATED, prepareIndex(activeIndex).setSource("keyword", "value").get().status()); assertEquals(RestStatus.OK, indicesAdmin().prepareRefresh(idleIndex, activeIndex).get().getStatus()); waitUntil( 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 0b0af8f8f9ac..3407a71f2326 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 @@ -78,8 +78,8 @@ public class UnsignedLongTests extends ESIntegTestCase { prepareCreate("idx-sort").setMapping("ul_field", "type=unsigned_long").setSettings(sortSettings).get(); List builders = new ArrayList<>(); for (int i = 0; i < numDocs; i++) { - builders.add(client().prepareIndex("idx").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject())); - builders.add(client().prepareIndex("idx-sort").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject())); + builders.add(prepareIndex("idx").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject())); + builders.add(prepareIndex("idx-sort").setSource(jsonBuilder().startObject().field("ul_field", values[i]).endObject())); } indexRandom(true, builders); diff --git a/x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java b/x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java index 98f09a1b6fca..0dc7ca8006f8 100644 --- a/x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java +++ b/x-pack/plugin/mapper-version/src/internalClusterTest/java/org/elasticsearch/xpack/versionfield/VersionFieldIT.java @@ -59,14 +59,11 @@ public class VersionFieldIT extends ESSingleNodeTestCase { .get(); ensureGreen(); - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); indicesAdmin().prepareRefresh().get(); // terms aggs @@ -104,14 +101,11 @@ public class VersionFieldIT extends ESSingleNodeTestCase { .get(); ensureGreen(); - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); indicesAdmin().prepareRefresh().get(); { diff --git a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java index 82d81e0c24f0..038f2b54965c 100644 --- a/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java +++ b/x-pack/plugin/mapper-version/src/test/java/org/elasticsearch/xpack/versionfield/VersionStringFieldTests.java @@ -40,18 +40,12 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "11.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.0.0").endObject()).get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()) - .get(); - client().prepareIndex(indexName) - .setId("4") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()) - .get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("6").setSource(jsonBuilder().startObject().field("version", "21.11.0").endObject()).get(); + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "11.1.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.0.0").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("6").setSource(jsonBuilder().startObject().field("version", "21.11.0").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); return indexName; } @@ -168,8 +162,8 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { public void testSort() throws IOException { String indexName = setUpIndex("test"); // also adding some invalid versions that should be sorted after legal ones - client().prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", "1.2.3alpha").endObject()).get(); - client().prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", "1.3.567#12").endObject()).get(); + prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", "1.2.3alpha").endObject()).get(); + prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", "1.3.567#12").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); // sort based on version field @@ -206,20 +200,13 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName) - .setId("1") + prepareIndex(indexName).setId("1") .setSource(jsonBuilder().startObject().field("version", "1.0.0alpha2.1.0-rc.1").endObject()) .get(); - client().prepareIndex(indexName) - .setId("2") - .setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()) - .get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.33.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.33.0").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); SearchResponse response = client().prepareSearch(indexName).setQuery(QueryBuilders.regexpQuery("version", "2.*0")).get(); @@ -259,21 +246,14 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName) - .setId("1") + prepareIndex(indexName).setId("1") .setSource(jsonBuilder().startObject().field("version", "1.0.0-alpha.2.1.0-rc.1").endObject()) .get(); - client().prepareIndex(indexName) - .setId("2") - .setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()) - .get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.33.0").endObject()).get(); - client().prepareIndex(indexName).setId("6").setSource(jsonBuilder().startObject().field("version", "2.a3.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0+build.1234567").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha.beta").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "2.33.0").endObject()).get(); + prepareIndex(indexName).setId("6").setSource(jsonBuilder().startObject().field("version", "2.a3.0").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); SearchResponse response = client().prepareSearch(indexName).setQuery(QueryBuilders.fuzzyQuery("version", "2.3.0")).get(); @@ -306,7 +286,7 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { "3.1.1+b", "3.1.123" )) { - client().prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", version).endObject()).get(); + prepareIndex(indexName).setSource(jsonBuilder().startObject().field("version", version).endObject()).get(); } client().admin().indices().prepareRefresh(indexName).get(); @@ -354,16 +334,10 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName) - .setId("1") - .setSource(jsonBuilder().startObject().field("version", "1.invalid.0").endObject()) - .get(); - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "2.2.0").endObject()).get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.2.0-badchar!").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "").endObject()).get(); + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.invalid.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "2.2.0").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.2.0-badchar!").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); SearchResponse response = client().prepareSearch(indexName).addDocValueField("version").get(); @@ -426,14 +400,11 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); - client().prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); - client().prepareIndex(indexName) - .setId("3") - .setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()) - .get(); - client().prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); - client().prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().field("version", "1.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().field("version", "1.3.0").endObject()).get(); + prepareIndex(indexName).setId("3").setSource(jsonBuilder().startObject().field("version", "2.1.0-alpha").endObject()).get(); + prepareIndex(indexName).setId("4").setSource(jsonBuilder().startObject().field("version", "2.1.0").endObject()).get(); + prepareIndex(indexName).setId("5").setSource(jsonBuilder().startObject().field("version", "3.11.5").endObject()).get(); client().admin().indices().prepareRefresh(indexName).get(); // terms aggs @@ -469,16 +440,9 @@ public class VersionStringFieldTests extends ESSingleNodeTestCase { createIndex(indexName, Settings.builder().put("index.number_of_shards", 1).build(), "_doc", "version", "type=version"); ensureGreen(indexName); - client().prepareIndex(indexName) - .setId("1") - .setSource(jsonBuilder().startObject().array("version", "1.0.0", "3.0.0").endObject()) - .get(); - client().prepareIndex(indexName) - .setId("2") - .setSource(jsonBuilder().startObject().array("version", "2.0.0", "4.alpha.0").endObject()) - .get(); - client().prepareIndex(indexName) - .setId("3") + prepareIndex(indexName).setId("1").setSource(jsonBuilder().startObject().array("version", "1.0.0", "3.0.0").endObject()).get(); + prepareIndex(indexName).setId("2").setSource(jsonBuilder().startObject().array("version", "2.0.0", "4.alpha.0").endObject()).get(); + prepareIndex(indexName).setId("3") .setSource(jsonBuilder().startObject().array("version", "2.1.0", "2.2.0", "5.99.0").endObject()) .get(); client().admin().indices().prepareRefresh(indexName).get(); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationEvaluationIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationEvaluationIT.java index 3265e30a0a64..c42f2b0fcda6 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationEvaluationIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/ClassificationEvaluationIT.java @@ -117,8 +117,7 @@ public class ClassificationEvaluationIT extends MlNativeDataFrameAnalyticsIntegT String actualField = "fieldA"; String predictedField = "fieldB"; client().admin().indices().prepareCreate(indexName).setMapping(actualField, "type=keyword", predictedField, "type=keyword").get(); - client().prepareIndex(indexName) - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) + prepareIndex(indexName).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setSource(actualField, "crocodile", predictedField, "cRoCoDiLe") .get(); 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 f9e8ea6fb4ed..cf73b5a4a754 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 @@ -125,10 +125,10 @@ public class DeleteExpiredDataIT extends MlNativeAutodetectIntegTestCase { public void testDeleteExpiredDataActionDeletesEmptyStateIndices() throws Exception { client().admin().indices().prepareCreate(".ml-state").get(); client().admin().indices().prepareCreate(".ml-state-000001").get(); - client().prepareIndex(".ml-state-000001").setSource("field_1", "value_1").get(); + prepareIndex(".ml-state-000001").setSource("field_1", "value_1").get(); client().admin().indices().prepareCreate(".ml-state-000003").get(); client().admin().indices().prepareCreate(".ml-state-000005").get(); - client().prepareIndex(".ml-state-000005").setSource("field_5", "value_5").get(); + prepareIndex(".ml-state-000005").setSource("field_5", "value_5").get(); client().admin().indices().prepareCreate(".ml-state-000007").addAlias(new Alias(".ml-state-write").isHidden(true)).get(); refresh(); diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java index 77a5d7c4f8a3..948544dc95bf 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/TestFeatureResetIT.java @@ -307,7 +307,7 @@ public class TestFeatureResetIT extends MlNativeAutodetectIntegTestCase { } private void indexDocForInference(String pipelineId) { - client().prepareIndex("foo").setPipeline(pipelineId).setSource("{\"text\": \"this is some plain text.\"}", XContentType.JSON).get(); + prepareIndex("foo").setPipeline(pipelineId).setSource("{\"text\": \"this is some plain text.\"}", XContentType.JSON).get(); } } diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java index f4eb0223ee0e..81ae60ecfa9a 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/license/MachineLearningLicensingIT.java @@ -540,7 +540,7 @@ public class MachineLearningLicensingIT extends BaseMlIntegTestCase { AcknowledgedResponse putPipelineResponse = putPipelineListener.actionGet(); assertTrue(putPipelineResponse.isAcknowledged()); - client().prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); + prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); String simulateSource = Strings.format(""" { @@ -569,7 +569,7 @@ public class MachineLearningLicensingIT extends BaseMlIntegTestCase { // Inference against the previous pipeline should still work try { - client().prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); + prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); } catch (ElasticsearchSecurityException ex) { fail(ex.getMessage()); } @@ -590,10 +590,7 @@ public class MachineLearningLicensingIT extends BaseMlIntegTestCase { // Inference against the new pipeline should fail since it has never previously succeeded ElasticsearchSecurityException e = expectThrows(ElasticsearchSecurityException.class, () -> { - client().prepareIndex("infer_license_test") - .setPipeline("test_infer_license_pipeline_again") - .setSource("{}", XContentType.JSON) - .get(); + prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline_again").setSource("{}", XContentType.JSON).get(); }); assertThat(e.status(), is(RestStatus.FORBIDDEN)); assertThat(e.getMessage(), containsString("non-compliant")); @@ -636,11 +633,8 @@ public class MachineLearningLicensingIT extends BaseMlIntegTestCase { // both ingest pipelines should work - client().prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); - client().prepareIndex("infer_license_test") - .setPipeline("test_infer_license_pipeline_again") - .setSource("{}", XContentType.JSON) - .get(); + prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline").setSource("{}", XContentType.JSON).get(); + prepareIndex("infer_license_test").setPipeline("test_infer_license_pipeline_again").setSource("{}", XContentType.JSON).get(); } public void testMachineLearningInferModelRestricted() { diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/AnomalyJobCRUDIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/AnomalyJobCRUDIT.java index 4a091891de0a..35d99b97f99c 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/AnomalyJobCRUDIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/AnomalyJobCRUDIT.java @@ -114,8 +114,7 @@ public class AnomalyJobCRUDIT extends MlSingleNodeTestCase { public void testCreateWithExistingCategorizerDocs() { String jobId = "job-id-with-existing-docs"; testCreateWithExistingDocs( - client().prepareIndex(".ml-state-000001") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) + prepareIndex(".ml-state-000001").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setId(jobId + "_categorizer_state#1") .setSource("{}", XContentType.JSON) .request(), @@ -126,8 +125,7 @@ public class AnomalyJobCRUDIT extends MlSingleNodeTestCase { public void testCreateWithExistingQuantilesDocs() { String jobId = "job-id-with-existing-docs"; testCreateWithExistingDocs( - client().prepareIndex(".ml-state-000001") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) + prepareIndex(".ml-state-000001").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setId(jobId + "_quantiles") .setSource("{}", XContentType.JSON) .request(), @@ -138,8 +136,7 @@ public class AnomalyJobCRUDIT extends MlSingleNodeTestCase { public void testCreateWithExistingResultsDocs() { String jobId = "job-id-with-existing-docs"; testCreateWithExistingDocs( - client().prepareIndex(".ml-anomalies-shared") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) + prepareIndex(".ml-anomalies-shared").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setId(jobId + "_1464739200000_1") .setSource("{\"job_id\": \"" + jobId + "\"}", XContentType.JSON) .request(), 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 ab41a2f5637d..bed5b1cb1bbf 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 @@ -57,17 +57,21 @@ public class CategorizeTextDistributedIT extends BaseMlIntegTestCase { for (int i = 0; i < 10; ++i) { BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); for (int j = 0; j < 250; ++j) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(indexName) - .setSource(Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol destroy")); + IndexRequestBuilder indexRequestBuilder = prepareIndex(indexName).setSource( + Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol destroy") + ); bulkRequestBuilder.add(indexRequestBuilder); - indexRequestBuilder = client().prepareIndex(indexName) - .setSource(Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol init")); + indexRequestBuilder = prepareIndex(indexName).setSource( + Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol init") + ); bulkRequestBuilder.add(indexRequestBuilder); - indexRequestBuilder = client().prepareIndex(indexName) - .setSource(Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol start")); + indexRequestBuilder = prepareIndex(indexName).setSource( + Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol start") + ); bulkRequestBuilder.add(indexRequestBuilder); - indexRequestBuilder = client().prepareIndex(indexName) - .setSource(Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol stop")); + indexRequestBuilder = prepareIndex(indexName).setSource( + Map.of("message", "Aug 29, 2019 2:02:51 PM org.apache.coyote.http11.Http11BaseProtocol stop") + ); bulkRequestBuilder.add(indexRequestBuilder); } bulkRequestBuilder.get(); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelRestorerIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelRestorerIT.java index db5c01634936..fd577cfd44c7 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelRestorerIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/ChunkedTrainedModelRestorerIT.java @@ -202,8 +202,7 @@ public class ChunkedTrainedModelRestorerIT extends MlSingleNodeTestCase { BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); for (TrainedModelDefinitionDoc doc : docs) { try (XContentBuilder xContentBuilder = doc.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(index) - .setSource(xContentBuilder) + IndexRequestBuilder indexRequestBuilder = prepareIndex(index).setSource(xContentBuilder) .setId(TrainedModelDefinitionDoc.docId(doc.getModelId(), startingDocNum++)); bulkRequestBuilder.add(indexRequestBuilder); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobResultsProviderIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobResultsProviderIT.java index e862d736e362..891779e28439 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobResultsProviderIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/JobResultsProviderIT.java @@ -792,8 +792,7 @@ public class JobResultsProviderIT extends MlSingleNodeTestCase { .build() ); // Add a snapshot WITHOUT a min version. - client().prepareIndex(AnomalyDetectorsIndex.jobResultsAliasedName("other_job")) - .setId(ModelSnapshot.documentId("other_job", "11")) + prepareIndex(AnomalyDetectorsIndex.jobResultsAliasedName("other_job")).setId(ModelSnapshot.documentId("other_job", "11")) .setSource(""" {"job_id":"other_job","snapshot_id":"11", "snapshot_doc_count":1,"retain":false}""", XContentType.JSON) .get(); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlAutoUpdateServiceIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlAutoUpdateServiceIT.java index 743f018a425a..dc0c09090039 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlAutoUpdateServiceIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/MlAutoUpdateServiceIT.java @@ -74,8 +74,7 @@ public class MlAutoUpdateServiceIT extends MlSingleNodeTestCase { public void testAutomaticModelUpdate() throws Exception { ensureGreen("_all"); IndexNameExpressionResolver indexNameExpressionResolver = TestIndexNameExpressionResolver.newInstance(); - client().prepareIndex(MlConfigIndex.indexName()) - .setId(DatafeedConfig.documentId("farequote-datafeed-with-old-agg")) + prepareIndex(MlConfigIndex.indexName()).setId(DatafeedConfig.documentId("farequote-datafeed-with-old-agg")) .setSource(AGG_WITH_OLD_DATE_HISTOGRAM_INTERVAL, XContentType.JSON) .get(); AtomicReference getConfigHolder = new AtomicReference<>(); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/PyTorchStateStreamerIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/PyTorchStateStreamerIT.java index db5e22b686c0..a8fd66bb0441 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/PyTorchStateStreamerIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/PyTorchStateStreamerIT.java @@ -103,8 +103,7 @@ public class PyTorchStateStreamerIT extends MlSingleNodeTestCase { for (int i = 0; i < docs.size(); i++) { TrainedModelDefinitionDoc doc = docs.get(i); try (XContentBuilder xContentBuilder = doc.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME) - .setSource(xContentBuilder) + IndexRequestBuilder indexRequestBuilder = prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME).setSource(xContentBuilder) .setId(TrainedModelDefinitionDoc.docId(doc.getModelId(), i)); bulkRequestBuilder.add(indexRequestBuilder); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java index 1656970f1715..51f624377851 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/TrainedModelProviderIT.java @@ -322,8 +322,7 @@ public class TrainedModelProviderIT extends MlSingleNodeTestCase { ) { AtomicReference putDocHolder = new AtomicReference<>(); blockingCall( - listener -> client().prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME) - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) + listener -> prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setSource(xContentBuilder) .setId(TrainedModelDefinitionDoc.docId(modelId, 0)) .execute(listener), @@ -372,8 +371,7 @@ public class TrainedModelProviderIT extends MlSingleNodeTestCase { TrainedModelDefinitionDoc doc = docBuilders.get(i).build(); try (XContentBuilder xContentBuilder = doc.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME) - .setSource(xContentBuilder) + IndexRequestBuilder indexRequestBuilder = prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME).setSource(xContentBuilder) .setId(TrainedModelDefinitionDoc.docId(modelId, i)); bulkRequestBuilder.add(indexRequestBuilder); @@ -413,8 +411,7 @@ public class TrainedModelProviderIT extends MlSingleNodeTestCase { for (int i = 0; i < docBuilders.size(); i++) { TrainedModelDefinitionDoc doc = docBuilders.get(i).build(); try (XContentBuilder xContentBuilder = doc.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) { - IndexRequestBuilder indexRequestBuilder = client().prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME) - .setSource(xContentBuilder) + IndexRequestBuilder indexRequestBuilder = prepareIndex(InferenceIndexConstants.LATEST_INDEX_NAME).setSource(xContentBuilder) .setId(TrainedModelDefinitionDoc.docId(modelId, i)); bulkRequestBuilder.add(indexRequestBuilder); diff --git a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/UnusedStatsRemoverIT.java b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/UnusedStatsRemoverIT.java index 8a278681523f..4c8382047e79 100644 --- a/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/UnusedStatsRemoverIT.java +++ b/x-pack/plugin/ml/src/internalClusterTest/java/org/elasticsearch/xpack/ml/integration/UnusedStatsRemoverIT.java @@ -65,7 +65,7 @@ public class UnusedStatsRemoverIT extends BaseMlIntegTestCase { public void testRemoveUnusedStats() throws Exception { - client().prepareIndex("foo").setId("some-empty-doc").setSource("{}", XContentType.JSON).get(); + prepareIndex("foo").setId("some-empty-doc").setSource("{}", XContentType.JSON).get(); PutDataFrameAnalyticsAction.Request request = new PutDataFrameAnalyticsAction.Request( new DataFrameAnalyticsConfig.Builder().setId("analytics-with-stats") diff --git a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java index 8db7425a5007..506cd016cf8d 100644 --- a/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java +++ b/x-pack/plugin/monitoring/src/internalClusterTest/java/org/elasticsearch/xpack/monitoring/integration/MonitoringIT.java @@ -196,8 +196,7 @@ public class MonitoringIT extends ESSingleNodeTestCase { final String indexName = createAPMIndex ? "apm-2017.11.06" : "books"; assertThat( - client().prepareIndex(indexName) - .setId("0") + prepareIndex(indexName).setId("0") .setRefreshPolicy("true") .setSource("{\"field\":\"value\"}", XContentType.JSON) .get() 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 897085dbc5c8..a732e80e18f3 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 @@ -73,8 +73,7 @@ public class LocalExporterIntegTests extends LocalExporterIntegTestCase { // indexing some random documents IndexRequestBuilder[] indexRequestBuilders = new IndexRequestBuilder[5]; for (int i = 0; i < indexRequestBuilders.length; i++) { - indexRequestBuilders[i] = client().prepareIndex("test") - .setId(Integer.toString(i)) + indexRequestBuilders[i] = prepareIndex("test").setId(Integer.toString(i)) .setSource("title", "This is a random document"); } indexRandom(true, indexRequestBuilders); diff --git a/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/ProfilingTestCase.java b/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/ProfilingTestCase.java index bc7df029b1d9..ed3995a9c9ea 100644 --- a/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/ProfilingTestCase.java +++ b/x-pack/plugin/profiling/src/internalClusterTest/java/org/elasticsearch/xpack/profiling/ProfilingTestCase.java @@ -7,7 +7,6 @@ package org.elasticsearch.xpack.profiling; -import org.elasticsearch.action.DocWriteResponse; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; @@ -18,7 +17,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.datastreams.DataStreamsPlugin; import org.elasticsearch.license.LicenseSettings; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.rest.RestStatus; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.transport.netty4.Netty4Plugin; import org.elasticsearch.xcontent.XContentType; @@ -35,7 +33,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Map; @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1) public abstract class ProfilingTestCase extends ESIntegTestCase { @@ -87,11 +84,6 @@ public abstract class ProfilingTestCase extends ESIntegTestCase { assertTrue("Shards for [" + name + "] are not acknowledged.", response.isShardsAcknowledged()); } - protected final void indexDoc(String index, String id, Map source) { - DocWriteResponse indexResponse = client().prepareIndex(index).setId(id).setSource(source).setCreate(true).get(); - assertEquals(RestStatus.CREATED, indexResponse.status()); - } - /** * @return true iff this test relies on that data (and the corresponding indices / data streams) are present for this test. */ 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 b20c865c4edc..445aeaa375e1 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 @@ -114,10 +114,10 @@ public class RRFRankCoordinatorCanMatchIT extends ESIntegTestCase { ensureGreen("time_index"); for (int i = 0; i < 500; i++) { - client().prepareIndex("time_index").setSource("@timestamp", i).setRouting("a").get(); + prepareIndex("time_index").setSource("@timestamp", i).setRouting("a").get(); } for (int i = 500; i < 1000; i++) { - client().prepareIndex("time_index").setSource("@timestamp", i).setRouting("b").get(); + prepareIndex("time_index").setSource("@timestamp", i).setRouting("b").get(); } client().admin().indices().prepareRefresh("time_index").get(); 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 13e5a5634b7c..af465658a0b5 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 @@ -77,9 +77,9 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { assertAcked(prepareCreate("tiny_index").setMapping(builder)); ensureGreen("tiny_index"); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 0.0f }, "text", "term term").get(); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 1.0f }, "text", "other").get(); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 2.0f }, "text", "term").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 0.0f }, "text", "term term").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 1.0f }, "text", "other").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 2.0f }, "text", "term").get(); indicesAdmin().prepareRefresh("tiny_index").get(); @@ -117,20 +117,18 @@ public class RRFRankMultiShardIT extends ESIntegTestCase { ensureGreen(TimeValue.timeValueSeconds(120), "nrd_index"); for (int doc = 0; doc < 1001; ++doc) { - client().prepareIndex("nrd_index") - .setSource( - "vector_asc", - new float[] { doc }, - "vector_desc", - new float[] { 1000 - doc }, - "int", - doc % 3, - "text0", - "term " + doc, - "text1", - "term " + (1000 - doc) - ) - .get(); + prepareIndex("nrd_index").setSource( + "vector_asc", + new float[] { doc }, + "vector_desc", + new float[] { 1000 - doc }, + "int", + doc % 3, + "text0", + "term " + doc, + "text1", + "term " + (1000 - doc) + ).get(); } indicesAdmin().prepareRefresh("nrd_index").get(); 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 a151e6057451..084ccc88bee3 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 @@ -129,13 +129,13 @@ public class RRFRankShardCanMatchIT extends ESIntegTestCase { int shardB = -1; for (int i = 0; i < 10; i++) { - DocWriteResponse ir = client().prepareIndex("value_index").setSource("value", "" + i).setRouting("a").get(); + DocWriteResponse ir = prepareIndex("value_index").setSource("value", "" + i).setRouting("a").get(); int a = ir.getShardId().id(); assertTrue(shardA == a || shardA == -1); shardA = a; } for (int i = 10; i < 20; i++) { - DocWriteResponse ir = client().prepareIndex("value_index").setSource("value", "" + i).setRouting("b").get(); + DocWriteResponse ir = prepareIndex("value_index").setSource("value", "" + i).setRouting("b").get(); int b = ir.getShardId().id(); assertTrue(shardB == b || shardB == -1); shardB = b; diff --git a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankSingleShardIT.java b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankSingleShardIT.java index 633b71230468..3a82f697acc9 100644 --- a/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankSingleShardIT.java +++ b/x-pack/plugin/rank-rrf/src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRankSingleShardIT.java @@ -63,9 +63,9 @@ public class RRFRankSingleShardIT extends ESSingleNodeTestCase { createIndex("tiny_index", indexSettings, builder); ensureGreen("tiny_index"); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 0.0f }, "text", "term term").get(); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 1.0f }, "text", "other").get(); - client().prepareIndex("tiny_index").setSource("vector", new float[] { 2.0f }, "text", "term").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 0.0f }, "text", "term term").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 1.0f }, "text", "other").get(); + prepareIndex("tiny_index").setSource("vector", new float[] { 2.0f }, "text", "term").get(); client().admin().indices().prepareRefresh("tiny_index").get(); @@ -103,20 +103,18 @@ public class RRFRankSingleShardIT extends ESSingleNodeTestCase { ensureGreen(TimeValue.timeValueSeconds(120), "nrd_index"); for (int doc = 0; doc < 1001; ++doc) { - client().prepareIndex("nrd_index") - .setSource( - "vector_asc", - new float[] { doc }, - "vector_desc", - new float[] { 1000 - doc }, - "int", - doc % 3, - "text0", - "term " + doc, - "text1", - "term " + (1000 - doc) - ) - .get(); + prepareIndex("nrd_index").setSource( + "vector_asc", + new float[] { doc }, + "vector_desc", + new float[] { 1000 - doc }, + "int", + doc % 3, + "text0", + "term " + doc, + "text1", + "term " + (1000 - doc) + ).get(); } client().admin().indices().prepareRefresh("nrd_index").get(); diff --git a/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java b/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java index b80d11aa2823..9a28e11ee1cb 100644 --- a/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java +++ b/x-pack/plugin/search-business-rules/src/internalClusterTest/java/org/elasticsearch/xpack/searchbusinessrules/PinnedQueryBuilderIT.java @@ -71,16 +71,16 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { for (int i = 0; i < numRelevantDocs; i++) { if (i % 2 == 0) { // add lower-scoring text - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "the quick brown fox").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "the quick brown fox").get(); } else { // add higher-scoring text - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "red fox").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "red fox").get(); } } // Add docs with no relevance int numIrrelevantDocs = randomIntBetween(1, 10); for (int i = numRelevantDocs; i <= numRelevantDocs + numIrrelevantDocs; i++) { - client().prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "irrelevant").get(); + prepareIndex("test").setId(Integer.toString(i)).setSource("field1", "irrelevant").get(); } refresh(); @@ -177,8 +177,8 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { ).setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", 1)) ); - client().prepareIndex("test").setId("1").setSource("field1", "foo").get(); - client().prepareIndex("test").setId("2").setSource("field1", "foo", "field2", "foo").get(); + prepareIndex("test").setId("1").setSource("field1", "foo").get(); + prepareIndex("test").setId("2").setSource("field1", "foo", "field2", "foo").get(); refresh(); @@ -210,10 +210,10 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); - client().prepareIndex("test").setId("2").setSource("field1", "pinned").get(); - client().prepareIndex("test").setId("3").setSource("field1", "irrelevant").get(); - client().prepareIndex("test").setId("4").setSource("field1", "slow brown cat").get(); + prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); + prepareIndex("test").setId("2").setSource("field1", "pinned").get(); + prepareIndex("test").setId("3").setSource("field1", "irrelevant").get(); + prepareIndex("test").setId("4").setSource("field1", "slow brown cat").get(); refresh(); QueryBuilder organicQuery = QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR); @@ -254,7 +254,7 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { ) ); ensureGreen(); - client().prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); + prepareIndex("test").setId("1").setSource("field1", "the quick brown fox").get(); refresh(); QueryBuilder organicQuery = QueryBuilders.matchQuery("field1", "the quick brown").operator(Operator.OR); @@ -309,12 +309,12 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { ).setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", randomIntBetween(2, 5))) ); - client().prepareIndex("test1").setId("a").setSource("field1", "1a bar").get(); - client().prepareIndex("test1").setId("b").setSource("field1", "1b bar").get(); - client().prepareIndex("test1").setId("c").setSource("field1", "1c bar").get(); - client().prepareIndex("test2").setId("a").setSource("field1", "2a bar").get(); - client().prepareIndex("test2").setId("b").setSource("field1", "2b bar").get(); - client().prepareIndex("test2").setId("c").setSource("field1", "2c foo").get(); + prepareIndex("test1").setId("a").setSource("field1", "1a bar").get(); + prepareIndex("test1").setId("b").setSource("field1", "1b bar").get(); + prepareIndex("test1").setId("c").setSource("field1", "1c bar").get(); + prepareIndex("test2").setId("a").setSource("field1", "2a bar").get(); + prepareIndex("test2").setId("b").setSource("field1", "2b bar").get(); + prepareIndex("test2").setId("c").setSource("field1", "2c foo").get(); refresh(); @@ -352,9 +352,9 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { .addAlias(new Alias("test-alias")) ); - client().prepareIndex("test").setId("a").setSource("field1", "document a").get(); - client().prepareIndex("test").setId("b").setSource("field1", "document b").get(); - client().prepareIndex("test").setId("c").setSource("field1", "document c").get(); + prepareIndex("test").setId("a").setSource("field1", "document a").get(); + prepareIndex("test").setId("b").setSource("field1", "document b").get(); + prepareIndex("test").setId("c").setSource("field1", "document c").get(); refresh(); @@ -406,11 +406,11 @@ public class PinnedQueryBuilderIT extends ESIntegTestCase { ).setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", randomIntBetween(2, 5))).addAlias(alias) ); - client().prepareIndex("test1").setId("a").setSource("field1", "document a").get(); - client().prepareIndex("test1").setId("b").setSource("field1", "document b").get(); - client().prepareIndex("test1").setId("c").setSource("field1", "document c").get(); + prepareIndex("test1").setId("a").setSource("field1", "document a").get(); + prepareIndex("test1").setId("b").setSource("field1", "document b").get(); + prepareIndex("test1").setId("c").setSource("field1", "document c").get(); - client().prepareIndex("test2").setId("a").setSource("field1", "document a").get(); + prepareIndex("test2").setId("a").setSource("field1", "document a").get(); refresh(); 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 b07d307f105c..d3bb435dc03a 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 @@ -203,7 +203,7 @@ public abstract class BaseSearchableSnapshotsIntegTestCase extends AbstractSnaps // This index does not permit dynamic fields, so we can only use defined field names final String key = indexName.equals(SearchableSnapshots.SNAPSHOT_BLOB_CACHE_INDEX) ? "type" : "foo"; for (int i = between(10, maxIndexRequests); i >= 0; i--) { - indexRequestBuilders.add(client().prepareIndex(indexName).setSource(key, randomBoolean() ? "bar" : "baz")); + indexRequestBuilders.add(prepareIndex(indexName).setSource(key, randomBoolean() ? "bar" : "baz")); } indexRandom(true, true, indexRequestBuilders); refresh(indexName); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/ClusterStateApplierOrderingTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/ClusterStateApplierOrderingTests.java index 3b4c4739311a..82ded22603ef 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/ClusterStateApplierOrderingTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/ClusterStateApplierOrderingTests.java @@ -49,7 +49,7 @@ public class ClusterStateApplierOrderingTests extends BaseSearchableSnapshotsInt final List indexRequestBuilders = new ArrayList<>(); for (int i = between(10, 10_000); i >= 0; i--) { - indexRequestBuilders.add(client().prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); + indexRequestBuilders.add(prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); } indexRandom(true, true, indexRequestBuilders); refresh(indexName); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java index ee1ce5652836..daf61ff9a493 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java @@ -430,8 +430,8 @@ public class FrozenSearchableSnapshotsIntegTests extends BaseFrozenSearchableSna ); indexRandom( true, - client().prepareIndex("test-index").setSource("f", "2014-03-10T00:00:00.000Z"), - client().prepareIndex("test-index").setSource("f", "2014-05-13T00:00:00.000Z") + prepareIndex("test-index").setSource("f", "2014-03-10T00:00:00.000Z"), + prepareIndex("test-index").setSource("f", "2014-05-13T00:00:00.000Z") ); ensureSearchable("test-index"); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java index 39e476107a0d..e11dee6684a4 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/RetrySearchIntegTests.java @@ -49,7 +49,7 @@ public class RetrySearchIntegTests extends BaseSearchableSnapshotsIntegTestCase final List indexRequestBuilders = new ArrayList<>(); final int docCount = between(0, 100); for (int i = 0; i < docCount; i++) { - indexRequestBuilders.add(client().prepareIndex(indexName).setSource("created_date", "2011-02-02")); + indexRequestBuilders.add(prepareIndex(indexName).setSource("created_date", "2011-02-02")); } indexRandom(true, false, indexRequestBuilders); assertThat( @@ -116,7 +116,7 @@ public class RetrySearchIntegTests extends BaseSearchableSnapshotsIntegTestCase final List indexRequestBuilders = new ArrayList<>(); final int docCount = between(0, 100); for (int i = 0; i < docCount; i++) { - indexRequestBuilders.add(client().prepareIndex(indexName).setSource("created_date", "2011-02-02")); + indexRequestBuilders.add(prepareIndex(indexName).setSource("created_date", "2011-02-02")); } indexRandom(true, false, indexRequestBuilders); assertThat( diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java index 6249324f46e7..402cb4816ba7 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsCanMatchOnCoordinatorIntegTests.java @@ -724,18 +724,17 @@ public class SearchableSnapshotsCanMatchOnCoordinatorIntegTests extends BaseFroz final List indexRequestBuilders = new ArrayList<>(); for (int i = 0; i < docCount; i++) { indexRequestBuilders.add( - client().prepareIndex(indexName) - .setSource( - DataStream.TIMESTAMP_FIELD_NAME, - String.format( - Locale.ROOT, - timestampTemplate, - between(0, 23), - between(0, 59), - between(0, 59), - randomLongBetween(0, 999999999L) - ) + prepareIndex(indexName).setSource( + DataStream.TIMESTAMP_FIELD_NAME, + String.format( + Locale.ROOT, + timestampTemplate, + between(0, 23), + between(0, 59), + between(0, 59), + randomLongBetween(0, 999999999L) ) + ) ); } indexRandom(true, false, indexRequestBuilders); 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 81ea36e88628..c3f5e44ae32a 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 @@ -365,7 +365,7 @@ public class SearchableSnapshotsIntegTests extends BaseSearchableSnapshotsIntegT final Thread indexingThead = new Thread(() -> { final List indexRequestBuilders = new ArrayList<>(); for (int i = between(10, 10_000); i >= 0; i--) { - indexRequestBuilders.add(client().prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); + indexRequestBuilders.add(prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); } try { safeAwait(cyclicBarrier); @@ -427,7 +427,7 @@ public class SearchableSnapshotsIntegTests extends BaseSearchableSnapshotsIntegT true, false, IntStream.range(0, nbDocs) - .mapToObj(i -> client().prepareIndex(indexName).setSource("foo", randomAlphaOfLength(1048))) + .mapToObj(i -> prepareIndex(indexName).setSource("foo", randomAlphaOfLength(1048))) .collect(Collectors.toList()) ); refresh(indexName); @@ -699,18 +699,17 @@ public class SearchableSnapshotsIntegTests extends BaseSearchableSnapshotsIntegT final int docCount = between(0, 1000); for (int i = 0; i < docCount; i++) { indexRequestBuilders.add( - client().prepareIndex(indexName) - .setSource( - DataStream.TIMESTAMP_FIELD_NAME, - String.format( - Locale.ROOT, - "2020-11-26T%02d:%02d:%02d.%09dZ", - between(0, 23), - between(0, 59), - between(0, 59), - randomLongBetween(0, 999999999L) - ) + prepareIndex(indexName).setSource( + DataStream.TIMESTAMP_FIELD_NAME, + String.format( + Locale.ROOT, + "2020-11-26T%02d:%02d:%02d.%09dZ", + between(0, 23), + between(0, 59), + between(0, 59), + randomLongBetween(0, 999999999L) ) + ) ); } indexRandom(true, false, indexRequestBuilders); 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 9847eb101531..b5ebf1104a19 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 @@ -132,7 +132,7 @@ public class SearchableSnapshotsBlobStoreCacheIntegTests extends BaseFrozenSearc for (int i = numberOfDocs; i > 0; i--) { XContentBuilder builder = XContentFactory.smileBuilder(); builder.startObject().field("text", randomRealisticUnicodeOfCodepointLengthBetween(5, 50)).field("num", i).endObject(); - indexRequestBuilders.add(client().prepareIndex(indexName).setSource(builder)); + indexRequestBuilders.add(prepareIndex(indexName).setSource(builder)); } indexRandom(true, true, true, indexRequestBuilders); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheMaintenanceIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheMaintenanceIntegTests.java index 68b702469d13..c89df1edfa10 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheMaintenanceIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/blob/SearchableSnapshotsBlobStoreCacheMaintenanceIntegTests.java @@ -366,7 +366,7 @@ public class SearchableSnapshotsBlobStoreCacheMaintenanceIntegTests extends Base builder.field("int_" + j, randomInt()); } builder.endObject(); - indexRequestBuilders.add(client().prepareIndex(indexName).setSource(builder)); + indexRequestBuilders.add(prepareIndex(indexName).setSource(builder)); } indexRandom(true, indexRequestBuilders); diff --git a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java index 3892ef6ea464..7e6981a4594e 100644 --- a/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java +++ b/x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/cache/full/SearchableSnapshotsPrewarmingIntegTests.java @@ -137,7 +137,7 @@ public class SearchableSnapshotsPrewarmingIntegTests extends ESSingleNodeTestCas if (nbDocs > 0) { final BulkRequestBuilder bulkRequest = client().prepareBulk(); for (int i = 0; i < nbDocs; i++) { - bulkRequest.add(client().prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); + bulkRequest.add(prepareIndex(indexName).setSource("foo", randomBoolean() ? "bar" : "baz")); } final BulkResponse bulkResponse = bulkRequest.get(); assertThat(bulkResponse.hasFailures(), is(false)); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/BulkUpdateTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/BulkUpdateTests.java index 14e905656953..4c49b7a0a3c1 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/BulkUpdateTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/BulkUpdateTests.java @@ -43,7 +43,7 @@ public class BulkUpdateTests extends SecurityIntegTestCase { public void testThatBulkUpdateDoesNotLoseFields() { assertEquals( DocWriteResponse.Result.CREATED, - client().prepareIndex("index1").setSource("{\"test\": \"test\"}", XContentType.JSON).setId("1").get().getResult() + prepareIndex("index1").setSource("{\"test\": \"test\"}", XContentType.JSON).setId("1").get().getResult() ); GetResponse getResponse = client().prepareGet("index1", "1").get(); assertEquals("test", getResponse.getSource().get("test")); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java index 9714805e3db9..164d28216ea9 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentAndFieldLevelSecurityTests.java @@ -110,8 +110,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testSimpleQuery() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("id", "type=keyword", "field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); SearchResponse response = client().filterWithHeader( Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD)) @@ -148,7 +148,7 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { .setMapping("id", "type=keyword", "field1", "type=text", "field2", "type=text") .setSettings(indexSettings(1, 0)) ); - client().prepareIndex(indexName).setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(indexName).setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); ElasticsearchSecurityException exception = expectThrows(ElasticsearchSecurityException.class, () -> { client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD))) @@ -178,8 +178,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testDLSIsAppliedBeforeFLS() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); SearchResponse response = client().filterWithHeader( Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user5", USERS_PASSWD)) @@ -203,8 +203,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { .setSettings(Settings.builder().put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true)) .setMapping("id", "type=keyword", "field1", "type=text", "field2", "type=text") ); - client().prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); // Both users have the same role query, but user3 has access to field2 and not field1, which should result in zero hits: int max = scaledRandomIntBetween(4, 32); @@ -256,8 +256,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testGetMappingsIsFiltered() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); { GetMappingsResponse getMappingsResponse = client().filterWithHeader( @@ -290,8 +290,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testGetIndexMappingsIsFiltered() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); { GetIndexResponse getIndexResponse = client().filterWithHeader( @@ -321,8 +321,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testGetFieldMappingsIsFiltered() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); { GetFieldMappingsResponse getFieldMappingsResponse = client().filterWithHeader( @@ -364,8 +364,8 @@ public class DocumentAndFieldLevelSecurityTests extends SecurityIntegTestCase { public void testFieldCapabilitiesIsFiltered() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); { FieldCapabilitiesRequest fieldCapabilitiesRequest = new FieldCapabilitiesRequest().fields("*").indices("test"); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityFeatureUsageTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityFeatureUsageTests.java index 2eca81ab9c2f..116e94cafcad 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityFeatureUsageTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DocumentLevelSecurityFeatureUsageTests.java @@ -85,9 +85,9 @@ public class DocumentLevelSecurityFeatureUsageTests extends AbstractDocumentAndF public void testDlsFeatureUsageTracking() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); SearchResponse response = internalCluster().coordOnlyNodeClient() .filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD))) @@ -105,8 +105,8 @@ public class DocumentLevelSecurityFeatureUsageTests extends AbstractDocumentAndF public void testDlsFlsFeatureUsageNotTracked() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("id", "type=keyword", "field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("id", "1", "field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("id", "2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); // Running a search with user2 (which has role3 without DLS/FLS) should not trigger feature tracking. SearchResponse response = internalCluster().coordOnlyNodeClient() 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 b5e5183df086..61126810e3df 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 @@ -98,7 +98,7 @@ public class DocumentLevelSecurityRandomTests extends SecurityIntegTestCase { IndicesAliasesRequestBuilder builder = indicesAdmin().prepareAliases(); for (int i = 1; i <= numberOfRoles; i++) { String value = "value" + i; - requests.add(client().prepareIndex("test").setId(value).setSource("field1", value)); + requests.add(prepareIndex("test").setId(value).setSource("field1", value)); builder.addAlias("test", "alias" + i, QueryBuilders.termQuery("field1", value)); } indexRandom(true, requests); 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 a76b04373737..238b66cf10c3 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 @@ -204,9 +204,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { public void testSimpleQuery() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); assertSearchHitsWithoutFailures( client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user1", USERS_PASSWD))) @@ -236,9 +236,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { public void testGetApi() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field2", "value2").get(); + prepareIndex("test").setId("3").setSource("field3", "value3").get(); // test documents users can see boolean realtime = randomBoolean(); @@ -302,8 +302,8 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { final boolean realtime = true; final boolean refresh = false; - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field2", "value2").get(); // do a realtime get beforehand to flip an internal translog flag so that subsequent realtime gets are // served from the translog (this first one is NOT, it internally forces a refresh of the index) client().prepareMultiGet().add("test", "1").add("test", "2").setRealtime(realtime).setRefresh(refresh).get(); @@ -311,13 +311,11 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { // updates don't change the doc visibility for users // but updates populate the translog and the DLS filter must apply to the translog operations as well if (randomBoolean()) { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field3", "value3") .setRefreshPolicy(WriteRequest.RefreshPolicy.NONE) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource("field2", "value2", "field3", "value3") .setRefreshPolicy(WriteRequest.RefreshPolicy.NONE) .get(); @@ -369,9 +367,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { public void testMGetApi() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field2", "value2").get(); + prepareIndex("test").setId("3").setSource("field3", "value3").get(); boolean realtime = randomBoolean(); MultiGetResponse response = client().filterWithHeader( @@ -443,12 +441,12 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text", "id", "type=integer") ); - client().prepareIndex("test1").setId("1").setSource("field1", "value1", "id", 1).get(); - client().prepareIndex("test1").setId("2").setSource("field2", "value2", "id", 2).get(); - client().prepareIndex("test1").setId("3").setSource("field3", "value3", "id", 3).get(); - client().prepareIndex("test2").setId("1").setSource("field1", "value1", "id", 1).get(); - client().prepareIndex("test2").setId("2").setSource("field2", "value2", "id", 2).get(); - client().prepareIndex("test2").setId("3").setSource("field3", "value3", "id", 3).get(); + prepareIndex("test1").setId("1").setSource("field1", "value1", "id", 1).get(); + prepareIndex("test1").setId("2").setSource("field2", "value2", "id", 2).get(); + prepareIndex("test1").setId("3").setSource("field3", "value3", "id", 3).get(); + prepareIndex("test2").setId("1").setSource("field1", "value1", "id", 1).get(); + prepareIndex("test2").setId("2").setSource("field2", "value2", "id", 2).get(); + prepareIndex("test2").setId("3").setSource("field3", "value3", "id", 3).get(); indicesAdmin().prepareRefresh("test1", "test2").get(); MultiSearchResponse response = client().filterWithHeader( @@ -521,14 +519,12 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setMapping("message", "type=text", "query", "type=percolator", "field1", "type=text", "field2", "type=text") ); assertAcked(indicesAdmin().prepareCreate("doc_index").setMapping("message", "type=text", "field1", "type=text")); - client().prepareIndex("query_index") - .setId("1") + prepareIndex("query_index").setId("1") .setSource(""" {"field1": "value1", "field2": "value2", "query": {"match": {"message": "bonsai tree"}}}""", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("doc_index") - .setId("1") + prepareIndex("doc_index").setId("1") .setSource("{\"field1\": \"value1\", \"message\": \"A new bonsai tree in the office\"}", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) .get(); @@ -565,14 +561,12 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("shape_index") .setMapping("shape_field", "type=shape", "field1", "type=text", "field2", "type=text") ); - client().prepareIndex("search_index") - .setId("1") + prepareIndex("search_index").setId("1") .setSource(""" {"field1": "value1", "field2": "value2", "search_field": { "type": "point", "coordinates":[1, 1] }}""", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("shape_index") - .setId("1") + prepareIndex("shape_index").setId("1") .setSource(""" {"field1": "value1", "shape_field": { "type": "envelope", "coordinates": [[0, 2], [2, 0]]}}""", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) @@ -631,38 +625,28 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("lookup_index") .setMapping("lookup_field", "type=keyword", "field1", "type=text", "field2", "type=text") ); - client().prepareIndex("search_index") - .setId("1") + prepareIndex("search_index").setId("1") .setSource("field1", "value1", "search_field", List.of("value1", "value2", "value3")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("search_index") - .setId("2") + prepareIndex("search_index").setId("2") .setSource("field1", "value1", "field2", "value2", "search_field", List.of("value1", "value2")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("search_index") - .setId("3") + prepareIndex("search_index").setId("3") .setSource("field1", "value1", "field2", "value1", "search_field", "value1") .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("search_index") - .setId("4") - .setSource("field2", "value2", "search_field", "value1") - .setRefreshPolicy(IMMEDIATE) - .get(); - client().prepareIndex("search_index") - .setId("5") + prepareIndex("search_index").setId("4").setSource("field2", "value2", "search_field", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("search_index").setId("5") .setSource("field2", "value2", "search_field", List.of("value1", "value2")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("lookup_index") - .setId("1") + prepareIndex("lookup_index").setId("1") .setSource("field1", "value1", "field2", "value1", "lookup_field", List.of("value1", "value2")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("lookup_index") - .setId("2") + prepareIndex("lookup_index").setId("2") .setSource("field1", "value2", "field2", "value2", "lookup_field", List.of("value2")) .setRefreshPolicy(IMMEDIATE) .get(); @@ -732,9 +716,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { "type=text,term_vector=with_positions_offsets_payloads" ) ); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); boolean realtime = randomBoolean(); TermVectorsResponse response = client().filterWithHeader( @@ -795,9 +779,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { "type=text,term_vector=with_positions_offsets_payloads" ) ); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); boolean realtime = randomBoolean(); MultiTermVectorsResponse response = client().filterWithHeader( @@ -864,8 +848,8 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test").setSettings(indexSettings).setMapping(builder)); for (int i = 0; i < 5; i++) { - client().prepareIndex("test").setSource("field1", "value1", "other", "valueA", "vector", new float[] { i, i, i }).get(); - client().prepareIndex("test").setSource("field2", "value2", "other", "valueB", "vector", new float[] { i, i, i }).get(); + prepareIndex("test").setSource("field1", "value1", "other", "valueA", "vector", new float[] { i, i, i }).get(); + prepareIndex("test").setSource("field2", "value2", "other", "valueB", "vector", new float[] { i, i, i }).get(); } indicesAdmin().prepareRefresh("test").get(); @@ -917,9 +901,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("test") .setMapping("field1", "type=text", "field2", "type=text,fielddata=true", "field3", "type=text") ); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("3").setSource("field3", "value3").setRefreshPolicy(IMMEDIATE).get(); SearchResponse response = prepareSearch("test").addAggregation( AggregationBuilders.global("global").subAggregation(AggregationBuilders.terms("field2").field("field2")) @@ -997,7 +981,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { ensureGreen(); // index simple data - client().prepareIndex("test").setId("p1").setSource("join_field", "parent", "field1", "value1").get(); + prepareIndex("test").setId("p1").setSource("join_field", "parent", "field1", "value1").get(); Map source = new HashMap<>(); source.put("field2", "value2"); @@ -1006,14 +990,14 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { joinField.put("name", "child"); joinField.put("parent", "p1"); source.put("join_field", joinField); - client().prepareIndex("test").setId("c1").setSource(source).setRouting("p1").get(); + prepareIndex("test").setId("c1").setSource(source).setRouting("p1").get(); source.put("id", "c2"); - client().prepareIndex("test").setId("c2").setSource(source).setRouting("p1").get(); + prepareIndex("test").setId("c2").setSource(source).setRouting("p1").get(); source = new HashMap<>(); source.put("field3", "value3"); source.put("join_field", joinField); source.put("id", "c3"); - client().prepareIndex("test").setId("c3").setSource(source).setRouting("p1").get(); + prepareIndex("test").setId("c3").setSource(source).setRouting("p1").get(); refresh(); verifyParentChild(); } @@ -1087,12 +1071,12 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { final int numInVisible = scaledRandomIntBetween(2, 10); int id = 1; for (int i = 0; i < numVisible; i++) { - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field1", "value1").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field1", "value1").get(); } for (int i = 0; i < numInVisible; i++) { - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field2", "value2").get(); - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field3", "value3").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field2", "value2").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field3", "value3").get(); } refresh(); @@ -1138,12 +1122,12 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { final int numInvisible = scaledRandomIntBetween(2, 10); int id = 1; for (int i = 0; i < numVisible; i++) { - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field1", "value1").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field1", "value1").get(); } for (int i = 0; i < numInvisible; i++) { - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field2", "value2").get(); - client().prepareIndex("test").setId(String.valueOf(id++)).setSource("field3", "value3").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field2", "value2").get(); + prepareIndex("test").setId(String.valueOf(id++)).setSource("field3", "value3").get(); } refresh(); @@ -1176,9 +1160,9 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setSettings(Settings.builder().put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text") ); - client().prepareIndex("test").setId("1").setSource("field1", "value1").get(); - client().prepareIndex("test").setId("2").setSource("field2", "value2").get(); - client().prepareIndex("test").setId("3").setSource("field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1").get(); + prepareIndex("test").setId("2").setSource("field2", "value2").get(); + prepareIndex("test").setId("3").setSource("field3", "value3").get(); refresh(); int max = scaledRandomIntBetween(4, 32); @@ -1210,7 +1194,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { public void testUpdateApiIsBlocked() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1").setRefreshPolicy(IMMEDIATE).get(); // With document level security enabled the update is not allowed: try { @@ -1252,8 +1236,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { public void testNestedInnerHits() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "nested_field", "type=nested")); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -1268,8 +1251,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .endObject() ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("field1", "value2") @@ -1314,8 +1296,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=text", "suggest_field1", "type=text", "suggest_field2", "type=completion") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("field1", "value1") @@ -1327,8 +1308,7 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { ) .get(); // A document that is always included by role query of both roles: - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("field1", "value1").field("field2", "value2").endObject()) .get(); refresh("test"); @@ -1425,13 +1405,11 @@ public class DocumentLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=text", "other_field", "type=text") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("field1", "value1").field("other_field", "value").endObject()) .get(); // A document that is always included by role query of both roles: - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource(jsonBuilder().startObject().field("field1", "value1").field("field2", "value2").endObject()) .get(); refresh("test"); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityFeatureUsageTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityFeatureUsageTests.java index 415bcedb9d68..29ec9c809ebf 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityFeatureUsageTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityFeatureUsageTests.java @@ -73,8 +73,8 @@ public class FieldLevelSecurityFeatureUsageTests extends AbstractDocumentAndFiel public void testFlsFeatureUsageTracking() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("2").setSource("field1", "value2", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); assertHitCount( internalCluster().coordOnlyNodeClient() 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 f9bd893ea365..40672bf597b8 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 @@ -157,7 +157,7 @@ public class FieldLevelSecurityRandomTests extends SecurityIntegTestCase { doc.put(field, "value"); } assertAcked(indicesAdmin().prepareCreate("test").setMapping(fieldMappers)); - client().prepareIndex("test").setId("1").setSource(doc).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource(doc).setRefreshPolicy(IMMEDIATE).get(); for (String allowedField : allowedFields) { logger.info("Checking allowed field [{}]", allowedField); @@ -190,7 +190,7 @@ public class FieldLevelSecurityRandomTests extends SecurityIntegTestCase { for (int i = 1; i <= numDocs; i++) { String field = randomFrom("field1", "field2", "field3"); String value = "value"; - requests.add(client().prepareIndex("test").setId(value).setSource("id", Integer.toString(i), field, value)); + requests.add(prepareIndex("test").setId(value).setSource("id", Integer.toString(i), field, value)); } indexRandom(true, requests); 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 d5d48440c34e..9c79361704f2 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 @@ -229,8 +229,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("test") .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text", "alias", "type=alias,path=field1") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -415,8 +414,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { .endObject(); assertAcked(indicesAdmin().prepareCreate("test").setMapping(builder)); - client().prepareIndex("test") - .setSource("field1", "value1", "field2", "value2", "vector", new float[] { 0.0f, 0.0f, 0.0f }) + prepareIndex("test").setSource("field1", "value1", "field2", "value2", "vector", new float[] { 0.0f, 0.0f, 0.0f }) .setRefreshPolicy(IMMEDIATE) .get(); @@ -475,9 +473,9 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testPercolateQueryWithIndexedDocWithFLS() { assertAcked(indicesAdmin().prepareCreate("query_index").setMapping("query", "type=percolator", "field2", "type=text")); assertAcked(indicesAdmin().prepareCreate("doc_index").setMapping("field2", "type=text", "field1", "type=text")); - client().prepareIndex("query_index").setId("1").setSource(""" + prepareIndex("query_index").setId("1").setSource(""" {"query": {"match": {"field2": "bonsai tree"}}}""", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("doc_index").setId("1").setSource(""" + prepareIndex("doc_index").setId("1").setSource(""" {"field1": "value1", "field2": "A new bonsai tree in the office"}""", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); QueryBuilder percolateQuery = new PercolateQueryBuilder("query", "doc_index", "1", null, null, null); // user7 sees everything @@ -517,21 +515,21 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testGeoQueryWithIndexedShapeWithFLS() { assertAcked(indicesAdmin().prepareCreate("search_index").setMapping("field", "type=shape", "other", "type=shape")); assertAcked(indicesAdmin().prepareCreate("shape_index").setMapping("field", "type=shape", "other", "type=shape")); - client().prepareIndex("search_index").setId("1").setSource(""" + prepareIndex("search_index").setId("1").setSource(""" { "field": { "type": "point", "coordinates": [ 1, 1 ] } }""", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("search_index").setId("2").setSource(""" + prepareIndex("search_index").setId("2").setSource(""" { "other": { "type": "point", "coordinates": [ 1, 1 ] } }""", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("shape_index").setId("1").setSource(""" + prepareIndex("shape_index").setId("1").setSource(""" { "field": { "type": "envelope", @@ -548,7 +546,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { ] } }""", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("shape_index").setId("2").setSource(""" + prepareIndex("shape_index").setId("2").setSource(""" { "other": { "type": "envelope", @@ -617,19 +615,17 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testTermsLookupOnIndexWithFLS() { assertAcked(indicesAdmin().prepareCreate("search_index").setMapping("field", "type=keyword", "other", "type=text")); assertAcked(indicesAdmin().prepareCreate("lookup_index").setMapping("field", "type=keyword", "other", "type=text")); - client().prepareIndex("search_index").setId("1").setSource("field", List.of("value1", "value2")).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("search_index") - .setId("2") + prepareIndex("search_index").setId("1").setSource("field", List.of("value1", "value2")).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("search_index").setId("2") .setSource("field", "value1", "other", List.of("value1", "value2")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("search_index") - .setId("3") + prepareIndex("search_index").setId("3") .setSource("field", "value3", "other", List.of("value1", "value2")) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("lookup_index").setId("1").setSource("field", List.of("value1", "value2")).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex("lookup_index").setId("2").setSource("other", "value2", "field", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("lookup_index").setId("1").setSource("field", List.of("value1", "value2")).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("lookup_index").setId("2").setSource("other", "value2", "field", "value2").setRefreshPolicy(IMMEDIATE).get(); // user sees the terms doc field assertSearchHitsWithoutFailures( @@ -664,7 +660,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testGetApi() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); boolean realtime = randomBoolean(); // user1 is granted access to field1 only: @@ -762,7 +758,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { final boolean realtime = true; final boolean refresh = false; - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); // do a realtime get beforehand to flip an internal translog flag so that subsequent realtime gets are // served from the translog (this first one is NOT, it internally forces a refresh of the index) client().prepareGet("test", "1").setRealtime(realtime).setRefresh(refresh).get(); @@ -770,8 +766,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { // updates don't change the doc visibility for users // but updates populate the translog and the FLS filter must apply to the translog operations too if (randomBoolean()) { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(WriteRequest.RefreshPolicy.NONE) .get(); @@ -817,7 +812,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testMGetApi() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); boolean realtime = randomBoolean(); // user1 is granted access to field1 only: @@ -925,8 +920,8 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { assertAcked(indicesAdmin().prepareCreate("test1").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); assertAcked(indicesAdmin().prepareCreate("test2").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test1").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); - client().prepareIndex("test2").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); + prepareIndex("test1").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); + prepareIndex("test2").setId("1").setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); indicesAdmin().prepareRefresh("test1", "test2").get(); // user1 is granted access to field1 only @@ -1067,10 +1062,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { final int numDocs = scaledRandomIntBetween(2, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test") - .setId(String.valueOf(i)) - .setSource("field1", "value1", "field2", "value2", "field3", "value3") - .get(); + prepareIndex("test").setId(String.valueOf(i)).setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); } refresh("test"); @@ -1126,10 +1118,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { final int numDocs = scaledRandomIntBetween(2, 10); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test") - .setId(String.valueOf(i)) - .setSource("field1", "value1", "field2", "value2", "field3", "value3") - .get(); + prepareIndex("test").setId(String.valueOf(i)).setSource("field1", "value1", "field2", "value2", "field3", "value3").get(); } refresh("test"); @@ -1163,8 +1152,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { .setSettings(Settings.builder().put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true)) .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1203,7 +1191,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { final int numDocs = scaledRandomIntBetween(2, 4); for (int i = 0; i < numDocs; i++) { - client().prepareIndex("test").setId(String.valueOf(i)).setSource("field1", "value1", "field2", "value2").get(); + prepareIndex("test").setId(String.valueOf(i)).setSource("field1", "value1", "field2", "value2").get(); } refresh("test"); @@ -1304,7 +1292,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { .setSettings(Settings.builder().put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text") ); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); int max = scaledRandomIntBetween(4, 32); for (int i = 0; i < max; i++) { @@ -1345,8 +1333,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { "type=alias,path=field1" ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1453,8 +1440,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testSource() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text")); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1527,7 +1513,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { assertAcked( indicesAdmin().prepareCreate("test").setMapping("field1", "type=long", "field2", "type=long", "alias", "type=alias,path=field1") ); - client().prepareIndex("test").setId("1").setSource("field1", 1d, "field2", 2d).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", 1d, "field2", 2d).setRefreshPolicy(IMMEDIATE).get(); // user1 is granted to use field1, so it is included in the sort_values SearchResponse response = client().filterWithHeader( @@ -1576,8 +1562,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("test") .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text", "alias", "type=alias,path=field1") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1626,7 +1611,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { indicesAdmin().prepareCreate("test") .setMapping("field1", "type=text,fielddata=true", "field2", "type=text,fielddata=true", "alias", "type=alias,path=field1") ); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); // user1 is authorized to use field1, so buckets are include for a term agg on field1 SearchResponse response = client().filterWithHeader( @@ -1682,8 +1667,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { "type=text,term_vector=with_positions_offsets_payloads" ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1772,8 +1756,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { "type=text,term_vector=with_positions_offsets_payloads" ) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -1881,18 +1864,18 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { ensureGreen(); // index simple data - client().prepareIndex("test").setId("p1").setSource("join_field", "parent").get(); + prepareIndex("test").setId("p1").setSource("join_field", "parent").get(); Map source = new HashMap<>(); source.put("field1", "red"); Map joinField = new HashMap<>(); joinField.put("name", "child"); joinField.put("parent", "p1"); source.put("join_field", joinField); - client().prepareIndex("test").setId("c1").setSource(source).setRouting("p1").get(); + prepareIndex("test").setId("c1").setSource(source).setRouting("p1").get(); source = new HashMap<>(); source.put("field1", "yellow"); source.put("join_field", joinField); - client().prepareIndex("test").setId("c2").setSource(source).setRouting("p1").get(); + prepareIndex("test").setId("c2").setSource(source).setRouting("p1").get(); refresh(); verifyParentChild(); } @@ -1931,7 +1914,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testUpdateApiIsBlocked() throws Exception { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value1").setRefreshPolicy(IMMEDIATE).get(); // With field level security enabled the update is not allowed: try { @@ -1973,7 +1956,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { public void testQuery_withRoleWithFieldWildcards() { assertAcked(indicesAdmin().prepareCreate("test").setMapping("field1", "type=text", "field2", "type=text")); - client().prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test").setId("1").setSource("field1", "value1", "field2", "value2").setRefreshPolicy(IMMEDIATE).get(); // user6 has access to all fields, so the query should match with the document: SearchResponse response = client().filterWithHeader( @@ -2000,8 +1983,7 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=text", "field2", "type=text", "field3", "type=text", "alias", "type=alias,path=field1") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -2083,13 +2065,11 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { assertAcked( indicesAdmin().prepareCreate("hosts").setMapping("field1", "type=keyword", "field2", "type=text", "field3", "type=text") ); - client().prepareIndex("hosts") - .setId("1") + prepareIndex("hosts").setId("1") .setSource("field1", "192.168.1.1", "field2", "windows", "field3", "canada") .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("hosts") - .setId("2") + prepareIndex("hosts").setId("2") .setSource("field1", "192.168.1.2", "field2", "macos", "field3", "us") .setRefreshPolicy(IMMEDIATE) .get(); @@ -2099,13 +2079,11 @@ public class FieldLevelSecurityTests extends SecurityIntegTestCase { .setMapping("field1", "type=keyword", "field2", "type=text", "field3", "type=date,format=yyyy-MM-dd") ); - client().prepareIndex("logs") - .setId("1") + prepareIndex("logs").setId("1") .setSource("field1", "192.168.1.1", "field2", "out of memory", "field3", "2021-01-20") .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex("logs") - .setId("2") + prepareIndex("logs").setId("2") .setSource("field1", "192.168.1.2", "field2", "authentication fails", "field3", "2021-01-21") .setRefreshPolicy(IMMEDIATE) .get(); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java index d37e9a7f1aa3..0e799589409f 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/IndicesPermissionsWithAliasesWildcardsAndRegexsTests.java @@ -98,8 +98,7 @@ public class IndicesPermissionsWithAliasesWildcardsAndRegexsTests extends Securi .addAlias(new Alias("my_alias")) .addAlias(new Alias("an_alias")) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -130,8 +129,7 @@ public class IndicesPermissionsWithAliasesWildcardsAndRegexsTests extends Securi .addAlias(new Alias("my_alias")) .addAlias(new Alias("an_alias")) ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource("field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) .get(); @@ -197,8 +195,7 @@ public class IndicesPermissionsWithAliasesWildcardsAndRegexsTests extends Securi assertAcked(indicesAdmin().aliases(aliasesRequest).actionGet()); String value = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.formatMillis(System.currentTimeMillis()); - client().prepareIndex("test") - .setCreate(true) + prepareIndex("test").setCreate(true) .setId("1") .setSource(DEFAULT_TIMESTAMP_FIELD, value, "field1", "value1", "field2", "value2", "field3", "value3") .setRefreshPolicy(IMMEDIATE) 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 e2cce37789ff..841c109b13c9 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 @@ -63,7 +63,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { public void testFieldMappings() throws Exception { final String index = "logstash-20-12-2015"; final String field = "foo"; - indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); + indexRandom(true, prepareIndex(index).setSource(field, "bar")); GetFieldMappingsResponse response = indicesAdmin().prepareGetFieldMappings() .addIndices("logstash-*") @@ -85,7 +85,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { final String index = "logstash-20-12-2015"; final String type = "event"; final String field = "foo"; - indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); + indexRandom(true, prepareIndex(index).setSource(field, "bar")); ValidateQueryResponse response = indicesAdmin().prepareValidateQuery(index).setQuery(QueryBuilders.termQuery(field, "bar")).get(); assertThat(response.isValid(), is(true)); @@ -100,7 +100,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { final String index = "logstash-20-12-2015"; final String type = "event"; final String field = "foo"; - indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); + indexRandom(true, prepareIndex(index).setSource(field, "bar")); SearchResponse response = prepareSearch(index).setQuery(QueryBuilders.matchAllQuery()).get(); final long hits = response.getHits().getTotalHits().value; @@ -125,7 +125,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { final String index = "logstash-20-12-2015"; final String type = "event"; final String field = "foo"; - indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); + indexRandom(true, prepareIndex(index).setSource(field, "bar")); GetIndexResponse response = indicesAdmin().prepareGetIndex().setIndices(index).get(); assertThat(response.getIndices(), arrayContaining(index)); @@ -140,7 +140,7 @@ public class KibanaUserRoleIntegTests extends NativeRealmIntegTestCase { final String index = "logstash-20-12-2015"; final String type = "_doc"; final String field = "foo"; - indexRandom(true, client().prepareIndex().setIndex(index).setSource(field, "bar")); + indexRandom(true, prepareIndex(index).setSource(field, "bar")); GetMappingsResponse response = client().filterWithHeader( singletonMap("Authorization", UsernamePasswordToken.basicAuthHeaderValue("kibana_user", USERS_PASSWD)) diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java index c9f987b1981a..ee76db3943a9 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/MultipleIndicesPermissionsTests.java @@ -303,7 +303,7 @@ public class MultipleIndicesPermissionsTests extends SecurityIntegTestCase { .addAlias(new Alias("alias1").filter(QueryBuilders.termQuery("field1", "public"))) ); - client().prepareIndex("index1").setId("1").setSource("field1", "private").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("index1").setId("1").setSource("field1", "private").setRefreshPolicy(IMMEDIATE).get(); final Client userAClient = client().filterWithHeader( Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user_a", USERS_PASSWD)) 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 ca826be90477..e15aa506f1fe 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 @@ -68,9 +68,7 @@ public class SecurityClearScrollTests extends SecurityIntegTestCase { public void indexRandomDocuments() { BulkRequestBuilder bulkRequestBuilder = client().prepareBulk().setRefreshPolicy(IMMEDIATE); for (int i = 0; i < randomIntBetween(10, 50); i++) { - bulkRequestBuilder.add( - client().prepareIndex("index").setId(String.valueOf(i)).setSource("{ \"foo\" : \"bar\" }", XContentType.JSON) - ); + bulkRequestBuilder.add(prepareIndex("index").setId(String.valueOf(i)).setSource("{ \"foo\" : \"bar\" }", XContentType.JSON)); } BulkResponse bulkItemResponses = bulkRequestBuilder.get(); assertThat(bulkItemResponses.hasFailures(), is(false)); 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 c3016a810c27..e5a1ff867302 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 @@ -31,7 +31,7 @@ public class ShrinkIndexWithSecurityTests extends SecurityIntegTestCase { public void testShrinkIndex() throws Exception { final int randomNumberOfDocs = scaledRandomIntBetween(2, 12); for (int i = 0; i < randomNumberOfDocs; i++) { - client().prepareIndex("bigindex").setSource("foo", "bar").get(); + prepareIndex("bigindex").setSource("foo", "bar").get(); } Map dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes(); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java index d3229b390fc8..cb07cd76a5fa 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authc/esnative/NativeRealmIntegTests.java @@ -316,7 +316,7 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { createIndex("idx"); ensureGreen("idx"); // Index a document with the default test user - client().prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); String token = basicAuthHeaderValue(username, new SecureString("s3krit-password")); SearchResponse searchResp = client().filterWithHeader(Collections.singletonMap("Authorization", token)).prepareSearch("idx").get(); @@ -339,7 +339,7 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { createIndex("idx"); ensureGreen("idx"); // Index a document with the default test user - client().prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); String token = basicAuthHeaderValue("joe", new SecureString("s3krit-password")); SearchResponse searchResp = client().filterWithHeader(Collections.singletonMap("Authorization", token)).prepareSearch("idx").get(); @@ -373,7 +373,7 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { createIndex("idx"); ensureGreen("idx"); // Index a document with the default test user - client().prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("idx").setId("1").setSource("body", "foo").setRefreshPolicy(IMMEDIATE).get(); String token = basicAuthHeaderValue("joe", new SecureString("s3krit-password")); SearchResponse searchResp = client().filterWithHeader(Collections.singletonMap("Authorization", token)).prepareSearch("idx").get(); @@ -684,7 +684,7 @@ public class NativeRealmIntegTests extends NativeRealmIntegTestCase { } public void testUsersAndRolesDoNotInterfereWithIndicesStats() throws Exception { - client().prepareIndex("foo").setSource("ignore", "me").get(); + prepareIndex("foo").setSource("ignore", "me").get(); if (randomBoolean()) { preparePutUser("joe", "s3krit-password", hasher, SecuritySettingsSource.TEST_ROLE).get(); 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 57137075c594..c5da26deaf03 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 @@ -42,7 +42,7 @@ public class SecurityScrollTests extends SecurityIntegTestCase { final int numDocs = randomIntBetween(4, 16); IndexRequestBuilder[] docs = new IndexRequestBuilder[numDocs]; for (int i = 0; i < docs.length; i++) { - docs[i] = client().prepareIndex("foo").setSource("doc", i); + docs[i] = prepareIndex("foo").setSource("doc", i); } indexRandom(true, docs); @@ -74,7 +74,7 @@ public class SecurityScrollTests extends SecurityIntegTestCase { public void testSearchAndClearScroll() throws Exception { IndexRequestBuilder[] docs = new IndexRequestBuilder[randomIntBetween(20, 100)]; for (int i = 0; i < docs.length; i++) { - docs[i] = client().prepareIndex("idx").setSource("field", "value"); + docs[i] = prepareIndex("idx").setSource("field", "value"); } indexRandom(true, docs); SearchResponse response = prepareSearch().setQuery(matchAllQuery()) diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/WriteActionsTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/WriteActionsTests.java index c55e5b409279..8cd85297377c 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/WriteActionsTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/WriteActionsTests.java @@ -51,17 +51,17 @@ public class WriteActionsTests extends SecurityIntegTestCase { public void testIndex() { createIndex("test1", "index1"); - client().prepareIndex("test1").setId("id").setSource("field", "value").get(); + prepareIndex("test1").setId("id").setSource("field", "value").get(); assertThrowsAuthorizationExceptionDefaultUsers( - client().prepareIndex("index1").setId("id").setSource("field", "value")::get, + prepareIndex("index1").setId("id").setSource("field", "value")::get, BulkAction.NAME + "[s]" ); - client().prepareIndex("test4").setId("id").setSource("field", "value").get(); + prepareIndex("test4").setId("id").setSource("field", "value").get(); // the missing index gets automatically created (user has permissions for that), but indexing fails due to missing authorization assertThrowsAuthorizationExceptionDefaultUsers( - client().prepareIndex("missing").setId("id").setSource("field", "value")::get, + prepareIndex("missing").setId("id").setSource("field", "value")::get, BulkAction.NAME + "[s]" ); ensureGreen(); @@ -69,7 +69,7 @@ public class WriteActionsTests extends SecurityIntegTestCase { public void testDelete() { createIndex("test1", "index1"); - client().prepareIndex("test1").setId("id").setSource("field", "value").get(); + prepareIndex("test1").setId("id").setSource("field", "value").get(); assertEquals(RestStatus.OK, client().prepareDelete("test1", "id").get().status()); assertThrowsAuthorizationExceptionDefaultUsers(client().prepareDelete("index1", "id")::get, BulkAction.NAME + "[s]"); @@ -80,7 +80,7 @@ public class WriteActionsTests extends SecurityIntegTestCase { public void testUpdate() { createIndex("test1", "index1"); - client().prepareIndex("test1").setId("id").setSource("field", "value").get(); + prepareIndex("test1").setId("id").setSource("field", "value").get(); assertEquals( RestStatus.OK, client().prepareUpdate("test1", "id").setDoc(Requests.INDEX_CONTENT_TYPE, "field2", "value2").get().status() diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileDomainIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileDomainIntegTests.java index 9c271a50fe49..22cf6d487290 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileDomainIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileDomainIntegTests.java @@ -452,8 +452,7 @@ public class ProfileDomainIntegTests extends AbstractProfileIntegTestCase { List.of("role1", "role2"), Instant.now().toEpochMilli() ); - client().prepareIndex(randomFrom(INTERNAL_SECURITY_PROFILE_INDEX_8, SECURITY_PROFILE_ALIAS)) - .setId("profile_" + uid) + prepareIndex(randomFrom(INTERNAL_SECURITY_PROFILE_INDEX_8, SECURITY_PROFILE_ALIAS)).setId("profile_" + uid) .setRefreshPolicy(WriteRequest.RefreshPolicy.WAIT_UNTIL) .setSource(source, XContentType.JSON) .get(); diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileIntegTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileIntegTests.java index 2b727060a43e..f2268a76221e 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileIntegTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/profile/ProfileIntegTests.java @@ -119,9 +119,9 @@ public class ProfileIntegTests extends AbstractProfileIntegTestCase { assertThat(getProfileIndexResponse().getIndices(), not(hasItemInArray(INTERNAL_SECURITY_PROFILE_INDEX_8))); // Trigger index creation by indexing - var indexResponse = client().prepareIndex(randomFrom(INTERNAL_SECURITY_PROFILE_INDEX_8, SECURITY_PROFILE_ALIAS)) - .setSource(Map.of("user_profile", Map.of("uid", randomAlphaOfLength(22)))) - .get(); + var indexResponse = prepareIndex(randomFrom(INTERNAL_SECURITY_PROFILE_INDEX_8, SECURITY_PROFILE_ALIAS)).setSource( + Map.of("user_profile", Map.of("uid", randomAlphaOfLength(22))) + ).get(); assertThat(indexResponse.status().getStatus(), equalTo(201)); final GetIndexResponse getIndexResponse = getProfileIndexResponse(); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java index 4e6ea34d3dc9..1ed371229d07 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/test/SecurityIntegTestCase.java @@ -362,7 +362,7 @@ public abstract class SecurityIntegTestCase extends ESIntegTestCase { } for (String index : indices) { - client().prepareIndex(index).setSource("field", "value").get(); + prepareIndex(index).setSource("field", "value").get(); } refresh(indices); } diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java index 649e97e660e5..8b272215928d 100644 --- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java +++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownDelayedAllocationIT.java @@ -213,7 +213,7 @@ public class NodeShutdownDelayedAllocationIT extends ESIntegTestCase { int numDocs = scaledRandomIntBetween(100, 1000); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex("test").setSource("field", "value"); + builders[i] = prepareIndex("test").setSource("field", "value"); } indexRandom(true, builders); } diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java index 4e2b1bd6c5a5..684100b45a74 100644 --- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java +++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java @@ -425,7 +425,7 @@ public class NodeShutdownShardsIT extends ESIntegTestCase { int numDocs = scaledRandomIntBetween(100, 1000); IndexRequestBuilder[] builders = new IndexRequestBuilder[numDocs]; for (int i = 0; i < builders.length; i++) { - builders[i] = client().prepareIndex(index).setSource("field", "value"); + builders[i] = prepareIndex(index).setSource("field", "value"); } indexRandom(true, builders); } 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 678612e2a1ed..4670f0fd0b9b 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 @@ -1574,9 +1574,7 @@ public class SnapshotBasedIndexRecoveryIT extends AbstractSnapshotIntegTestCase IndexRequestBuilder[] builders = new IndexRequestBuilder[docCount]; for (int i = 0; i < builders.length; i++) { int docId = i + docIdOffset; - builders[i] = client().prepareIndex(indexName) - .setId(Integer.toString(docId)) - .setSource("field", docId, "field2", "Some text " + docId); + builders[i] = prepareIndex(indexName).setId(Integer.toString(docId)).setSource("field", docId, "field2", "Some text " + docId); } indexRandom(true, builders); diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/SpatialDiskUsageIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/SpatialDiskUsageIT.java index 07b1c48a540b..43c72642c84a 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/SpatialDiskUsageIT.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/SpatialDiskUsageIT.java @@ -86,7 +86,7 @@ public class SpatialDiskUsageIT extends ESIntegTestCase { .field("coordinates", new double[] { GeoTestUtil.nextLatitude(), GeoTestUtil.nextLongitude() }) .endObject() .endObject(); - client().prepareIndex(index).setId("id-" + i).setSource(doc).get(); + prepareIndex(index).setId("id-" + i).setSource(doc).get(); } AnalyzeIndexDiskUsageResponse resp = client().execute( AnalyzeIndexDiskUsageAction.INSTANCE, diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeScriptDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeScriptDocValuesIT.java index 57e654fc0901..aa7860aac1a4 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeScriptDocValuesIT.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeScriptDocValuesIT.java @@ -249,8 +249,7 @@ public class GeoShapeScriptDocValuesIT extends ESSingleNodeTestCase { private void doTestGeometry(Geometry geometry, GeoShapeValues.GeoShapeValue expectedLabelPosition, boolean fallbackToCentroid) throws IOException { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject().field("name", "TestPosition").field("location", WellKnownText.toWKT(geometry)).endObject() ) @@ -309,8 +308,7 @@ public class GeoShapeScriptDocValuesIT extends ESSingleNodeTestCase { } public void testNullShape() throws Exception { - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource(jsonBuilder().startObject().field("name", "TestPosition").nullField("location").endObject()) .get(); diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java index e354feb60c95..b4a3a07502ab 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 @@ -110,8 +110,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { indicesAdmin().prepareCreate("test").setMapping("id", "type=keyword", "field1", "type=geo_shape", "query", "type=percolator") ); - client().prepareIndex("test") - .setId("1") + prepareIndex("test").setId("1") .setSource( jsonBuilder().startObject() .field("query", geoDistanceQuery("field1").point(52.18, 4.38).distance(50, DistanceUnit.KILOMETERS)) @@ -120,8 +119,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("2") + prepareIndex("test").setId("2") .setSource( jsonBuilder().startObject() .field("query", geoBoundingBoxQuery("field1").setCorners(52.3, 4.4, 52.1, 4.6)) @@ -130,8 +128,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { ) .get(); - client().prepareIndex("test") - .setId("3") + prepareIndex("test").setId("3") .setSource( jsonBuilder().startObject() .field( @@ -175,7 +172,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { "shape": "POLYGON((179 0, -179 0, -179 2, 179 2, 179 0))" }"""; - indexRandom(true, client().prepareIndex("test").setId("0").setSource(source, XContentType.JSON)); + indexRandom(true, prepareIndex("test").setId("0").setSource(source, XContentType.JSON)); assertNoFailuresAndResponse(client().prepareSearch("test").setFetchSource(false).addStoredField("shape"), response -> { assertThat(response.getHits().getTotalHits().value, equalTo(1L)); 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 562f2fd681d9..3cf70b1d477b 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 @@ -87,7 +87,7 @@ public class LegacyGeoShapeWithDocValuesIT extends GeoShapeIntegTestCase { ); ensureGreen(); - indexRandom(true, client().prepareIndex("test").setId("0").setSource("shape", (ToXContent) (builder, params) -> { + indexRandom(true, prepareIndex("test").setId("0").setSource("shape", (ToXContent) (builder, params) -> { builder.startObject() .field("type", "circle") .startArray("coordinates") diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryOverShapeTests.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryOverShapeTests.java index b2ace1c57fe9..5e4b778d6c09 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryOverShapeTests.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryOverShapeTests.java @@ -91,8 +91,8 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { .endObject(); try { - client().prepareIndex(INDEX).setSource(geoJson).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex(IGNORE_MALFORMED_INDEX).setRefreshPolicy(IMMEDIATE).setSource(geoJson).get(); + prepareIndex(INDEX).setSource(geoJson).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(IGNORE_MALFORMED_INDEX).setRefreshPolicy(IMMEDIATE).setSource(geoJson).get(); } catch (Exception e) { // sometimes GeoTestUtil will create invalid geometry; catch and continue: if (queryGeometry == geometry) { @@ -107,8 +107,7 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { public void testIndexedShapeReferenceSourceDisabled() throws Exception { Rectangle rectangle = new Rectangle(-45, 45, 45, -45); - client().prepareIndex(IGNORE_MALFORMED_INDEX) - .setId("Big_Rectangle") + prepareIndex(IGNORE_MALFORMED_INDEX).setId("Big_Rectangle") .setSource(jsonBuilder().startObject().field(FIELD, WellKnownText.toWKT(rectangle)).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -131,11 +130,10 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { String location = """ "location" : {"type":"polygon", "coordinates":[[[-10,-10],[10,-10],[10,10],[-10,10],[-10,-10]]]}"""; - client().prepareIndex(indexName).setId("1").setSource(Strings.format(""" + prepareIndex(indexName).setId("1").setSource(Strings.format(""" { %s, "1" : { %s, "2" : { %s, "3" : { %s } }} } """, location, location, location, location), XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); - client().prepareIndex(searchIndex) - .setId("1") + prepareIndex(searchIndex).setId("1") .setSource( jsonBuilder().startObject() .startObject("location") @@ -218,7 +216,7 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { } }""", args); - client().prepareIndex(INDEX).setId("0").setSource(source, XContentType.JSON).setRouting("ABC").get(); + prepareIndex(INDEX).setId("0").setSource(source, XContentType.JSON).setRouting("ABC").get(); indicesAdmin().prepareRefresh(INDEX).get(); assertHitCount( @@ -229,13 +227,8 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { public void testNullShape() { // index a null shape - client().prepareIndex(INDEX) - .setId("aNullshape") - .setSource("{\"" + FIELD + "\": null}", XContentType.JSON) - .setRefreshPolicy(IMMEDIATE) - .get(); - client().prepareIndex(IGNORE_MALFORMED_INDEX) - .setId("aNullshape") + prepareIndex(INDEX).setId("aNullshape").setSource("{\"" + FIELD + "\": null}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(IGNORE_MALFORMED_INDEX).setId("aNullshape") .setSource("{\"" + FIELD + "\": null}", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) .get(); @@ -263,7 +256,7 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase { String doc = """ {"location" : {"type":"envelope", "coordinates":[ [-100.0, 100.0], [100.0, -100.0]]}}"""; - client().prepareIndex("test_contains").setId("1").setSource(doc, XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex("test_contains").setId("1").setSource(doc, XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); // index the mbr of the collection Rectangle rectangle = new Rectangle(-50, 50, 50, -50); diff --git a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryTestCase.java b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryTestCase.java index e4671e1d28e2..38d0a30b593b 100644 --- a/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryTestCase.java +++ b/x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryTestCase.java @@ -56,8 +56,7 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("aNullshape") + prepareIndex(defaultIndexName).setId("aNullshape") .setSource("{\"geo\": null}", XContentType.JSON) .setRefreshPolicy(IMMEDIATE) .get(); @@ -70,14 +69,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(jsonBuilder().startObject().field("name", "Document 1").field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("2") + prepareIndex(defaultIndexName).setId("2") .setSource(jsonBuilder().startObject().field("name", "Document 2").field(defaultFieldName, "POINT(-45 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -111,14 +108,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(jsonBuilder().startObject().field("name", "Document 1").field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("2") + prepareIndex(defaultIndexName).setId("2") .setSource(jsonBuilder().startObject().field("name", "Document 2").field(defaultFieldName, "POINT(-45 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -141,14 +136,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(jsonBuilder().startObject().field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("2") + prepareIndex(defaultIndexName).setId("2") .setSource(jsonBuilder().startObject().field(defaultFieldName, "POINT(-45 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -171,20 +164,17 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(jsonBuilder().startObject().field("name", "Document 1").field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("2") + prepareIndex(defaultIndexName).setId("2") .setSource(jsonBuilder().startObject().field("name", "Document 2").field(defaultFieldName, "POINT(-40 -40)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("3") + prepareIndex(defaultIndexName).setId("3") .setSource(jsonBuilder().startObject().field("name", "Document 3").field(defaultFieldName, "POINT(-50 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -215,14 +205,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(jsonBuilder().startObject().field("name", "Document 1").field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("2") + prepareIndex(defaultIndexName).setId("2") .setSource(jsonBuilder().startObject().field("name", "Document 2").field(defaultFieldName, "POINT(-45 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -245,14 +233,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(defaultIndexName).setMapping(mapping).get(); ensureGreen(); - client().prepareIndex(defaultIndexName) - .setId("point1") + prepareIndex(defaultIndexName).setId("point1") .setSource(jsonBuilder().startObject().field(defaultFieldName, "POINT(-30 -30)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(defaultIndexName) - .setId("point2") + prepareIndex(defaultIndexName).setId("point2") .setSource(jsonBuilder().startObject().field(defaultFieldName, "POINT(-45 -50)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -272,14 +258,12 @@ public abstract class ShapeQueryTestCase extends ESSingleNodeTestCase { indicesAdmin().prepareCreate(indexedShapeIndex).setMapping(queryShapesMapping).get(); ensureGreen(); - client().prepareIndex(indexedShapeIndex) - .setId("shape1") + prepareIndex(indexedShapeIndex).setId("shape1") .setSource(jsonBuilder().startObject().field(indexedShapePath, "BBOX(-50, -40, -45, -55)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); - client().prepareIndex(indexedShapeIndex) - .setId("shape2") + prepareIndex(indexedShapeIndex).setId("shape2") .setSource(jsonBuilder().startObject().field(indexedShapePath, "BBOX(-60, -50, -50, -60)").endObject()) .setRefreshPolicy(IMMEDIATE) .get(); 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 04f260fa1f1c..d68ff54e089a 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 @@ -58,9 +58,7 @@ public class SpatialQueryStringIT extends ESIntegTestCase { public void testBasicAllQuery() throws Exception { List reqs = new ArrayList<>(); - reqs.add( - client().prepareIndex("test").setId("1").setSource("geo_shape", "POINT(0 0)", "shape", "POINT(0 0)", "point", "POINT(0 0)") - ); + reqs.add(prepareIndex("test").setId("1").setSource("geo_shape", "POINT(0 0)", "shape", "POINT(0 0)", "point", "POINT(0 0)")); // nothing matches indexRandom(true, false, reqs); assertHitCount(prepareSearch("test").setQuery(queryStringQuery("foo")), 0L); diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java index f560c8591ac5..2bf77726870c 100644 --- a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java +++ b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/index/query/LegacyGeoShapeWithDocValuesQueryTests.java @@ -116,16 +116,14 @@ public class LegacyGeoShapeWithDocValuesQueryTests extends GeoShapeQueryTestCase // MULTIPOINT MultiPoint multiPoint = GeometryTestUtils.randomMultiPoint(false); - client().prepareIndex("geo_points_only") - .setId("1") + prepareIndex("geo_points_only").setId("1") .setSource(GeoJson.toXContent(multiPoint, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); // POINT Point point = GeometryTestUtils.randomPoint(false); - client().prepareIndex("geo_points_only") - .setId("2") + prepareIndex("geo_points_only").setId("2") .setSource(GeoJson.toXContent(point, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -169,8 +167,7 @@ public class LegacyGeoShapeWithDocValuesQueryTests extends GeoShapeQueryTestCase Geometry geometry = GeometryTestUtils.randomGeometry(false); try { - client().prepareIndex("geo_points_only") - .setId("1") + prepareIndex("geo_points_only").setId("1") .setSource(GeoJson.toXContent(geometry, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); @@ -216,8 +213,7 @@ public class LegacyGeoShapeWithDocValuesQueryTests extends GeoShapeQueryTestCase ensureGreen(); MultiPoint multiPoint = GeometryTestUtils.randomMultiPoint(false); - client().prepareIndex(defaultIndexName) - .setId("1") + prepareIndex(defaultIndexName).setId("1") .setSource(GeoJson.toXContent(multiPoint, jsonBuilder().startObject().field(defaultFieldName), null).endObject()) .setRefreshPolicy(IMMEDIATE) .get(); diff --git a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/AsyncSqlSearchActionIT.java b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/AsyncSqlSearchActionIT.java index 7bffa67fe2a5..4863f973f163 100644 --- a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/AsyncSqlSearchActionIT.java +++ b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/AsyncSqlSearchActionIT.java @@ -91,15 +91,14 @@ public class AsyncSqlSearchActionIT extends AbstractSqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .field("i", i) - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .field("i", i) + .endObject() + ) ); } indexRandom(true, builders); diff --git a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/RestSqlCancellationIT.java b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/RestSqlCancellationIT.java index 48ee5b05ffe0..a72612c0d669 100644 --- a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/RestSqlCancellationIT.java +++ b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/RestSqlCancellationIT.java @@ -84,14 +84,13 @@ public class RestSqlCancellationIT extends AbstractSqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .endObject() + ) ); } diff --git a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlCancellationIT.java b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlCancellationIT.java index aba659de5387..f23d9de1c79e 100644 --- a/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlCancellationIT.java +++ b/x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlCancellationIT.java @@ -50,14 +50,13 @@ public class SqlCancellationIT extends AbstractSqlBlockingIntegTestCase { for (int i = 0; i < numDocs; i++) { int fieldValue = randomIntBetween(0, 10); builders.add( - client().prepareIndex("test") - .setSource( - jsonBuilder().startObject() - .field("val", fieldValue) - .field("event_type", "my_event") - .field("@timestamp", "2020-04-09T12:35:48Z") - .endObject() - ) + prepareIndex("test").setSource( + jsonBuilder().startObject() + .field("val", fieldValue) + .field("event_type", "my_event") + .field("@timestamp", "2020-04-09T12:35:48Z") + .endObject() + ) ); } diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java index 82a3ea85bfe6..b952869a34d8 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java @@ -65,7 +65,7 @@ public class TransformGetCheckpointIT extends TransformSingleNodeTestCase { for (int d = 0; d < docsToCreatePerShard; ++d) { for (int i = 0; i < indices; ++i) { for (int j = 0; j < shards; ++j) { - client().prepareIndex(indexNamePrefix + i).setSource("{" + "\"field\":" + j + "}", XContentType.JSON).get(); + prepareIndex(indexNamePrefix + i).setSource("{" + "\"field\":" + j + "}", XContentType.JSON).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 0e7dd6424ec7..92d18dcbbdf1 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 @@ -153,7 +153,7 @@ public class EmailAttachmentTests extends AbstractWatcherIntegrationTestCase { createIndex("idx"); // Have a sample document in the index, the watch is going to evaluate - client().prepareIndex("idx").setSource("field", "value").get(); + prepareIndex("idx").setSource("field", "value").get(); refresh(); List attachments = new ArrayList<>(); 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 85e79d96b14d..9cf2702d4404 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 @@ -38,8 +38,8 @@ public class ArrayCompareConditionSearchTests extends AbstractWatcherIntegration int numberOfDocuments = randomIntBetween(1, 100); int numberOfDocumentsWatchingFor = 1 + numberOfDocuments; for (int i = 0; i < numberOfDocuments; i++) { - client().prepareIndex(index).setSource(source("elastic", "you know, for search", i)).get(); - client().prepareIndex(index).setSource(source("fights_for_the_users", "you know, for the users", i)).get(); + prepareIndex(index).setSource(source("elastic", "you know, for search", i)).get(); + prepareIndex(index).setSource(source("fights_for_the_users", "you know, for the users", i)).get(); } refresh(); @@ -89,7 +89,7 @@ public class ArrayCompareConditionSearchTests extends AbstractWatcherIntegration } ); - client().prepareIndex(index).setSource(source("fights_for_the_users", "you know, for the users", numberOfDocuments)).get(); + prepareIndex(index).setSource(source("fights_for_the_users", "you know, for the users", numberOfDocuments)).get(); refresh(); assertResponse( 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 a117f59212fb..dbb7b7d93c2e 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 @@ -36,10 +36,10 @@ import static org.mockito.Mockito.when; public class CompareConditionSearchTests extends AbstractWatcherIntegrationTestCase { public void testExecuteWithAggs() { - client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:00").get(); - client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:10").get(); - client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:20").get(); - client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:30").get(); + prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:00").get(); + prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:10").get(); + prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:20").get(); + prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:30").get(); refresh(); CompareCondition condition = new CompareCondition( @@ -72,7 +72,7 @@ public class CompareConditionSearchTests extends AbstractWatcherIntegrationTestC } ); - client().prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:40").get(); + prepareIndex("my-index").setSource("@timestamp", "2005-01-01T00:40").get(); refresh(); assertResponse( diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java index a0255616e8f7..6efcbd87f0b3 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/history/HistoryTemplateTransformMappingsTests.java @@ -47,15 +47,10 @@ public class HistoryTemplateTransformMappingsTests extends AbstractWatcherIntegr client().prepareBulk() .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .add( - client().prepareIndex() - .setIndex("idx") - .setId("1") - .setSource(jsonBuilder().startObject().field("name", "first").field("foo", "bar").endObject()) + prepareIndex("idx").setId("1").setSource(jsonBuilder().startObject().field("name", "first").field("foo", "bar").endObject()) ) .add( - client().prepareIndex() - .setIndex("idx") - .setId("2") + prepareIndex("idx").setId("2") .setSource( jsonBuilder().startObject().field("name", "second").startObject("foo").field("what", "ever").endObject().endObject() ) 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 041c03af0af3..c9d40a7f9272 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 @@ -55,7 +55,7 @@ public class ChainIntegrationTests extends AbstractWatcherIntegrationTestCase { public void testChainedInputsAreWorking() throws Exception { String index = "the-most-awesome-index-ever"; createIndex(index); - client().prepareIndex().setIndex(index).setId("id").setSource("{}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); + prepareIndex(index).setId("id").setSource("{}", XContentType.JSON).setRefreshPolicy(IMMEDIATE).get(); InetSocketAddress address = internalCluster().httpAddresses()[0]; HttpInput.Builder httpInputBuilder = httpInput( 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 c6d9d9eab452..c8dd4d42ac4a 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 @@ -75,7 +75,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { public void testIndexWatch() throws Exception { createIndex("idx"); // Have a sample document in the index, the watch is going to evaluate - client().prepareIndex("idx").setSource("field", "foo").get(); + prepareIndex("idx").setSource("field", "foo").get(); refresh(); WatcherSearchTemplateRequest request = templateRequest(searchSource().query(termQuery("field", "foo")), "idx"); new PutWatchRequestBuilder(client()).setId("_name") @@ -109,7 +109,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { assertWatchWithNoActionNeeded("_name", 1); // Index sample doc after we register the watch and the watch's condition should meet - client().prepareIndex("idx").setSource("field", "value").get(); + prepareIndex("idx").setSource("field", "value").get(); refresh(); timeWarp().clock().fastForwardSeconds(5); @@ -145,7 +145,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { public void testMalformedWatch() throws Exception { createIndex("idx"); // Have a sample document in the index, the watch is going to evaluate - client().prepareIndex("idx").setSource("field", "value").get(); + prepareIndex("idx").setSource("field", "value").get(); XContentBuilder watchSource = jsonBuilder(); watchSource.startObject(); @@ -166,7 +166,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { // In watch store we fail parsing if an watch contains undefined fields. } try { - client().prepareIndex().setIndex(Watch.INDEX).setId("_name").setSource(watchSource).get(); + prepareIndex(Watch.INDEX).setId("_name").setSource(watchSource).get(); fail(); } catch (Exception e) { // The watch index template the mapping is defined as strict @@ -251,7 +251,7 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { public void testInputFiltering() throws Exception { createIndex("idx"); // Have a sample document in the index, the watch is going to evaluate - client().prepareIndex("idx").setSource(jsonBuilder().startObject().field("field", "foovalue").endObject()).get(); + prepareIndex("idx").setSource(jsonBuilder().startObject().field("field", "foovalue").endObject()).get(); refresh(); WatcherSearchTemplateRequest request = templateRequest(searchSource().query(termQuery("field", "foovalue")), "idx"); new PutWatchRequestBuilder(client()).setId("_name1") @@ -385,21 +385,21 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase { logger.info("created watch [{}] at [{}]", watchName, ZonedDateTime.now(Clock.systemUTC())); - client().prepareIndex("events").setSource("level", "a").get(); - client().prepareIndex("events").setSource("level", "a").get(); + prepareIndex("events").setSource("level", "a").get(); + prepareIndex("events").setSource("level", "a").get(); refresh(); timeWarp().clock().fastForwardSeconds(1); timeWarp().trigger(watchName); assertWatchWithNoActionNeeded(watchName, 1); - client().prepareIndex("events").setSource("level", "b").get(); + prepareIndex("events").setSource("level", "b").get(); refresh(); timeWarp().clock().fastForwardSeconds(1); timeWarp().trigger(watchName); assertWatchWithNoActionNeeded(watchName, 2); - client().prepareIndex("events").setSource("level", "a").get(); + prepareIndex("events").setSource("level", "a").get(); refresh(); timeWarp().clock().fastForwardSeconds(1); timeWarp().trigger(watchName); 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 a200fccfa928..99640d1ebc3e 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 @@ -66,9 +66,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { } public void testLoadMalformedWatchRecord() throws Exception { - client().prepareIndex() - .setIndex(Watch.INDEX) - .setId("_id") + prepareIndex(Watch.INDEX).setId("_id") .setSource( jsonBuilder().startObject() .startObject(WatchField.TRIGGER.getPreferredName()) @@ -87,9 +85,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { Wid wid = new Wid("_id", now); ScheduleTriggerEvent event = new ScheduleTriggerEvent("_id", now, now); ExecutableCondition condition = InternalAlwaysCondition.INSTANCE; - client().prepareIndex() - .setIndex(HistoryStoreField.DATA_STREAM) - .setId(wid.value()) + prepareIndex(HistoryStoreField.DATA_STREAM).setId(wid.value()) .setOpType(DocWriteRequest.OpType.CREATE) .setSource( jsonBuilder().startObject() @@ -112,9 +108,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { // unknown condition: wid = new Wid("_id", now); - client().prepareIndex() - .setIndex(HistoryStoreField.DATA_STREAM) - .setId(wid.value()) + prepareIndex(HistoryStoreField.DATA_STREAM).setId(wid.value()) .setOpType(DocWriteRequest.OpType.CREATE) .setSource( jsonBuilder().startObject() @@ -138,9 +132,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { // unknown trigger: wid = new Wid("_id", now); - client().prepareIndex() - .setIndex(HistoryStoreField.DATA_STREAM) - .setId(wid.value()) + prepareIndex(HistoryStoreField.DATA_STREAM).setId(wid.value()) .setOpType(DocWriteRequest.OpType.CREATE) .setSource( jsonBuilder().startObject() @@ -180,9 +172,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { BulkRequestBuilder bulkRequestBuilder = client().prepareBulk(); for (int i = 0; i < numWatches; i++) { bulkRequestBuilder.add( - client().prepareIndex() - .setIndex(Watch.INDEX) - .setId("_id" + i) + prepareIndex(Watch.INDEX).setId("_id" + i) .setSource( watchBuilder().trigger(schedule(cron("0 0/5 * * * ? 2050"))) .input(searchInput(request)) @@ -206,12 +196,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { public void testMixedTriggeredWatchLoading() throws Exception { createIndex("output"); - client().prepareIndex() - .setIndex("my-index") - .setId("bar") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .setSource("field", "value") - .get(); + prepareIndex("my-index").setId("bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).setSource("field", "value").get(); WatcherStatsResponse response = new WatcherStatsRequestBuilder(client()).get(); assertThat(response.getWatchesCount(), equalTo(0L)); @@ -245,9 +230,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { Wid wid = new Wid(watchId, now); TriggeredWatch triggeredWatch = new TriggeredWatch(wid, event); bulkRequestBuilder.add( - client().prepareIndex() - .setIndex(TriggeredWatchStoreField.INDEX_NAME) - .setId(triggeredWatch.id().value()) + prepareIndex(TriggeredWatchStoreField.INDEX_NAME).setId(triggeredWatch.id().value()) .setSource(jsonBuilder().value(triggeredWatch)) .request() ); @@ -262,12 +245,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { public void testTriggeredWatchLoading() throws Exception { cluster().wipeIndices(TriggeredWatchStoreField.INDEX_NAME); createIndex("output"); - client().prepareIndex() - .setIndex("my-index") - .setId("bar") - .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) - .setSource("field", "value") - .get(); + prepareIndex("my-index").setId("bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).setSource("field", "value").get(); WatcherStatsResponse response = new WatcherStatsRequestBuilder(client()).get(); assertThat(response.getWatchesCount(), equalTo(0L)); @@ -295,9 +273,7 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { Wid wid = new Wid(watchId, now); TriggeredWatch triggeredWatch = new TriggeredWatch(wid, event); bulkRequestBuilder.add( - client().prepareIndex() - .setIndex(TriggeredWatchStoreField.INDEX_NAME) - .setId(triggeredWatch.id().value()) + prepareIndex(TriggeredWatchStoreField.INDEX_NAME).setId(triggeredWatch.id().value()) .setSource(jsonBuilder().value(triggeredWatch)) .setWaitForActiveShards(ActiveShardCount.ALL) ); @@ -374,18 +350,14 @@ public class BootStrapTests extends AbstractWatcherIntegrationTestCase { Wid wid = new Wid(watchId, triggeredTime); TriggeredWatch triggeredWatch = new TriggeredWatch(wid, event); bulkRequestBuilder.add( - client().prepareIndex() - .setIndex(TriggeredWatchStoreField.INDEX_NAME) - .setId(triggeredWatch.id().value()) + prepareIndex(TriggeredWatchStoreField.INDEX_NAME).setId(triggeredWatch.id().value()) .setSource(jsonBuilder().value(triggeredWatch)) ); String id = internalCluster().getInstance(ClusterService.class).localNode().getId(); WatchRecord watchRecord = new WatchRecord.MessageWatchRecord(wid, event, ExecutionState.EXECUTED, "executed", id); bulkRequestBuilder.add( - client().prepareIndex() - .setIndex(HistoryStoreField.DATA_STREAM) - .setId(watchRecord.id().value()) + prepareIndex(HistoryStoreField.DATA_STREAM).setId(watchRecord.id().value()) .setOpType(DocWriteRequest.OpType.CREATE) .setSource(jsonBuilder().value(watchRecord)) ); 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 a3dc49411cc8..ccd9023f745b 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 @@ -36,7 +36,7 @@ public class RejectedExecutionTests extends AbstractWatcherIntegrationTestCase { public void testHistoryOnRejection() throws Exception { createIndex("idx"); - client().prepareIndex("idx").setSource("field", "a").get(); + prepareIndex("idx").setSource("field", "a").get(); refresh(); WatcherSearchTemplateRequest request = templateRequest(searchSource().query(termQuery("field", "a")), "idx"); new PutWatchRequestBuilder(client()).setId(randomAlphaOfLength(5)) 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 83a3b175819b..49fd7218ed06 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 @@ -53,9 +53,7 @@ public class WatchAckTests extends AbstractWatcherIntegrationTestCase { @Before public void indexTestDocument() { - DocWriteResponse eventIndexResponse = client().prepareIndex() - .setIndex("events") - .setId(id) + DocWriteResponse eventIndexResponse = prepareIndex("events").setId(id) .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE) .setSource("level", "error") .get(); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java index d268c6df4b21..3cd08bb671ed 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java @@ -143,9 +143,7 @@ public class ActivateWatchTests extends AbstractWatcherIntegrationTestCase { source.toXContent(builder, ToXContent.EMPTY_PARAMS); // now that we filtered out the watch status state, lets put it back in - DocWriteResponse indexResponse = client().prepareIndex() - .setIndex(".watches") - .setId("_id") + DocWriteResponse indexResponse = prepareIndex(".watches").setId("_id") .setSource(BytesReference.bytes(builder), XContentType.JSON) .get(); assertThat(indexResponse.getId(), is("_id"));