From 524cac8cc42670bc2af2b5f101cb61416a6e2542 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Fri, 19 Jul 2019 15:33:05 +0900 Subject: [PATCH] Rename SLM package to slm This commit renames the SLM package from snapshotlifecycle to slm. We have all come to know index lifecycle management as ILM, the APIs and settings use ilm, and it would be nice of the package did too. For SLM, let's use slm for all of these including the package name from the beginning. --- .../action/package-info.java | 2 +- .../core/snapshotlifecycle/package-info.java | 2 +- .../SnapshotLifecycleIT.java | 2 +- .../xpack/indexlifecycle/IndexLifecycle.java | 20 +++++++++---------- .../SnapshotLifecycleService.java | 2 +- .../SnapshotLifecycleTask.java | 2 +- .../RestDeleteSnapshotLifecycleAction.java | 2 +- .../RestExecuteSnapshotLifecycleAction.java | 2 +- .../RestGetSnapshotLifecycleAction.java | 2 +- .../RestPutSnapshotLifecycleAction.java | 2 +- ...ransportDeleteSnapshotLifecycleAction.java | 2 +- ...ansportExecuteSnapshotLifecycleAction.java | 6 +++--- .../TransportGetSnapshotLifecycleAction.java | 2 +- .../TransportPutSnapshotLifecycleAction.java | 4 ++-- .../action/package-info.java | 12 +++++------ .../package-info.java | 14 ++++++------- .../SnapshotLifecyclePolicyTests.java | 2 +- .../SnapshotLifecycleServiceTests.java | 2 +- .../SnapshotLifecycleTaskTests.java | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) rename x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecycleIT.java (99%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecycleService.java (99%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecycleTask.java (99%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/RestDeleteSnapshotLifecycleAction.java (96%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/RestExecuteSnapshotLifecycleAction.java (96%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/RestGetSnapshotLifecycleAction.java (96%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/RestPutSnapshotLifecycleAction.java (96%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/TransportDeleteSnapshotLifecycleAction.java (98%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/TransportExecuteSnapshotLifecycleAction.java (95%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/TransportGetSnapshotLifecycleAction.java (98%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/TransportPutSnapshotLifecycleAction.java (98%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/action/package-info.java (59%) rename x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/package-info.java (73%) rename x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecyclePolicyTests.java (99%) rename x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecycleServiceTests.java (99%) rename x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/{snapshotlifecycle => slm}/SnapshotLifecycleTaskTests.java (99%) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/package-info.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/package-info.java index e929158564800..dbf13fe892421 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/package-info.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/action/package-info.java @@ -6,6 +6,6 @@ /** * Contains the action definitions for SLM. For the transport and rest action implementations, please see the {@code ilm} module's - * {@code org.elasticsearch.xpack.snapshotlifecycle} package. + * {@code org.elasticsearch.xpack.slm} package. */ package org.elasticsearch.xpack.core.snapshotlifecycle.action; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/package-info.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/package-info.java index 9d6da3ba228e1..e0ad866f734f0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/package-info.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/snapshotlifecycle/package-info.java @@ -7,7 +7,7 @@ /** * This is the Snapshot Lifecycle Management (SLM) core package. This package contains the core classes for SLM, including all of the * custom cluster state metadata objects, execution history storage facilities, and the action definitions. For the main SLM service - * implementation classes, please see the {@code ilm}ilm module's {@code org.elasticsearch.xpack.snapshotlifecycle} package. + * implementation classes, please see the {@code ilm}ilm module's {@code org.elasticsearch.xpack.slm} package. * *

Contained within this specific package are the custom metadata objects and models used through out the SLM service. The names can * be confusing, so it's important to know the differences between each metadata object. diff --git a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleIT.java similarity index 99% rename from x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java rename to x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleIT.java index f0996d7a0df1a..5ec97881eed4a 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleIT.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.apache.http.util.EntityUtils; import org.elasticsearch.action.index.IndexRequestBuilder; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycle.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycle.java index f346267f16b98..b18ab5b9ad591 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycle.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycle.java @@ -87,16 +87,16 @@ import org.elasticsearch.xpack.indexlifecycle.action.TransportRetryAction; import org.elasticsearch.xpack.indexlifecycle.action.TransportStartILMAction; import org.elasticsearch.xpack.indexlifecycle.action.TransportStopILMAction; -import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService; -import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask; -import org.elasticsearch.xpack.snapshotlifecycle.action.RestDeleteSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.RestExecuteSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.RestGetSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.RestPutSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.TransportDeleteSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.TransportExecuteSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.TransportGetSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.action.TransportPutSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.SnapshotLifecycleService; +import org.elasticsearch.xpack.slm.SnapshotLifecycleTask; +import org.elasticsearch.xpack.slm.action.RestDeleteSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.RestExecuteSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.RestGetSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.RestPutSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.TransportDeleteSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.TransportExecuteSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.TransportGetSnapshotLifecycleAction; +import org.elasticsearch.xpack.slm.action.TransportPutSnapshotLifecycleAction; import java.io.IOException; import java.time.Clock; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleService.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleService.java similarity index 99% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleService.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleService.java index b3acd88c855da..3a30a6b1827f7 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleService.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleService.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTask.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTask.java similarity index 99% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTask.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTask.java index a31942ad4774e..fd95485f8e736 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTask.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTask.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestDeleteSnapshotLifecycleAction.java similarity index 96% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestDeleteSnapshotLifecycleAction.java index 8f9b409778ec7..19634a4a72f27 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestDeleteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestDeleteSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestExecuteSnapshotLifecycleAction.java similarity index 96% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestExecuteSnapshotLifecycleAction.java index aeca7401fbec5..779f0a36daf3e 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestExecuteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestExecuteSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestGetSnapshotLifecycleAction.java similarity index 96% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestGetSnapshotLifecycleAction.java index 6196721abde6a..8140ffb1b156b 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestGetSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestGetSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.Strings; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestPutSnapshotLifecycleAction.java similarity index 96% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestPutSnapshotLifecycleAction.java index b59549011938a..5e363dc0b6267 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/RestPutSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/RestPutSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.elasticsearch.client.node.NodeClient; import org.elasticsearch.common.settings.Settings; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportDeleteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java similarity index 98% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportDeleteSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java index d07713ec291b0..a851550277895 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportDeleteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportDeleteSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionListener; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportExecuteSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java similarity index 95% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportExecuteSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java index 5cec7ab36bd74..61a3e24e753d2 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportExecuteSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportExecuteSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -27,8 +27,8 @@ import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecyclePolicyMetadata; import org.elasticsearch.xpack.core.snapshotlifecycle.action.ExecuteSnapshotLifecycleAction; import org.elasticsearch.xpack.core.snapshotlifecycle.history.SnapshotHistoryStore; -import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService; -import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask; +import org.elasticsearch.xpack.slm.SnapshotLifecycleService; +import org.elasticsearch.xpack.slm.SnapshotLifecycleTask; import java.io.IOException; import java.util.Optional; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportGetSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSnapshotLifecycleAction.java similarity index 98% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportGetSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSnapshotLifecycleAction.java index a04e73fb16002..39ab43b6fbf1d 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportGetSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportGetSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportPutSnapshotLifecycleAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportPutSnapshotLifecycleAction.java similarity index 98% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportPutSnapshotLifecycleAction.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportPutSnapshotLifecycleAction.java index 662489daf8e10..e7648784aec54 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/TransportPutSnapshotLifecycleAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/TransportPutSnapshotLifecycleAction.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,7 @@ import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecycleMetadata; import org.elasticsearch.xpack.core.snapshotlifecycle.SnapshotLifecyclePolicyMetadata; import org.elasticsearch.xpack.core.snapshotlifecycle.action.PutSnapshotLifecycleAction; -import org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService; +import org.elasticsearch.xpack.slm.SnapshotLifecycleService; import java.io.IOException; import java.time.Instant; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/package-info.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/package-info.java similarity index 59% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/package-info.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/package-info.java index 8c746a0bb5b5e..39267c93e366e 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/action/package-info.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/action/package-info.java @@ -7,14 +7,14 @@ /** * This package contains all the SLM Rest and Transport actions. * - *

The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportPutSnapshotLifecycleAction} creates or updates a snapshot - * lifecycle policy in the cluster state. The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportGetSnapshotLifecycleAction} - * simply retrieves a policy by id. The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportDeleteSnapshotLifecycleAction} + *

The {@link org.elasticsearch.xpack.slm.action.TransportPutSnapshotLifecycleAction} creates or updates a snapshot + * lifecycle policy in the cluster state. The {@link org.elasticsearch.xpack.slm.action.TransportGetSnapshotLifecycleAction} + * simply retrieves a policy by id. The {@link org.elasticsearch.xpack.slm.action.TransportDeleteSnapshotLifecycleAction} * removes a policy from the cluster state. These actions only interact with the cluster state. Most of the logic that take place in - * response to these actions happens on the master node in the {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService}. + * response to these actions happens on the master node in the {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService}. * - *

The {@link org.elasticsearch.xpack.snapshotlifecycle.action.TransportExecuteSnapshotLifecycleAction} operates as if the snapshot + *

The {@link org.elasticsearch.xpack.slm.action.TransportExecuteSnapshotLifecycleAction} operates as if the snapshot * policy given was immediately triggered by the scheduler. It does not interfere with any currently scheduled operations, it just runs * the snapshot operation ad hoc. */ -package org.elasticsearch.xpack.snapshotlifecycle.action; +package org.elasticsearch.xpack.slm.action; diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/package-info.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/package-info.java similarity index 73% rename from x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/package-info.java rename to x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/package-info.java index c6cc37bef9aea..e1f669ff333d8 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/snapshotlifecycle/package-info.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/slm/package-info.java @@ -8,30 +8,30 @@ * This is the Snapshot Lifecycle Management (SLM) main package. SLM is part of the wider ILM feature, reusing quite a bit of the * functionality for itself in some places, which is why the two features are contained in the same plugin. * - * This package contains the {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService} and - * {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask}, as well as the Rest and Transport actions for the + * This package contains the {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService} and + * {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask}, as well as the Rest and Transport actions for the * feature set. * This package contains the primary execution logic and most of the user facing * surface area for the plugin, but not everything. The model objects for the cluster state as well as several supporting classes are * contained in the {@link org.elasticsearch.xpack.core.snapshotlifecycle} package. * - *

{@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService} maintains an internal + *

{@link org.elasticsearch.xpack.slm.SnapshotLifecycleService} maintains an internal * {@link org.elasticsearch.xpack.core.scheduler.SchedulerEngine SchedulerEngine} that handles scheduling snapshots. The service * executes on the currently elected master node. It listens to the cluster state, detecting new policies to schedule, and unscheduling * policies when they are deleted or if ILM is stopped. The bulk of this scheduling management is handled within - * {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleService#maybeScheduleSnapshot(SnapshotLifecyclePolicyMetadata)} + * {@link org.elasticsearch.xpack.slm.SnapshotLifecycleService#maybeScheduleSnapshot(SnapshotLifecyclePolicyMetadata)} * which is executed on all snapshot policies each update. * - *

The {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask} object is what receives an event when a scheduled policy + *

The {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask} object is what receives an event when a scheduled policy * is triggered for execution. It constructs a snapshot request and runs it as the user who originally set up the policy. The bulk of this * logic is contained in the - * {@link org.elasticsearch.xpack.snapshotlifecycle.SnapshotLifecycleTask#maybeTakeSnapshot(String, Client, ClusterService, + * {@link org.elasticsearch.xpack.slm.SnapshotLifecycleTask#maybeTakeSnapshot(String, Client, ClusterService, * SnapshotHistoryStore)} method. After a snapshot request has been submitted, it persists the result (success or failure) in a history * store (an index), caching the latest success and failure information in the cluster state. It is important to note that this task * fires the snapshot request off and forgets it; It does not wait until the entire snapshot completes. Any success or failure that this * task sees will be from the initial submission of the snapshot request only. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.service.ClusterService; diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecyclePolicyTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecyclePolicyTests.java similarity index 99% rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecyclePolicyTests.java rename to x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecyclePolicyTests.java index 1cc88bc4d75b1..24eedfafa488f 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecyclePolicyTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecyclePolicyTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.io.stream.Writeable; diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleServiceTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java similarity index 99% rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleServiceTests.java rename to x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java index 801b774d418df..272203bb1453b 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleServiceTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleServiceTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterName; diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTaskTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTaskTests.java similarity index 99% rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTaskTests.java rename to x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTaskTests.java index 997c56592c984..5dbf940f5adb9 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/snapshotlifecycle/SnapshotLifecycleTaskTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/slm/SnapshotLifecycleTaskTests.java @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.xpack.snapshotlifecycle; +package org.elasticsearch.xpack.slm; import org.apache.lucene.util.SetOnce; import org.elasticsearch.Version;