Add shorthand for prepareIndex to test infrastructure (#101187)

Same as #101175, shorten `client().prepareIndex(index)` and
`client().prepareIndex().setIndex(index)` via a test utility.
Saves lots of code now and sets up some follow-up simplifcations.

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")
+                prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
-                    .setId("" + i)
-                    .setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
             );
         }
         indexRandom(true, builders);

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")
+                    prepareIndex("test").setOpType(DocWriteRequest.OpType.CREATE)
-                        .setOpType(DocWriteRequest.OpType.CREATE)
                         .setSource(
                             "@timestamp",
                             now + (long) i * numberOfDocsPerRefresh + j,

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(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("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(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("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(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(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(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("6").setSource("key", "baz", "val", 30, "@timestamp", "2021-01-01T00:10:00Z"))
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
             .get();
 

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();

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")
+        return prepareIndex("idx").setSource(
-            .setSource(
+            jsonBuilder().startObject()
-                jsonBuilder().startObject()
+                .field("value", value)
-                    .field("value", value)
+                .timeField("date", date(month, day))
-                    .timeField("date", date(month, day))
+                .startArray("dates")
-                    .startArray("dates")
+                .timeValue(date(month, day))
-                    .timeValue(date(month, day))
+                .timeValue(date(month + 1, day + 1))
-                    .timeValue(date(month + 1, day + 1))
+                .endArray()
-                    .endArray()
+                .endObject()
-                    .endObject()
+        );
-            );
     }
 
     @Override
@@ -90,9 +89,7 @@ public class DateDerivativeIT extends ESIntegTestCase {
         List<IndexRequestBuilder> builders = new ArrayList<>();
         for (int i = 0; i < 2; i++) {
             builders.add(
-                client().prepareIndex("empty_bucket_idx")
+                prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
-                    .setId("" + i)
-                    .setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
             );
         }
         builders.addAll(

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")
+                    prepareIndex("idx").setSource(
-                        .setSource(jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject())
+                        jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject()
+                    )
                 );
             }
         }

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(

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);

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);

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")
+        prepareIndex("test").setId("1")
-            .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")
+        prepareIndex("first_test_index").setId("0")
-            .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")
+        prepareIndex("first_test_index").setId("1").setSource("field1", "The quick browse button is a fancy thing, right bro?").get();
-            .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")
+        prepareIndex("second_test_index").setId("0")
-            .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")
+        prepareIndex("second_test_index").setId("1")
-            .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(

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)
+            prepareIndex(dataStreamName).setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON)
-                .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")
+            prepareIndex("logs-barbaz").setSource("{\"@timestamp\": \"2020-12-12\"}", XContentType.JSON)
-                .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)
+        prepareIndex(dataStreamName).setId("1")
-            .setId("1")
             .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"x\"}", XContentType.JSON)
             .setOpType(DocWriteRequest.OpType.CREATE)
             .get();
-        client().prepareIndex(dataStreamName)
+        prepareIndex(dataStreamName).setId("2")
-            .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)
+        prepareIndex(dataStreamName).setId("1")
-            .setId("1")
             .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"x\"}", XContentType.JSON)
             .setOpType(DocWriteRequest.OpType.CREATE)
             .get();
-        client().prepareIndex(dataStreamName)
+        prepareIndex(dataStreamName).setId("2")
-            .setId("2")
             .setSource("{\"@timestamp\": \"2022-12-12\", \"type\": \"y\"}", XContentType.JSON)
             .setOpType(DocWriteRequest.OpType.CREATE)
             .get();

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)
+        var dsIndexName = prepareIndex(index).setCreate(true)
-            .setCreate(true)
             .setId("1")
             .setSource("@timestamp", "2020-09-09")
             .setWaitForActiveShards(0)

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)
+        DocWriteResponse indexRepsonse = prepareIndex(SYSTEM_DATA_STREAM_NAME).setId("42")
-            .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)
+        DocWriteResponse indexToDataStreamResponse = prepareIndex(SYSTEM_DATA_STREAM_NAME).setId("42")
-            .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")
+        DocWriteResponse indexResponse = prepareIndex("my-index").setId("42")
-            .setId("42")
             .setSource("{ \"name\": \"my-name\" }", XContentType.JSON)
             .setOpType(DocWriteRequest.OpType.CREATE)
             .get();

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")
+            () -> prepareIndex("index").setId("1")
-                .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")
+        prepareIndex("index").setId("1")
-            .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")
+            () -> prepareIndex("index").setId("2")
-                .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")
+        prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-            .setId("1")
-            .setSource("x", 0)
-            .setPipeline("_id")
-            .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-            .get();
 
         Map<String, Object> 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")
+        prepareIndex("index").setId("2").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-            .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")
+        prepareIndex("index").setId("1").setSource("x", 0).setPipeline("_id").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-            .setId("1")
-            .setSource("x", 0)
-            .setPipeline("_id")
-            .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-            .get();
 
         Map<String, Object> 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")
+                () -> prepareIndex("index").setId("fails")
-                    .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<DocWriteResponse> future = new PlainActionFuture<>();
-        client().prepareIndex("index")
+        prepareIndex("index").setId("passes1")
-            .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<String, Object> source = client().prepareGet("index", "passes1").get(timeout).getSource();

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"),
+            prepareIndex("test").setId("1").setSource("text", "hello goodbye"),
-            client().prepareIndex("test").setId("2").setSource("text", "hello hello hello goodbye"),
+            prepareIndex("test").setId("2").setSource("text", "hello hello hello goodbye"),
-            client().prepareIndex("test").setId("3").setSource("text", "hello hello goodebye")
+            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"),
+            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("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"),
+            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("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),
+            prepareIndex("test").setId("1").setSource(doc1),
-            client().prepareIndex("test").setId("2").setSource(doc2),
+            prepareIndex("test").setId("2").setSource(doc2),
-            client().prepareIndex("test").setId("3").setSource(doc3)
+            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),
+            prepareIndex("test").setId("1").setSource("id", 1, "x", 4),
-            client().prepareIndex("test").setId("2").setSource("id", 2, "y", 2)
+            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),
+            prepareIndex("test").setId("1").setSource("id", 1, "x", 10),
-            client().prepareIndex("test").setId("2").setSource("id", 2, "x", 3),
+            prepareIndex("test").setId("2").setSource("id", 2, "x", 3),
-            client().prepareIndex("test").setId("3").setSource("id", 3, "x", 5)
+            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),
+            prepareIndex("test").setId("1").setSource("x", 5, "y", 1.2),
-            client().prepareIndex("test").setId("2").setSource("x", 10, "y", 1.4),
+            prepareIndex("test").setId("2").setSource("x", 10, "y", 1.4),
-            client().prepareIndex("test").setId("3").setSource("x", 13, "y", 1.8)
+            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"),
+            prepareIndex("test").setId("1").setSource("text", "hello"),
-            client().prepareIndex("test").setId("2").setSource("text", "goodbye"),
+            prepareIndex("test").setId("2").setSource("text", "goodbye"),
-            client().prepareIndex("test").setId("3").setSource("text", "hello")
+            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),
+            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),
+            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),
+            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),
+            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("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")
+        prepareIndex("test").setId("1")
-            .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),
+            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),
+            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("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),
+            prepareIndex("test").setId("1").setSource("id", 1, "foo", 1.0),
-            client().prepareIndex("test").setId("2").setSource("id", 2, "foo", 0.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());

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");

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")
+            indexRequestBuilders[i] = prepareIndex("msearch").setId(String.valueOf(i)).setSource("odd", (i % 2 == 0), "group", (i % 3));
-                .setId(String.valueOf(i))
-                .setSource("odd", (i % 2 == 0), "group", (i % 3));
         }
         indexRandom(true, indexRequestBuilders);
 

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();
+        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("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(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON));
-        bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON));
+        bulkRequestBuilder.add(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(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(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("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(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON));
-        bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON));
+        bulkRequestBuilder.add(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(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(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("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(prepareIndex("test").setId("1").setSource("{\"theField\":\"foo\"}", XContentType.JSON));
-        bulkRequestBuilder.add(client().prepareIndex("test").setId("2").setSource("{\"theField\":\"foo 2\"}", XContentType.JSON));
+        bulkRequestBuilder.add(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(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(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("5").setSource("{\"theField\":\"bar\"}", XContentType.JSON));
         bulkRequestBuilder.get();
         indicesAdmin().prepareRefresh().get();
 

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")

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")
+        prepareIndex("geo_points_only").setId("1")
-            .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")
+        prepareIndex("geo_points_only").setId("2")
-            .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")
+            prepareIndex("geo_points_only").setId("1")
-                .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)
+        prepareIndex(defaultIndexName).setId("1")
-            .setId("1")
             .setSource(GeoJson.toXContent(multiPoint, jsonBuilder().startObject().field(defaultFieldName), null).endObject())
             .setRefreshPolicy(IMMEDIATE)
             .get();

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)
+                prepareIndex(INDEX_NAME).setId("all")
-                    .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(prepareIndex(INDEX_NAME).setId("lower").setSource(Map.of("all_rank_features", Map.of(LOWER_RANKED_FEATURE, 10))))
-            .add(
+            .add(prepareIndex(INDEX_NAME).setId("higher").setSource(Map.of("all_rank_features", Map.of(HIGHER_RANKED_FEATURE, 20))))
-                client().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));

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) {

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();
+        prepareIndex("metricbeat-foo").setId("1").setSource("message", "foo").get();
-        client().prepareIndex("packetbeat-foo").setId("1").setSource("message", "foo").get();
+        prepareIndex("packetbeat-foo").setId("1").setSource("message", "foo").get();
-        client().prepareIndex("filebeat-foo").setId("1").setSource("message", "foo").get();
+        prepareIndex("filebeat-foo").setId("1").setSource("message", "foo").get();
     }
 }

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")
+        prepareIndex("test").setSource(jsonBuilder().startObject().field("text", "value").endObject())
-            .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 {

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(

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<String, Object> joinField = new HashMap<>();
         if (parentId != null) {
             joinField.put("name", name);

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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchAllQuery()).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .setId("2")
             .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "value")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("3")
-            .setId("3")
             .setSource(
                 jsonBuilder().startObject()
                     .field("id", "3")
@@ -180,16 +177,13 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
                 )
         );
 
-        client().prepareIndex("test")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field1").from(10).to(12)).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .setId("2")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field1").from(20).to(22)).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("3")
-            .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")
+        prepareIndex("test").setId("4")
-            .setId("4")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from(10).to(12)).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("5")
-            .setId("5")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from(20).to(22)).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("6")
-            .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")
+        prepareIndex("test").setId("7")
-            .setId("7")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field3").from("192.168.1.0").to("192.168.1.5")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("8")
-            .setId("8")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field3").from("192.168.1.20").to("192.168.1.30")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("9")
-            .setId("9")
             .setSource(
                 jsonBuilder().startObject()
                     .field(
@@ -234,8 +222,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
                     .endObject()
             )
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("10")
-            .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")
+        prepareIndex("test").setId("1")
-            .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")
+        prepareIndex("test").setId("2")
-            .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")
+        prepareIndex("test").setId("3")
-            .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchAllQuery()).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .setId("2")
             .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "value")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("3")
-            .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();
+        prepareIndex("test").setId("4").setSource("{\"id\": \"4\"}", XContentType.JSON).get();
-        client().prepareIndex("test").setId("5").setSource(XContentType.JSON, "id", "5", "field1", "value").get();
+        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("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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(
                 jsonBuilder().startObject()
                     .field("id", "1")
@@ -444,8 +424,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
                     .endObject()
             )
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .setId("2")
             .setSource(
                 jsonBuilder().startObject()
                     .field("id", "2")
@@ -460,8 +439,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
             .get();
         indicesAdmin().prepareRefresh().get();
 
-        client().prepareIndex("test")
+        prepareIndex("test").setId("3")
-            .setId("3")
             .setSource(
                 jsonBuilder().startObject()
                     .field("id", "3")
@@ -481,8 +459,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
             .get();
 
         // doesn't match
-        client().prepareIndex("test")
+        prepareIndex("test").setId("4")
-            .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("id", "1").field("query", matchQuery("field1", "brown fox")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .setId("2")
             .setSource(jsonBuilder().startObject().field("id", "2").field("query", matchQuery("field1", "lazy dog")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("3")
-            .setId("3")
             .setSource(jsonBuilder().startObject().field("id", "3").field("query", termQuery("field1", "jumps")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("4")
-            .setId("4")
             .setSource(jsonBuilder().startObject().field("id", "4").field("query", termQuery("field1", "dog")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("5")
-            .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("query", new MatchPhraseQueryBuilder("field", "brown fox").slop(4)).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .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")
+        prepareIndex("test1").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field(queryFieldName, matchQuery("field", "value")).endObject())
             .get();
-        client().prepareIndex("test2")
+        prepareIndex("test2").setId("1")
-            .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")
+            prepareIndex("test2").setId("1")
-                .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")
+        prepareIndex("test").setId("q1")
-            .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")
+        prepareIndex("test").setId("q2")
-            .setId("q2")
             .setSource(
                 jsonBuilder().startObject()
                     .field("id", "q2")
@@ -973,8 +938,7 @@ public class PercolatorQuerySearchIT extends ESIntegTestCase {
             .get();
         indicesAdmin().prepareRefresh().get();
 
-        client().prepareIndex("test")
+        prepareIndex("test").setId("q3")
-            .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "b")).field("a", "b").endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2").setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "c")).endObject()).get();
-            .setId("2")
+        prepareIndex("test").setId("3")
-            .setSource(jsonBuilder().startObject().field("query", matchQuery("field1", "c")).endObject())
-            .get();
-        client().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();
+        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("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")
+            prepareIndex("test").setId("1")
-                .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("q", boolQuery().must(rangeQuery("d").gt("now"))).endObject())
             .get();
 
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .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")
+        prepareIndex("test").setId("1")
-            .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")
+        IndexRequestBuilder indexRequestBuilder = prepareIndex("index1").setId("knn_query1")
-            .setId("knn_query1")
             .setSource(jsonBuilder().startObject().field("my_query", knnVectorQueryBuilder).endObject());
 
         DocumentParsingException exception = expectThrows(DocumentParsingException.class, () -> indexRequestBuilder.get());

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(

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")
+        prepareIndex("index").setId("1")
-            .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")
+        prepareIndex("test").setId("q1")
-            .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")
+        prepareIndex("test").setId("q1")
-            .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")
+        prepareIndex("test").setId("1")
-            .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(jsonBuilder().startObject().field("query", rangeQuery("field2").from("now-1h").to("now+1h")).endObject())
             .get();
-        client().prepareIndex("test")
+        prepareIndex("test").setId("2")
-            .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")
+        prepareIndex("test").setId("3")
-            .setId("3")
             .setSource(
                 jsonBuilder().startObject()
                     .field("query", boolQuery().filter(scriptQuery(script)).filter(rangeQuery("field2").from("now-1h").to("now+1h")))

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)
+        prepareIndex(TEST_INDEX).setId("1").setSource("id", 1, "text", "berlin", "title", "Berlin, Germany", "population", 3670622).get();
-            .setId("1")
+        prepareIndex(TEST_INDEX).setId("2").setSource("id", 2, "text", "amsterdam", "population", 851573).get();
-            .setSource("id", 1, "text", "berlin", "title", "Berlin, Germany", "population", 3670622)
+        prepareIndex(TEST_INDEX).setId("3").setSource("id", 3, "text", "amsterdam", "population", 851573).get();
-            .get();
+        prepareIndex(TEST_INDEX).setId("4").setSource("id", 4, "text", "amsterdam", "population", 851573).get();
-        client().prepareIndex(TEST_INDEX).setId("2").setSource("id", 2, "text", "amsterdam", "population", 851573).get();
+        prepareIndex(TEST_INDEX).setId("5").setSource("id", 5, "text", "amsterdam", "population", 851573).get();
-        client().prepareIndex(TEST_INDEX).setId("3").setSource("id", 3, "text", "amsterdam", "population", 851573).get();
+        prepareIndex(TEST_INDEX).setId("6").setSource("id", 6, "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();
 
         // 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

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())
         );
 

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);
 

modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java

@@ -192,7 +192,7 @@ public abstract class AbstractFeatureMigrationIntegTest extends ESIntegTestCase
 
         List<IndexRequestBuilder> 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();

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())
         );
 

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"),
+            prepareIndex("test").setId("1").setSource("foo", "a"),
-            client().prepareIndex("test").setId("2").setSource("foo", "a"),
+            prepareIndex("test").setId("2").setSource("foo", "a"),
-            client().prepareIndex("test").setId("3").setSource("foo", "b"),
+            prepareIndex("test").setId("3").setSource("foo", "b"),
-            client().prepareIndex("test").setId("4").setSource("foo", "c"),
+            prepareIndex("test").setId("4").setSource("foo", "c"),
-            client().prepareIndex("test").setId("5").setSource("foo", "d"),
+            prepareIndex("test").setId("5").setSource("foo", "d"),
-            client().prepareIndex("test").setId("6").setSource("foo", "e"),
+            prepareIndex("test").setId("6").setSource("foo", "e"),
-            client().prepareIndex("test").setId("7").setSource("foo", "f")
+            prepareIndex("test").setId("7").setSource("foo", "f")
         );
 
         assertHitCount(prepareSearch("test").setSize(0), 7);
@@ -87,7 +87,7 @@ public class DeleteByQueryBasicTests extends ReindexTestCase {
 
         List<IndexRequestBuilder> 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<IndexRequestBuilder> 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<IndexRequestBuilder> builders = new ArrayList<>();
         for (int i = 0; i < docs; i++) {
             builders.add(
-                client().prepareIndex("test")
+                prepareIndex("test").setId(Integer.toString(i)).setRouting(randomAlphaOfLengthBetween(1, 5)).setSource("foo", "bar")
-                    .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<IndexRequestBuilder> 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<IndexRequestBuilder> 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"),
+            prepareIndex("test").setId("1").setSource("foo", "a"),
-            client().prepareIndex("test").setId("2").setSource("foo", "a"),
+            prepareIndex("test").setId("2").setSource("foo", "a"),
-            client().prepareIndex("test").setId("3").setSource("foo", "b"),
+            prepareIndex("test").setId("3").setSource("foo", "b"),
-            client().prepareIndex("test").setId("4").setSource("foo", "c"),
+            prepareIndex("test").setId("4").setSource("foo", "c"),
-            client().prepareIndex("test").setId("5").setSource("foo", "d"),
+            prepareIndex("test").setId("5").setSource("foo", "d"),
-            client().prepareIndex("test").setId("6").setSource("foo", "e"),
+            prepareIndex("test").setId("6").setSource("foo", "e"),
-            client().prepareIndex("test").setId("7").setSource("foo", "f")
+            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"));
             }
         }
 

modules/reindex/src/test/java/org/elasticsearch/reindex/DeleteByQueryConcurrentTests.java

@@ -32,7 +32,7 @@ public class DeleteByQueryConcurrentTests extends ReindexTestCase {
         List<IndexRequestBuilder> 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<IndexRequestBuilder> 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);
 

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"),
+            prepareIndex("source").setId("1").setSource("foo", "a"),
-            client().prepareIndex("source").setId("2").setSource("foo", "a"),
+            prepareIndex("source").setId("2").setSource("foo", "a"),
-            client().prepareIndex("source").setId("3").setSource("foo", "b"),
+            prepareIndex("source").setId("3").setSource("foo", "b"),
-            client().prepareIndex("source").setId("4").setSource("foo", "c")
+            prepareIndex("source").setId("4").setSource("foo", "c")
         );
         assertHitCount(prepareSearch("source").setSize(0), 4);
 
@@ -63,7 +63,7 @@ public class ReindexBasicTests extends ReindexTestCase {
         List<IndexRequestBuilder> 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<IndexRequestBuilder> 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 = "<reindex-datemath-{2001-01-01-13||+1h/h{yyyy-MM-dd-HH|-07:00}}>";
         indexRandom(
             true,
-            client().prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"),
+            prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"),
-            client().prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"),
+            prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"),
-            client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"),
+            prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"),
-            client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c")
+            prepareIndex(sourceIndexName).setId("4").setSource("foo", "c")
         );
         assertHitCount(prepareSearch(sourceIndexName).setSize(0), 4);
 

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 = "<datemath-{2001-01-01-13||+1h/h{yyyy-MM-dd-HH|-07:00}}>";
         indexRandom(
             true,
-            client().prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"),
+            prepareIndex(sourceIndexName).setId("1").setSource("foo", "a"),
-            client().prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"),
+            prepareIndex(sourceIndexName).setId("2").setSource("foo", "a"),
-            client().prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"),
+            prepareIndex(sourceIndexName).setId("3").setSource("foo", "b"),
-            client().prepareIndex(sourceIndexName).setId("4").setSource("foo", "c")
+            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<IndexRequestBuilder> 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);
     }

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

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();

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(
+        indexRandom(true, prepareIndex("dest").setId("test").setVersionType(EXTERNAL).setVersion(version).setSource("foo", "dest"));
-            true,
-            client().prepareIndex("dest").setId("test").setVersionType(EXTERNAL).setVersion(version).setSource("foo", "dest")
-        );
 
         assertEquals(version, client().prepareGet("dest", "test").get().getVersion());
     }

modules/reindex/src/test/java/org/elasticsearch/reindex/RethrottleTests.java

@@ -81,7 +81,7 @@ public class RethrottleTests extends ReindexTestCase {
 
         List<IndexRequestBuilder> 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);
 

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());

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"),
+            prepareIndex("test").setId("1").setSource("foo", "a"),
-            client().prepareIndex("test").setId("2").setSource("foo", "a"),
+            prepareIndex("test").setId("2").setSource("foo", "a"),
-            client().prepareIndex("test").setId("3").setSource("foo", "b"),
+            prepareIndex("test").setId("3").setSource("foo", "b"),
-            client().prepareIndex("test").setId("4").setSource("foo", "c")
+            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"),
+            prepareIndex("test").setId("1").setSource("foo", "a"),
-            client().prepareIndex("test").setId("2").setSource("foo", "a"),
+            prepareIndex("test").setId("2").setSource("foo", "a"),
-            client().prepareIndex("test").setId("3").setSource("foo", "b"),
+            prepareIndex("test").setId("3").setSource("foo", "b"),
-            client().prepareIndex("test").setId("4").setSource("foo", "c")
+            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"));
             }
         }
 

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<String> 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<Exception> 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")
+                IndexRequestBuilder index = prepareIndex("test").setId("test").setSource("test", value.get()).setRefreshPolicy(IMMEDIATE);
-                    .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

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),
+            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("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)
+            prepareIndex(index).setId("1")
-                .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),
+            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("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),
+            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("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),
+            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("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),
+            prepareIndex(index).setId("1").setSource("{\"id\":\"1\",\"collate\":\"foo bar\"}", XContentType.JSON),
-            client().prepareIndex(index).setId("2").setSource("{\"id\":\"2\",\"collate\":\"foobar\"}", XContentType.JSON),
+            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("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("""
+        indexRandom(true, prepareIndex(index).setId("1").setSource("""
-            {"collate":"foobar-10"}""", XContentType.JSON), client().prepareIndex(index).setId("2").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("""
+        indexRandom(true, prepareIndex(index).setId("1").setSource("""
-            {"id":"1","collate":"résumé"}""", XContentType.JSON), client().prepareIndex(index).setId("2").setSource("""
+            {"id":"1","collate":"résumé"}""", XContentType.JSON), prepareIndex(index).setId("2").setSource("""
-            {"id":"2","collate":"Resume"}""", XContentType.JSON), client().prepareIndex(index).setId("3").setSource("""
+            {"id":"2","collate":"Resume"}""", XContentType.JSON), prepareIndex(index).setId("3").setSource("""
-            {"id":"3","collate":"resume"}""", XContentType.JSON), client().prepareIndex(index).setId("4").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),
+            prepareIndex(index).setId("1").setSource("{\"collate\":\"resume\"}", XContentType.JSON),
-            client().prepareIndex(index).setId("2").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),
+            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("2").setSource("{\"id\":\"2\",\"collate\":\"" + equivalent[1] + "\"}", XContentType.JSON)
         );
 
         SearchRequest request = new SearchRequest().indices(index)

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"))

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();
+            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();
+            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-3").setId(Integer.toString(i)).setSource("foo", "bar" + i).get();
         }
         client().admin().indices().prepareRefresh().get();
         assertThat(count(client, "test-idx-1"), equalTo(100L));

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());
         }

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();
 

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);

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"),
+                prepareIndex("test").setId("1").setSource("field1", "value1"),
-                client().prepareIndex("test").setId("2").setSource("field1", "value2"),
+                prepareIndex("test").setId("2").setSource("field1", "value2"),
-                client().prepareIndex("test").setId("3").setSource("field1", "value3")
+                prepareIndex("test").setId("3").setSource("field1", "value3")
             );
             ensureSearchable();
             while (latch.getCount() > 0) {

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<TaskInfo> 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")
+        prepareIndex("test").setId("test_id")
-            .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();

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");

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));
     }
 

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);

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")
+                    prepareIndex("test").setSource("index_version", indexVersion.get()).setTimeout(TimeValue.timeValueSeconds(10)).get();
-                        .setSource("index_version", indexVersion.get())
-                        .setTimeout(TimeValue.timeValueSeconds(10))
-                        .get();
                 }
             } catch (IndexNotFoundException inf) {
                 // fine

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")
+            prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON).get();
-                .setId(Integer.toString(i))
-                .setSource("{\"foo\" : \"bar\", \"i\" : " + i + "}", XContentType.JSON)
-                .get();
         }
         Map<String, DiscoveryNode> 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")
+            prepareIndex("first_shrink").setId(Integer.toString(i))
-                .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")
+            prepareIndex("second_shrink").setId(Integer.toString(i))
-                .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<String, DiscoveryNode> 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<String, DiscoveryNode> 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")
+            prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON).get();
-                .setId(Integer.toString(i))
-                .setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON)
-                .get();
         }
         Map<String, DiscoveryNode> 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<String, DiscoveryNode> dataNodes = clusterAdmin().prepareState().get().getState().nodes().getDataNodes();

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java

@@ -128,8 +128,7 @@ public class SplitIndexIT extends ESIntegTestCase {
 
         BiFunction<String, Integer, IndexRequestBuilder> indexFunc = (index, id) -> {
             try {
-                return client().prepareIndex(index)
+                return prepareIndex(index).setId(Integer.toString(id))
-                    .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")
+            prepareIndex("source").setId(Integer.toString(i)).setSource("{\"foo\" : \"bar\", \"id\" : " + i + "}", XContentType.JSON).get();
-                .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);

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(
+            assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK);
-                client().prepareIndex().setIndex("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(
+            assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), Metadata.CLUSTER_READ_ONLY_ALLOW_DELETE_BLOCK);
-                client().prepareIndex().setIndex("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

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<ShardId> 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<ShardId> failingShards = randomSubsetOf(

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

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

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();
 

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();

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)
+                        DocWriteResponse response = prepareIndex(index).setId(id)
-                            .setId(id)
                             .setSource(Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), XContentType.JSON)
                             .get();
                         assertThat(response.getResult(), is(oneOf(CREATED, UPDATED)));

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()
+                prepareIndex(INDEX_NAME).setId(Integer.toString(i))
-                    .setIndex(INDEX_NAME)
-                    .setId(Integer.toString(i))
                     .setSource("field", randomRealisticUnicodeOfLengthBetween(1, 30))
                     .request()
             );

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(prepareIndex("willwork").setId("1").setSource("{\"foo\":1}", XContentType.JSON));
-        bulkRequestBuilder.add(client().prepareIndex("wontwork").setId("2").setSource("{\"foo\":2}", XContentType.JSON));
+        bulkRequestBuilder.add(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("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));

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()
+                prepareIndex(INDEX_NAME).setId(Integer.toString(i))
-                    .setIndex(INDEX_NAME)
-                    .setId(Integer.toString(i))
                     .setSource("field", randomRealisticUnicodeOfLengthBetween(1, 30))
                     .request()
             );

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(prepareIndex(indexOrAlias()).setId("1").setSource("field", 1))
-            .add(client().prepareIndex().setIndex(indexOrAlias()).setId("2").setSource("field", 2).setCreate(true))
+            .add(prepareIndex(indexOrAlias()).setId("2").setSource("field", 2).setCreate(true))
-            .add(client().prepareIndex().setIndex(indexOrAlias()).setId("3").setSource("field", 3))
+            .add(prepareIndex(indexOrAlias()).setId("3").setSource("field", 3))
-            .add(client().prepareIndex().setIndex(indexOrAlias()).setId("4").setSource("field", 4))
+            .add(prepareIndex(indexOrAlias()).setId("4").setSource("field", 4))
-            .add(client().prepareIndex().setIndex(indexOrAlias()).setId("5").setSource("field", 5))
+            .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(prepareIndex("test").setId("1").setCreate(true).setSource("field", "1"))
-            .add(client().prepareIndex("test").setId("2").setCreate(true).setSource("field", "1"))
+            .add(prepareIndex("test").setId("2").setCreate(true).setSource("field", "1"))
-            .add(client().prepareIndex("test").setId("1").setSource("field", "2"))
+            .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(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(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", "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(prepareIndex("test").setId("1").setSource("field", 1))
-            .add(client().prepareIndex().setIndex("test").setId("2").setSource("field", 1))
+            .add(prepareIndex("test").setId("2").setSource("field", 1))
-            .add(client().prepareIndex().setIndex("test").setId("3").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();

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<IndexRequestBuilder> 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");

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<String, String> 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<String, Object> 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();
     }

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++;
             }
         }

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();
             }

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();
+        prepareIndex("test").setId("1").setSource("created_date", "2020-01-01").get();
-        client().prepareIndex("test").setId("2").setSource("created_date", "2020-01-02").get();
+        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("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();

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")
+            prepareIndex("test").setId("1")
-                .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(source("1", "test"), XContentType.JSON)
             .setWaitForActiveShards(2)
             .setTimeout(timeValueSeconds(1))
             .get();
 
         try {
-            client().prepareIndex("test")
+            prepareIndex("test").setId("1")
-                .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")
+        prepareIndex("test").setId("1")
-            .setId("1")
             .setSource(source("1", "test"), XContentType.JSON)
             .setWaitForActiveShards(ActiveShardCount.ALL)
             .setTimeout(timeValueSeconds(1))

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<TermVectorsResponse> 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<TermVectorsResponse> 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<TermVectorsResponse> termVectors = client().termVectors(
             new TermVectorsRequest(indexOrAlias(), "0").selectedFields(randomBoolean() ? new String[] { "existingfield" } : null)
@@ -163,7 +163,7 @@ public class GetTermVectorsIT extends AbstractTermVectorsTestCase {
 
         List<IndexRequestBuilder> 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")
+            prepareIndex("test").setId(Integer.toString(i))
-                .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")
+            prepareIndex("test").setId(Integer.toString(i))
-                .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<IndexRequestBuilder> 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<IndexRequestBuilder> 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<String> 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()
+                    prepareIndex(indexName).setId(String.valueOf(id)).setSource("field1", content[id], "field2", content[id])
-                        .setIndex(indexName)
-                        .setId(String.valueOf(id))
-                        .setSource("field1", content[id], "field2", content[id])
                 );
             }
         }

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

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"))

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)
+            IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList())
-                .mapToObj(i -> client().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)
+            IntStream.range(0, nbDocs).mapToObj(i -> prepareIndex(indexName).setId(String.valueOf(i)).setSource("num", i)).collect(toList())
-                .mapToObj(i -> client().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())
                 );
             }

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

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();
+        prepareIndex("test1").setId("1").setSource("field", "value1").get();
-        client().prepareIndex("test2").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");

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");
 

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));

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<DocWriteResponse> docIndexResponse = client().prepareIndex("index").setId("1").setSource("field", 42).execute();
+        ActionFuture<DocWriteResponse> 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<DocWriteResponse> docIndexResponse = client().prepareIndex("index").setId("1").setSource("field", 42).execute();
+        final ActionFuture<DocWriteResponse> 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<DocWriteResponse> 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

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));

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

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<ShardRouting> 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));

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(
+            assertBlocked(prepareIndex(indexName).setId("1").setSource("f", "g"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK);
-                client().prepareIndex().setIndex(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(
+            assertBlocked(prepareIndex(indexName).setId("1").setSource("f", "g"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK);
-                client().prepareIndex().setIndex(indexName).setId("1").setSource("f", "g"),
-                IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK
-            );
             assertThat(getIndexBlock(indexName, IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE), equalTo("true"));
         });
 

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();

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(
+            () -> assertBlocked(prepareIndex("test").setId("1").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK)
-                client().prepareIndex().setIndex("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(
+        assertBlocked(prepareIndex("test").setId("2").setSource("foo", "bar"), IndexMetadata.INDEX_READ_ONLY_ALLOW_DELETE_BLOCK);
-            client().prepareIndex().setIndex("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")
+                prepareIndex("test").setId("3").setSource("foo", "bar").setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();
-                    .setId("3")
-                    .setSource("foo", "bar")
-                    .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-                    .get();
             } catch (ClusterBlockException e) {
                 throw new AssertionError("retrying", e);
             }

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");
 

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<IndexRequestBuilder> 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);
 

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)
+                        DocWriteResponse response = prepareIndex(index).setId(id)
-                            .setId(id)
                             .setSource(Map.of("f" + randomIntBetween(1, 10), randomNonNegativeLong()), XContentType.JSON)
                             .get();
                         assertThat(response.getResult(), is(oneOf(CREATED, UPDATED)));

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(prepareIndex("test").setId("2").setSource("{ \"f\": 1 }", XContentType.JSON));
-        bulk.add(client().prepareIndex("test").setId("3").setSource("{ \"g\": 1 }", XContentType.JSON));
+        bulk.add(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("4").setSource("{ \"f\": 1 }", XContentType.JSON));
         BulkResponse bulkResponse = bulk.get();
         assertTrue(bulkResponse.hasFailures());
 

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);
     }

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()
+        DocWriteResponse indexResponse = prepareIndex("test").setId("1")
-            .setIndex("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(prepareIndex("test").setId("1").setSource(source("1", "test")))
-            .add(client().prepareIndex().setIndex("test").setId("2").setSource(source("2", "test")).setCreate(true))
+            .add(prepareIndex("test").setId("2").setSource(source("2", "test")).setCreate(true))
-            .add(client().prepareIndex().setIndex("test").setSource(source("3", "test")))
+            .add(prepareIndex("test").setSource(source("3", "test")))
-            .add(client().prepareIndex().setIndex("test").setCreate(true).setSource(source("4", "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));

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();

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);

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();