remove ILM API remove_policy

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

@@ -30,8 +30,6 @@
 import org.elasticsearch.client.indexlifecycle.LifecycleManagementStatusResponse;
 import org.elasticsearch.client.indexlifecycle.PutLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyResponse;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
 
@@ -133,35 +131,6 @@ public void deleteLifecyclePolicyAsync(DeleteLifecyclePolicyRequest request, Req
             AcknowledgedResponse::fromXContent, listener, emptySet());
     }
 
-    /**
-     * Remove the index lifecycle policy for an index
-     * See <a href="https://fix-me-when-we-have-docs.com">
-     * the docs</a> for more.
-     * @param request the request
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @return the response
-     * @throws IOException in case there is a problem sending the request or parsing back the response
-     */
-    public RemoveIndexLifecyclePolicyResponse removeIndexLifecyclePolicy(RemoveIndexLifecyclePolicyRequest request,
-            RequestOptions options) throws IOException {
-        return restHighLevelClient.performRequestAndParseEntity(request, RequestConverters::removeIndexLifecyclePolicy, options,
-                RemoveIndexLifecyclePolicyResponse::fromXContent, emptySet());
-    }
-
-    /**
-     * Asynchronously remove the index lifecycle policy for an index
-     * See <a href="https://fix-me-when-we-have-docs.com">
-     * the docs</a> for more.
-     * @param request the request
-     * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
-     * @param listener the listener to be notified upon request completion
-     */
-    public void removeIndexLifecyclePolicyAsync(RemoveIndexLifecyclePolicyRequest request, RequestOptions options,
-            ActionListener<RemoveIndexLifecyclePolicyResponse> listener) {
-        restHighLevelClient.performRequestAsyncAndParseEntity(request, RequestConverters::removeIndexLifecyclePolicy, options,
-                RemoveIndexLifecyclePolicyResponse::fromXContent, listener, emptySet());
-    }
-
     /**
      * Start the Index Lifecycle Management feature.
      * See <a href="https://fix-me-when-we-have-docs.com">

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

@@ -56,7 +56,6 @@
 import org.elasticsearch.client.indexlifecycle.LifecycleManagementStatusRequest;
 import org.elasticsearch.client.indexlifecycle.PutLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
 import org.elasticsearch.client.security.RefreshPolicy;
@@ -640,20 +639,6 @@ static Request deleteLifecyclePolicy(DeleteLifecyclePolicyRequest deleteLifecycl
         return request;
     }
 
-    static Request removeIndexLifecyclePolicy(RemoveIndexLifecyclePolicyRequest removePolicyRequest) {
-        String[] indices = removePolicyRequest.indices() == null ?
-                Strings.EMPTY_ARRAY : removePolicyRequest.indices().toArray(new String[] {});
-        Request request = new Request(HttpDelete.METHOD_NAME,
-                new EndpointBuilder()
-                        .addCommaSeparatedPathParts(indices)
-                        .addPathPartAsIs("_ilm")
-                        .build());
-        Params params = new Params(request);
-        params.withIndicesOptions(removePolicyRequest.indicesOptions());
-        params.withMasterTimeout(removePolicyRequest.masterNodeTimeout());
-        return request;
-    }
-
     static Request startILM(StartILMRequest startILMRequest) {
         Request request = new Request(HttpPost.METHOD_NAME,
             new EndpointBuilder()

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

@@ -20,8 +20,6 @@
 package org.elasticsearch.client;
 
 import org.elasticsearch.ElasticsearchStatusException;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
-import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.indexlifecycle.AllocateAction;
 import org.elasticsearch.client.indexlifecycle.DeleteAction;
@@ -42,8 +40,6 @@
 import org.elasticsearch.client.indexlifecycle.PhaseExecutionInfo;
 import org.elasticsearch.client.indexlifecycle.PutLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyResponse;
 import org.elasticsearch.client.indexlifecycle.RolloverAction;
 import org.elasticsearch.client.indexlifecycle.ShrinkAction;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
@@ -53,7 +49,6 @@
 import org.hamcrest.Matchers;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -69,39 +64,6 @@
 
 public class IndexLifecycleIT extends ESRestHighLevelClientTestCase {
 
-    public void testRemoveIndexLifecyclePolicy() throws Exception {
-        String policyName = randomAlphaOfLength(10);
-        LifecyclePolicy policy = createRandomPolicy(policyName);
-        PutLifecyclePolicyRequest putRequest = new PutLifecyclePolicyRequest(policy);
-        assertAcked(execute(putRequest, highLevelClient().indexLifecycle()::putLifecyclePolicy,
-                highLevelClient().indexLifecycle()::putLifecyclePolicyAsync));
-
-        createIndex("foo", Settings.builder().put("index.lifecycle.name", policyName).build());
-        createIndex("baz", Settings.builder().put("index.lifecycle.name", policyName).build());
-        createIndex("rbh", Settings.builder().put("index.lifecycle.name", policyName).build());
-
-        GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices("foo", "baz", "rbh");
-        GetSettingsResponse settingsResponse = highLevelClient().indices().getSettings(getSettingsRequest, RequestOptions.DEFAULT);
-        assertThat(settingsResponse.getSetting("foo", "index.lifecycle.name"), equalTo(policyName));
-        assertThat(settingsResponse.getSetting("baz", "index.lifecycle.name"), equalTo(policyName));
-        assertThat(settingsResponse.getSetting("rbh", "index.lifecycle.name"), equalTo(policyName));
-
-        List<String> indices = new ArrayList<>();
-        indices.add("foo");
-        indices.add("rbh");
-        RemoveIndexLifecyclePolicyRequest removeReq = new RemoveIndexLifecyclePolicyRequest(indices);
-        RemoveIndexLifecyclePolicyResponse removeResp = execute(removeReq, highLevelClient().indexLifecycle()::removeIndexLifecyclePolicy,
-                highLevelClient().indexLifecycle()::removeIndexLifecyclePolicyAsync);
-        assertThat(removeResp.hasFailures(), is(false));
-        assertThat(removeResp.getFailedIndexes().isEmpty(), is(true));
-
-        getSettingsRequest = new GetSettingsRequest().indices("foo", "baz", "rbh");
-        settingsResponse = highLevelClient().indices().getSettings(getSettingsRequest, RequestOptions.DEFAULT);
-        assertNull(settingsResponse.getSetting("foo", "index.lifecycle.name"));
-        assertThat(settingsResponse.getSetting("baz", "index.lifecycle.name"), equalTo(policyName));
-        assertNull(settingsResponse.getSetting("rbh", "index.lifecycle.name"));
-    }
-
     public void testStartStopILM() throws Exception {
         String policyName = randomAlphaOfLength(10);
         LifecyclePolicy policy = createRandomPolicy(policyName);

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

@@ -62,7 +62,6 @@
 import org.elasticsearch.client.indexlifecycle.LifecyclePolicy;
 import org.elasticsearch.client.indexlifecycle.PutLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
-import org.elasticsearch.client.indexlifecycle.RemoveIndexLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
 import org.elasticsearch.common.CheckedBiConsumer;
@@ -1509,20 +1508,6 @@ public void testDeleteLifecycle() {
         assertEquals(request.getParameters(), expectedParams);
     }
 
-    public void testRemoveIndexLifecyclePolicy() {
-        Map<String, String> expectedParams = new HashMap<>();
-        String[] indices = randomIndicesNames(0, 10);
-        IndicesOptions indicesOptions = setRandomIndicesOptions(IndicesOptions.strictExpandOpen(), expectedParams);
-        RemoveIndexLifecyclePolicyRequest req = new RemoveIndexLifecyclePolicyRequest(Arrays.asList(indices), indicesOptions);
-        setRandomMasterTimeout(req::setMasterTimeout, TimedRequest.DEFAULT_MASTER_NODE_TIMEOUT, expectedParams);
-
-        Request request = RequestConverters.removeIndexLifecyclePolicy(req);
-        assertThat(request.getMethod(), equalTo(HttpDelete.METHOD_NAME));
-        String idxString = Strings.arrayToCommaDelimitedString(indices);
-        assertThat(request.getEndpoint(), equalTo("/" + (idxString.isEmpty() ? "" : (idxString + "/")) + "_ilm"));
-        assertThat(request.getParameters(), equalTo(expectedParams));
-    }
-
     public void testStartILM() throws Exception {
         StartILMRequest req = new StartILMRequest();
         Map<String, String> expectedParams = new HashMap<>();