iter

Author: iverase

qa/smoke-test-http/src/internalClusterTest/java/org/elasticsearch/http/BulkRestMarkerSuffixIT.java

@@ -13,7 +13,6 @@
 import org.apache.http.entity.ContentType;
 import org.elasticsearch.action.bulk.IncrementalBulkService;
 import org.elasticsearch.client.Request;
-import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.common.settings.Settings;
@@ -34,8 +33,6 @@
 @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 2, numClientNodes = 0)
 public class BulkRestMarkerSuffixIT extends HttpSmokeTestCase {
 
-    private final RequestOptions options = RequestOptions.DEFAULT.toBuilder().addHeader("X-Bulk-Format", "marker-suffix").build();
-
     @Override
     protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) {
         return Settings.builder()
@@ -56,9 +53,6 @@ public void testBulkUriMatchingDoesNotMatchBulkCapabilitiesApi() throws IOExcept
 
     public void testBulkMissingBody() throws IOException {
         Request request = new Request(randomBoolean() ? "POST" : "PUT", "/_bulk");
-        if (randomBoolean()) {
-            request.setOptions(options);
-        }
         request.setJsonEntity("");
         ResponseException responseException = expectThrows(ResponseException.class, () -> getRestClient().performRequest(request));
         assertEquals(400, responseException.getResponse().getStatusLine().getStatusCode());
@@ -67,9 +61,6 @@ public void testBulkMissingBody() throws IOException {
 
     public void testBulkInvalidIndexNameString() throws IOException {
         Request request = new Request("POST", "/_bulk");
-        if (randomBoolean()) {
-            request.setOptions(options);
-        }
 
         byte[] bytes1 = "{\"create\":{\"_index\":\"".getBytes(StandardCharsets.UTF_8);
         byte[] bytes2 = new byte[] { (byte) 0xfe, (byte) 0xfe, (byte) 0xff, (byte) 0xff };
@@ -89,9 +80,7 @@ public void testBulkInvalidIndexNameString() throws IOException {
 
     public void testBulkRequestBodyImproperlyTerminated() throws IOException {
         Request request = new Request(randomBoolean() ? "POST" : "PUT", "/_bulk");
-        if (randomBoolean()) {
-            request.setOptions(options);
-        }
+
         // missing final line of the bulk body. cannot process
         request.setJsonEntity(
             "{\"index\":{\"_index\":\"index_name\",\"_id\":\"1\"}}\n"
@@ -119,9 +108,6 @@ public void testBulkRequest() throws IOException {
         assertThat(indexCreatedResponse.getStatusLine().getStatusCode(), equalTo(OK.getStatus()));
 
         Request firstBulkRequest = new Request("POST", "/index_name/_bulk");
-        if (randomBoolean()) {
-            firstBulkRequest.setOptions(options);
-        }
         String bulkBody = "{\"index\":{\"_index\":\"index_name\",\"_id\":\"1\"}}\n"
             + "{\"field\":1}\n"
             + "{\"index\":{\"_index\":\"index_name\",\"_id\":\"2\"}}\n"
@@ -152,9 +138,6 @@ public void testBulkWithIncrementalDisabled() throws IOException {
         assertThat(indexCreatedResponse.getStatusLine().getStatusCode(), equalTo(OK.getStatus()));
 
         Request firstBulkRequest = new Request("POST", "/index_name/_bulk");
-        if (randomBoolean()) {
-            firstBulkRequest.setOptions(options);
-        }
 
         String bulkBody = "{\"index\":{\"_index\":\"index_name\",\"_id\":\"1\"}}\n"
             + "{\"field\":1}\n"
@@ -195,9 +178,6 @@ public void testMalformedActionLineBulk() throws IOException {
         assertThat(indexCreatedResponse.getStatusLine().getStatusCode(), equalTo(OK.getStatus()));
 
         Request bulkRequest = new Request("POST", "/index_name/_bulk");
-        if (randomBoolean()) {
-            bulkRequest.setOptions(options);
-        }
 
         final StringBuilder bulk = new StringBuilder();
         bulk.append("{\"index\":{\"_index\":\"index_name\"}}\n");
@@ -213,9 +193,7 @@ public void testMalformedActionLineBulk() throws IOException {
     @SuppressWarnings("unchecked")
     private void sendLargeBulk() throws IOException {
         Request bulkRequest = new Request("POST", "/index_name/_bulk");
-        if (randomBoolean()) {
-            bulkRequest.setOptions(options);
-        }
+
         final StringBuilder bulk = new StringBuilder();
         bulk.append("{\"delete\":{\"_index\":\"index_name\",\"_id\":\"1\"}}\n");
         int updates = 0;