[7.x] Rename indexlifecycle to ilm and snapshotlifecycle to sl… (#44977)

* Rename indexlifecycle to ilm and snapshotlifecycle to slm (#44917) As a followup to #44725 and #44608, which renamed the packages within the x-pack project, this renames the packages within the core x-pack project. It also renames 'snapshotlifecycle' within the HLRC to slm. * Fix one more import
elastic · Jul 29, 2019 · 598c4e7 · 598c4e7
1 parent 4813728
commit 598c4e7
Show file tree

Hide file tree

Showing 260 changed files with 838 additions and 838 deletions.
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java
@@ -34,12 +34,12 @@
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
-import org.elasticsearch.client.snapshotlifecycle.DeleteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.ExecuteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.ExecuteSnapshotLifecyclePolicyResponse;
-import org.elasticsearch.client.snapshotlifecycle.GetSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.GetSnapshotLifecyclePolicyResponse;
-import org.elasticsearch.client.snapshotlifecycle.PutSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.DeleteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyResponse;
+import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyResponse;
+import org.elasticsearch.client.slm.PutSnapshotLifecyclePolicyRequest;
 
 import java.io.IOException;
 

diff --git a/...st-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleRequestConverters.java b/...st-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleRequestConverters.java
@@ -32,10 +32,10 @@
 import org.elasticsearch.client.indexlifecycle.RetryLifecyclePolicyRequest;
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
-import org.elasticsearch.client.snapshotlifecycle.DeleteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.ExecuteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.GetSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.PutSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.DeleteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.PutSnapshotLifecyclePolicyRequest;
 import org.elasticsearch.common.Strings;
 
 import java.io.IOException;

diff --git a/...DeleteSnapshotLifecyclePolicyRequest.java → ...DeleteSnapshotLifecyclePolicyRequest.java b/...DeleteSnapshotLifecyclePolicyRequest.java → ...DeleteSnapshotLifecyclePolicyRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.client.TimedRequest;
 

diff --git a/...xecuteSnapshotLifecyclePolicyRequest.java → ...xecuteSnapshotLifecyclePolicyRequest.java b/...xecuteSnapshotLifecyclePolicyRequest.java → ...xecuteSnapshotLifecyclePolicyRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.client.TimedRequest;
 

diff --git a/...ecuteSnapshotLifecyclePolicyResponse.java → ...ecuteSnapshotLifecyclePolicyResponse.java b/...ecuteSnapshotLifecyclePolicyResponse.java → ...ecuteSnapshotLifecyclePolicyResponse.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;

diff --git a/...le/GetSnapshotLifecyclePolicyRequest.java → ...lm/GetSnapshotLifecyclePolicyRequest.java b/...le/GetSnapshotLifecyclePolicyRequest.java → ...lm/GetSnapshotLifecyclePolicyRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.client.TimedRequest;
 

diff --git a/...e/GetSnapshotLifecyclePolicyResponse.java → ...m/GetSnapshotLifecyclePolicyResponse.java b/...e/GetSnapshotLifecyclePolicyResponse.java → ...m/GetSnapshotLifecyclePolicyResponse.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;

diff --git a/...le/PutSnapshotLifecyclePolicyRequest.java → ...lm/PutSnapshotLifecyclePolicyRequest.java b/...le/PutSnapshotLifecyclePolicyRequest.java → ...lm/PutSnapshotLifecyclePolicyRequest.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.client.TimedRequest;
 import org.elasticsearch.common.xcontent.ToXContentObject;

diff --git a/...otlifecycle/SnapshotInvocationRecord.java → .../client/slm/SnapshotInvocationRecord.java b/...otlifecycle/SnapshotInvocationRecord.java → .../client/slm/SnapshotInvocationRecord.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;

diff --git a/...hotlifecycle/SnapshotLifecyclePolicy.java → ...h/client/slm/SnapshotLifecyclePolicy.java b/...hotlifecycle/SnapshotLifecyclePolicy.java → ...h/client/slm/SnapshotLifecyclePolicy.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;

diff --git a/...ycle/SnapshotLifecyclePolicyMetadata.java → .../slm/SnapshotLifecyclePolicyMetadata.java b/...ycle/SnapshotLifecyclePolicyMetadata.java → .../slm/SnapshotLifecyclePolicyMetadata.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.client.snapshotlifecycle;
+package org.elasticsearch.client.slm;
 
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.ParseField;

diff --git a/...t-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java b/...t-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
@@ -54,15 +54,15 @@
 import org.elasticsearch.client.indexlifecycle.StartILMRequest;
 import org.elasticsearch.client.indexlifecycle.StopILMRequest;
 import org.elasticsearch.client.indices.CreateIndexRequest;
-import org.elasticsearch.client.snapshotlifecycle.DeleteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.ExecuteSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.ExecuteSnapshotLifecyclePolicyResponse;
-import org.elasticsearch.client.snapshotlifecycle.GetSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.GetSnapshotLifecyclePolicyResponse;
-import org.elasticsearch.client.snapshotlifecycle.PutSnapshotLifecyclePolicyRequest;
-import org.elasticsearch.client.snapshotlifecycle.SnapshotInvocationRecord;
-import org.elasticsearch.client.snapshotlifecycle.SnapshotLifecyclePolicy;
-import org.elasticsearch.client.snapshotlifecycle.SnapshotLifecyclePolicyMetadata;
+import org.elasticsearch.client.slm.DeleteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.ExecuteSnapshotLifecyclePolicyResponse;
+import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.GetSnapshotLifecyclePolicyResponse;
+import org.elasticsearch.client.slm.PutSnapshotLifecyclePolicyRequest;
+import org.elasticsearch.client.slm.SnapshotInvocationRecord;
+import org.elasticsearch.client.slm.SnapshotLifecyclePolicy;
+import org.elasticsearch.client.slm.SnapshotLifecyclePolicyMetadata;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.ImmutableOpenMap;

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClient.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClient.java
@@ -18,7 +18,7 @@
 import org.elasticsearch.xpack.core.action.XPackInfoRequestBuilder;
 import org.elasticsearch.xpack.core.ccr.client.CcrClient;
 import org.elasticsearch.xpack.core.frozen.action.FreezeIndexAction;
-import org.elasticsearch.xpack.core.indexlifecycle.client.ILMClient;
+import org.elasticsearch.xpack.core.ilm.client.ILMClient;
 import org.elasticsearch.xpack.core.ml.client.MachineLearningClient;
 import org.elasticsearch.xpack.core.monitoring.client.MonitoringClient;
 import org.elasticsearch.xpack.core.security.client.SecurityClient;

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java
@@ -61,27 +61,27 @@
 import org.elasticsearch.xpack.core.frozen.action.FreezeIndexAction;
 import org.elasticsearch.xpack.core.graph.GraphFeatureSetUsage;
 import org.elasticsearch.xpack.core.graph.action.GraphExploreAction;
-import org.elasticsearch.xpack.core.indexlifecycle.AllocateAction;
-import org.elasticsearch.xpack.core.indexlifecycle.DeleteAction;
-import org.elasticsearch.xpack.core.indexlifecycle.ForceMergeAction;
-import org.elasticsearch.xpack.core.indexlifecycle.FreezeAction;
-import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleFeatureSetUsage;
-import org.elasticsearch.xpack.core.indexlifecycle.IndexLifecycleMetadata;
-import org.elasticsearch.xpack.core.indexlifecycle.LifecycleAction;
-import org.elasticsearch.xpack.core.indexlifecycle.LifecycleType;
-import org.elasticsearch.xpack.core.indexlifecycle.ReadOnlyAction;
-import org.elasticsearch.xpack.core.indexlifecycle.RolloverAction;
-import org.elasticsearch.xpack.core.indexlifecycle.SetPriorityAction;
-import org.elasticsearch.xpack.core.indexlifecycle.ShrinkAction;
-import org.elasticsearch.xpack.core.indexlifecycle.TimeseriesLifecycleType;
-import org.elasticsearch.xpack.core.indexlifecycle.UnfollowAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.DeleteLifecycleAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.ExplainLifecycleAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.GetLifecycleAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.MoveToStepAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.PutLifecycleAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.RemoveIndexLifecyclePolicyAction;
-import org.elasticsearch.xpack.core.indexlifecycle.action.RetryAction;
+import org.elasticsearch.xpack.core.ilm.AllocateAction;
+import org.elasticsearch.xpack.core.ilm.DeleteAction;
+import org.elasticsearch.xpack.core.ilm.ForceMergeAction;
+import org.elasticsearch.xpack.core.ilm.FreezeAction;
+import org.elasticsearch.xpack.core.ilm.IndexLifecycleFeatureSetUsage;
+import org.elasticsearch.xpack.core.ilm.IndexLifecycleMetadata;
+import org.elasticsearch.xpack.core.ilm.LifecycleAction;
+import org.elasticsearch.xpack.core.ilm.LifecycleType;
+import org.elasticsearch.xpack.core.ilm.ReadOnlyAction;
+import org.elasticsearch.xpack.core.ilm.RolloverAction;
+import org.elasticsearch.xpack.core.ilm.SetPriorityAction;
+import org.elasticsearch.xpack.core.ilm.ShrinkAction;
+import org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType;
+import org.elasticsearch.xpack.core.ilm.UnfollowAction;
+import org.elasticsearch.xpack.core.ilm.action.DeleteLifecycleAction;
+import org.elasticsearch.xpack.core.ilm.action.ExplainLifecycleAction;
+import org.elasticsearch.xpack.core.ilm.action.GetLifecycleAction;
+import org.elasticsearch.xpack.core.ilm.action.MoveToStepAction;
+import org.elasticsearch.xpack.core.ilm.action.PutLifecycleAction;
+import org.elasticsearch.xpack.core.ilm.action.RemoveIndexLifecyclePolicyAction;
+import org.elasticsearch.xpack.core.ilm.action.RetryAction;
 import org.elasticsearch.xpack.core.logstash.LogstashFeatureSetUsage;
 import org.elasticsearch.xpack.core.ml.MachineLearningFeatureSetUsage;
 import org.elasticsearch.xpack.core.ml.MlMetadata;
@@ -202,6 +202,11 @@
 import org.elasticsearch.xpack.core.security.authz.privilege.ConditionalClusterPrivilege;
 import org.elasticsearch.xpack.core.security.authz.privilege.ConditionalClusterPrivileges;
 import org.elasticsearch.xpack.core.security.transport.netty4.SecurityNetty4Transport;
+import org.elasticsearch.xpack.core.slm.SnapshotLifecycleMetadata;
+import org.elasticsearch.xpack.core.slm.action.DeleteSnapshotLifecycleAction;
+import org.elasticsearch.xpack.core.slm.action.ExecuteSnapshotLifecycleAction;
+import org.elasticsearch.xpack.core.slm.action.GetSnapshotLifecycleAction;
+import org.elasticsearch.xpack.core.slm.action.PutSnapshotLifecycleAction;
 import org.elasticsearch.xpack.core.sql.SqlFeatureSetUsage;
 import org.elasticsearch.xpack.core.ssl.SSLService;
 import org.elasticsearch.xpack.core.ssl.action.GetCertificateInfoAction;
@@ -219,11 +224,6 @@
 import org.elasticsearch.xpack.core.watcher.transport.actions.put.PutWatchAction;
 import org.elasticsearch.xpack.core.watcher.transport.actions.service.WatcherServiceAction;
 import org.elasticsearch.xpack.core.watcher.transport.actions.stats.WatcherStatsAction;
-import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecycleMetadata;
-import org.elasticsearch.xpack.core.snapshotlifecycle.action.DeleteSnapshotLifecycleAction;
-import org.elasticsearch.xpack.core.snapshotlifecycle.action.ExecuteSnapshotLifecycleAction;
-import org.elasticsearch.xpack.core.snapshotlifecycle.action.GetSnapshotLifecycleAction;
-import org.elasticsearch.xpack.core.snapshotlifecycle.action.PutSnapshotLifecycleAction;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...xlifecycle/AbstractUnfollowIndexStep.java → ...k/core/ilm/AbstractUnfollowIndexStep.java b/...xlifecycle/AbstractUnfollowIndexStep.java → ...k/core/ilm/AbstractUnfollowIndexStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterState;
@@ -12,7 +12,7 @@
 
 import java.util.Map;
 
-import static org.elasticsearch.xpack.core.indexlifecycle.UnfollowAction.CCR_METADATA_KEY;
+import static org.elasticsearch.xpack.core.ilm.UnfollowAction.CCR_METADATA_KEY;
 
 abstract class AbstractUnfollowIndexStep extends AsyncActionStep {
 

diff --git a/...k/core/indexlifecycle/AllocateAction.java → ...search/xpack/core/ilm/AllocateAction.java b/...k/core/indexlifecycle/AllocateAction.java → ...search/xpack/core/ilm/AllocateAction.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -15,7 +15,7 @@
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.xpack.core.indexlifecycle.Step.StepKey;
+import org.elasticsearch.xpack.core.ilm.Step.StepKey;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/.../indexlifecycle/AllocationRoutedStep.java → .../xpack/core/ilm/AllocationRoutedStep.java b/.../indexlifecycle/AllocationRoutedStep.java → .../xpack/core/ilm/AllocationRoutedStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
 

diff --git a/.../core/indexlifecycle/AsyncActionStep.java → ...earch/xpack/core/ilm/AsyncActionStep.java b/.../core/indexlifecycle/AsyncActionStep.java → ...earch/xpack/core/ilm/AsyncActionStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.ClusterState;

diff --git a/...e/AsyncRetryDuringSnapshotActionStep.java → ...m/AsyncRetryDuringSnapshotActionStep.java b/...e/AsyncRetryDuringSnapshotActionStep.java → ...m/AsyncRetryDuringSnapshotActionStep.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...ck/core/indexlifecycle/AsyncWaitStep.java → ...csearch/xpack/core/ilm/AsyncWaitStep.java b/...ck/core/indexlifecycle/AsyncWaitStep.java → ...csearch/xpack/core/ilm/AsyncWaitStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.IndexMetaData;

diff --git a/...ck/core/indexlifecycle/BranchingStep.java → ...csearch/xpack/core/ilm/BranchingStep.java b/...ck/core/indexlifecycle/BranchingStep.java → ...csearch/xpack/core/ilm/BranchingStep.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/.../indexlifecycle/CheckShrinkReadyStep.java → .../xpack/core/ilm/CheckShrinkReadyStep.java b/.../indexlifecycle/CheckShrinkReadyStep.java → .../xpack/core/ilm/CheckShrinkReadyStep.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

diff --git a/...ndexlifecycle/CloseFollowerIndexStep.java → ...pack/core/ilm/CloseFollowerIndexStep.java b/...ndexlifecycle/CloseFollowerIndexStep.java → ...pack/core/ilm/CloseFollowerIndexStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.close.CloseIndexRequest;
@@ -13,7 +13,7 @@
 
 import java.util.Map;
 
-import static org.elasticsearch.xpack.core.indexlifecycle.UnfollowAction.CCR_METADATA_KEY;
+import static org.elasticsearch.xpack.core.ilm.UnfollowAction.CCR_METADATA_KEY;
 
 final class CloseFollowerIndexStep extends AsyncRetryDuringSnapshotActionStep {
 

diff --git a/...ndexlifecycle/ClusterStateActionStep.java → ...pack/core/ilm/ClusterStateActionStep.java b/...ndexlifecycle/ClusterStateActionStep.java → ...pack/core/ilm/ClusterStateActionStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.index.Index;

diff --git a/.../indexlifecycle/ClusterStateWaitStep.java → .../xpack/core/ilm/ClusterStateWaitStep.java b/.../indexlifecycle/ClusterStateWaitStep.java → .../xpack/core/ilm/ClusterStateWaitStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.xcontent.ToXContentObject;

diff --git a/...ndexlifecycle/CopyExecutionStateStep.java → ...pack/core/ilm/CopyExecutionStateStep.java b/...ndexlifecycle/CopyExecutionStateStep.java → ...pack/core/ilm/CopyExecutionStateStep.java
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -15,7 +15,7 @@
 
 import java.util.Objects;
 
-import static org.elasticsearch.xpack.core.indexlifecycle.LifecycleExecutionState.ILM_CUSTOM_METADATA_KEY;
+import static org.elasticsearch.xpack.core.ilm.LifecycleExecutionState.ILM_CUSTOM_METADATA_KEY;
 
 /**
  * Copies the execution state data from one index to another, typically after a
@@ -25,7 +25,7 @@ public class CopyExecutionStateStep extends ClusterStateActionStep {
     public static final String NAME = "copy-execution-state";
 
     private static final Logger logger = LogManager.getLogger(CopyExecutionStateStep.class);
-    
+
     private String shrunkIndexPrefix;
 
 

diff --git a/...ack/core/indexlifecycle/DeleteAction.java → ...icsearch/xpack/core/ilm/DeleteAction.java b/...ack/core/indexlifecycle/DeleteAction.java → ...icsearch/xpack/core/ilm/DeleteAction.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.Strings;

diff --git a/...xpack/core/indexlifecycle/DeleteStep.java → ...sticsearch/xpack/core/ilm/DeleteStep.java b/...xpack/core/indexlifecycle/DeleteStep.java → ...sticsearch/xpack/core/ilm/DeleteStep.java
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-package org.elasticsearch.xpack.core.indexlifecycle;
+package org.elasticsearch.xpack.core.ilm;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;