Revert "REST high-level client: add support for Indices Update Settin…

buildSrc/src/main/resources/checkstyle_suppressions.xml

@@ -151,6 +151,7 @@
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]BroadcastOperationRequestBuilder.java" checks="LineLength" />
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]TransportBroadcastAction.java" checks="LineLength" />
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]broadcast[/\\]node[/\\]TransportBroadcastByNodeAction.java" checks="LineLength" />
+  <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]AcknowledgedRequest.java" checks="LineLength" />
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]AcknowledgedRequestBuilder.java" checks="LineLength" />
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]MasterNodeOperationRequestBuilder.java" checks="LineLength" />
   <suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]action[/\\]support[/\\]master[/\\]MasterNodeReadOperationRequestBuilder.java" checks="LineLength" />

client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java

@@ -45,8 +45,6 @@
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsResponse;
 import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
 
@@ -408,28 +406,4 @@ public void rolloverAsync(RolloverRequest rolloverRequest, ActionListener<Rollov
         restHighLevelClient.performRequestAsyncAndParseEntity(rolloverRequest, Request::rollover, RolloverResponse::fromXContent,
                 listener, emptySet(), headers);
     }
-
-    /**
-     * Updates specific index level settings using the Update Indices Settings API
-     * <p>
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html"> Update Indices Settings
-     * API on elastic.co</a>
-     */
-    public UpdateSettingsResponse putSettings(UpdateSettingsRequest updateSettingsRequest, Header... headers) throws IOException {
-        return restHighLevelClient.performRequestAndParseEntity(updateSettingsRequest, Request::indexPutSettings,
-                UpdateSettingsResponse::fromXContent, emptySet(), headers);
-    }
-
-    /**
-     * Asynchronously updates specific index level settings using the Update Indices Settings API
-     * <p>
-     * See <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html"> Update Indices Settings
-     * API on elastic.co</a>
-     */
-    public void putSettingsAsync(UpdateSettingsRequest updateSettingsRequest, ActionListener<UpdateSettingsResponse> listener,
-            Header... headers) {
-        restHighLevelClient.performRequestAsyncAndParseEntity(updateSettingsRequest, Request::indexPutSettings,
-                UpdateSettingsResponse::fromXContent, listener, emptySet(), headers);
-    }
-
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/Request.java

@@ -43,7 +43,6 @@
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
 import org.elasticsearch.action.bulk.BulkRequest;
@@ -599,7 +598,7 @@ static Request rollover(RolloverRequest rolloverRequest) throws IOException {
     }
 
     static Request indicesExist(GetIndexRequest request) {
-        // this can be called with no indices as argument by transport client, not via REST though
+        //this can be called with no indices as argument by transport client, not via REST though
         if (request.indices() == null || request.indices().length == 0) {
             throw new IllegalArgumentException("indices are mandatory");
         }
@@ -613,20 +612,6 @@ static Request indicesExist(GetIndexRequest request) {
         return new Request(HttpHead.METHOD_NAME, endpoint, params.getParams(), null);
     }
 
-    static Request indexPutSettings(UpdateSettingsRequest updateSettingsRequest) throws IOException {
-        Params parameters = Params.builder();
-        parameters.withTimeout(updateSettingsRequest.timeout());
-        parameters.withMasterTimeout(updateSettingsRequest.masterNodeTimeout());
-        parameters.withIndicesOptions(updateSettingsRequest.indicesOptions());
-        parameters.withFlatSettings(updateSettingsRequest.flatSettings());
-        parameters.withPreserveExisting(updateSettingsRequest.isPreserveExisting());
-
-        String[] indices = updateSettingsRequest.indices() == null ? Strings.EMPTY_ARRAY : updateSettingsRequest.indices();
-        String endpoint = endpoint(indices, "_settings");
-        HttpEntity entity = createEntity(updateSettingsRequest, REQUEST_BODY_CONTENT_TYPE);
-        return new Request(HttpPut.METHOD_NAME, endpoint, parameters.getParams(), entity);
-    }
-
     private static HttpEntity createEntity(ToXContent toXContent, XContentType xContentType) throws IOException {
         BytesRef source = XContentHelper.toXContent(toXContent, xContentType, false).toBytesRef();
         return new ByteArrayEntity(source.bytes, source.offset, source.length, createContentType(xContentType));
@@ -848,13 +833,6 @@ Params withIncludeDefaults(boolean includeDefaults) {
             return this;
         }
 
-        Params withPreserveExisting(boolean preserveExisting) {
-            if (preserveExisting) {
-                return putParam("preserve_existing", Boolean.TRUE.toString());
-            }
-            return this;
-        }
-
         Map<String, String> getParams() {
             return Collections.unmodifiableMap(params);
         }

client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java

@@ -49,25 +49,20 @@
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsResponse;
 import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.action.support.broadcast.BroadcastResponse;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
-import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.ByteSizeUnit;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.rest.RestStatus;
 
 import java.io.IOException;
@@ -77,7 +72,6 @@
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.startsWith;
 
 public class IndicesClientIT extends ESRestHighLevelClientTestCase {
 
@@ -615,97 +609,4 @@ public void testRollover() throws IOException {
             assertEquals("test_new", rolloverResponse.getNewIndex());
         }
     }
-
-    public void testIndexPutSettings() throws IOException {
-
-        final Setting<Integer> dynamicSetting = IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING;
-        final String dynamicSettingKey = IndexMetaData.SETTING_NUMBER_OF_REPLICAS;
-        final int dynamicSettingValue = 0;
-
-        final Setting<String> staticSetting = IndexSettings.INDEX_CHECK_ON_STARTUP;
-        final String staticSettingKey = IndexSettings.INDEX_CHECK_ON_STARTUP.getKey();
-        final String staticSettingValue = "true";
-
-        final Setting<Integer> unmodifiableSetting = IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING;
-        final String unmodifiableSettingKey = IndexMetaData.SETTING_NUMBER_OF_SHARDS;
-        final int unmodifiableSettingValue = 3;
-
-        String index = "index";
-        createIndex(index, Settings.EMPTY);
-
-        assertThat(dynamicSetting.getDefault(Settings.EMPTY), not(dynamicSettingValue));
-        UpdateSettingsRequest dynamicSettingRequest = new UpdateSettingsRequest();
-        dynamicSettingRequest.settings(Settings.builder().put(dynamicSettingKey, dynamicSettingValue).build());
-        UpdateSettingsResponse response = execute(dynamicSettingRequest, highLevelClient().indices()::putSettings,
-                highLevelClient().indices()::putSettingsAsync);
-
-        assertTrue(response.isAcknowledged());
-        Map<String, Object> indexSettingsAsMap = getIndexSettingsAsMap(index);
-        assertThat(indexSettingsAsMap.get(dynamicSettingKey), equalTo(String.valueOf(dynamicSettingValue)));
-
-        assertThat(staticSetting.getDefault(Settings.EMPTY), not(staticSettingValue));
-        UpdateSettingsRequest staticSettingRequest = new UpdateSettingsRequest();
-        staticSettingRequest.settings(Settings.builder().put(staticSettingKey, staticSettingValue).build());
-        ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> execute(staticSettingRequest,
-                highLevelClient().indices()::putSettings, highLevelClient().indices()::putSettingsAsync));
-        assertThat(exception.getMessage(),
-                startsWith("Elasticsearch exception [type=illegal_argument_exception, "
-                        + "reason=Can't update non dynamic settings [[index.shard.check_on_startup]] for open indices [[index/"));
-
-        indexSettingsAsMap = getIndexSettingsAsMap(index);
-        assertNull(indexSettingsAsMap.get(staticSettingKey));
-
-        closeIndex(index);
-        response = execute(staticSettingRequest, highLevelClient().indices()::putSettings,
-                highLevelClient().indices()::putSettingsAsync);
-        assertTrue(response.isAcknowledged());
-        openIndex(index);
-        indexSettingsAsMap = getIndexSettingsAsMap(index);
-        assertThat(indexSettingsAsMap.get(staticSettingKey), equalTo(staticSettingValue));
-
-        assertThat(unmodifiableSetting.getDefault(Settings.EMPTY), not(unmodifiableSettingValue));
-        UpdateSettingsRequest unmodifiableSettingRequest = new UpdateSettingsRequest();
-        unmodifiableSettingRequest.settings(Settings.builder().put(unmodifiableSettingKey, unmodifiableSettingValue).build());
-        exception = expectThrows(ElasticsearchException.class, () -> execute(unmodifiableSettingRequest,
-                highLevelClient().indices()::putSettings, highLevelClient().indices()::putSettingsAsync));
-        assertThat(exception.getMessage(), startsWith(
-                "Elasticsearch exception [type=illegal_argument_exception, "
-                + "reason=Can't update non dynamic settings [[index.number_of_shards]] for open indices [[index/"));
-        closeIndex(index);
-        exception = expectThrows(ElasticsearchException.class, () -> execute(unmodifiableSettingRequest,
-                highLevelClient().indices()::putSettings, highLevelClient().indices()::putSettingsAsync));
-        assertThat(exception.getMessage(), startsWith(
-                "Elasticsearch exception [type=illegal_argument_exception, "
-                + "reason=final index setting [index.number_of_shards], not updateable"));
-    }
-
-    @SuppressWarnings("unchecked")
-    private Map<String, Object> getIndexSettingsAsMap(String index) throws IOException {
-        Map<String, Object> indexSettings = getIndexSettings(index);
-        return (Map<String, Object>)((Map<String, Object>) indexSettings.get(index)).get("settings");
-    }
-
-    public void testIndexPutSettingNonExistent() throws IOException {
-
-        String index = "index";
-        UpdateSettingsRequest indexUpdateSettingsRequest = new UpdateSettingsRequest(index);
-        String setting = "no_idea_what_you_are_talking_about";
-        int value = 10;
-        indexUpdateSettingsRequest.settings(Settings.builder().put(setting, value).build());
-
-        ElasticsearchException exception = expectThrows(ElasticsearchException.class, () -> execute(indexUpdateSettingsRequest,
-                highLevelClient().indices()::putSettings, highLevelClient().indices()::putSettingsAsync));
-        assertEquals(RestStatus.NOT_FOUND, exception.status());
-        assertThat(exception.getMessage(), equalTo("Elasticsearch exception [type=index_not_found_exception, reason=no such index]"));
-
-        createIndex(index, Settings.EMPTY);
-        exception = expectThrows(ElasticsearchException.class, () -> execute(indexUpdateSettingsRequest,
-                highLevelClient().indices()::putSettings, highLevelClient().indices()::putSettingsAsync));
-        assertThat(exception.status(), equalTo(RestStatus.BAD_REQUEST));
-        assertThat(exception.getMessage(), equalTo(
-                "Elasticsearch exception [type=illegal_argument_exception, "
-                + "reason=unknown setting [index.no_idea_what_you_are_talking_about] please check that any required plugins are installed, "
-                + "or check the breaking changes documentation for removed settings]"));
-    }
-
 }

client/rest-high-level/src/test/java/org/elasticsearch/client/RequestTests.java

@@ -46,7 +46,6 @@
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
-import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
 import org.elasticsearch.action.admin.indices.shrink.ResizeType;
 import org.elasticsearch.action.bulk.BulkRequest;
@@ -1364,33 +1363,6 @@ public void testRollover() throws IOException {
         assertEquals(expectedParams, request.getParameters());
     }
 
-    public void testIndexPutSettings() throws IOException {
-        String[] indices = randomBoolean() ? null : randomIndicesNames(0, 2);
-        UpdateSettingsRequest updateSettingsRequest = new UpdateSettingsRequest(indices);
-        Map<String, String> expectedParams = new HashMap<>();
-        setRandomFlatSettings(updateSettingsRequest::flatSettings, expectedParams);
-        setRandomMasterTimeout(updateSettingsRequest, expectedParams);
-        setRandomTimeout(updateSettingsRequest::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
-        setRandomIndicesOptions(updateSettingsRequest::indicesOptions, updateSettingsRequest::indicesOptions, expectedParams);
-        if (randomBoolean()) {
-            updateSettingsRequest.setPreserveExisting(randomBoolean());
-            if (updateSettingsRequest.isPreserveExisting()) {
-                expectedParams.put("preserve_existing", "true");
-            }
-        }
-
-        Request request = Request.indexPutSettings(updateSettingsRequest);
-        StringJoiner endpoint = new StringJoiner("/", "/", "");
-        if (indices != null && indices.length > 0) {
-            endpoint.add(String.join(",", indices));
-        }
-        endpoint.add("_settings");
-        assertThat(endpoint.toString(), equalTo(request.getEndpoint()));
-        assertEquals(HttpPut.METHOD_NAME, request.getMethod());
-        assertToXContentBody(updateSettingsRequest, request.getEntity());
-        assertEquals(expectedParams, request.getParameters());
-    }
-
     private static void assertToXContentBody(ToXContent expectedBody, HttpEntity actualEntity) throws IOException {
         BytesReference expectedBytes = XContentHelper.toXContent(expectedBody, REQUEST_BODY_CONTENT_TYPE, false);
         assertEquals(XContentType.JSON.mediaTypeWithoutParameters(), actualEntity.getContentType().getValue());