Some ILM tidying cleanups, mostly around String formatting (#118338)

Author: joegallo

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/AsyncWaitStep.java

@@ -20,7 +20,7 @@
  */
 public abstract class AsyncWaitStep extends Step {
 
-    private Client client;
+    private final Client client;
 
     public AsyncWaitStep(StepKey key, StepKey nextStepKey, Client client) {
         super(key, nextStepKey);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/BranchingStep.java

@@ -71,7 +71,7 @@ public ClusterState performAction(Index index, ClusterState clusterState) {
      * This method returns the next step to execute based on the predicate. If
      * the predicate returned true, then nextStepKeyOnTrue is the key of the
      * next step to run, otherwise nextStepKeyOnFalse is.
-     *
+     * <p>
      * throws {@link UnsupportedOperationException} if performAction was not called yet
      *
      * @return next step to execute

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CheckNotDataStreamWriteIndexStep.java

@@ -13,11 +13,10 @@
 import org.elasticsearch.cluster.metadata.IndexAbstraction;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.xpack.core.ilm.step.info.SingleMessageFieldInfo;
 
-import java.util.Locale;
-
 /**
  * Some actions cannot be executed on a data stream's write index (eg. `searchable-snapshot`). This step checks if the managed index is
  * part of a data stream, in which case it will check it's not the write index. If the managed index is the write index of a data stream
@@ -46,8 +45,7 @@ public Result isConditionMet(Index index, ClusterState clusterState) {
         String indexName = index.getName();
 
         if (indexMetadata == null) {
-            String errorMessage = String.format(
-                Locale.ROOT,
+            String errorMessage = Strings.format(
                 "[%s] lifecycle action for index [%s] executed but index no longer exists",
                 getKey().action(),
                 indexName
@@ -64,8 +62,7 @@ public Result isConditionMet(Index index, ClusterState clusterState) {
         if (dataStream != null) {
             boolean isFailureStoreWriteIndex = index.equals(dataStream.getFailureStoreWriteIndex());
             if (isFailureStoreWriteIndex || dataStream.getWriteIndex().equals(index)) {
-                String errorMessage = String.format(
-                    Locale.ROOT,
+                String errorMessage = Strings.format(
                     "index [%s] is the%s write index for data stream [%s], pausing "
                         + "ILM execution of lifecycle [%s] until this index is no longer the write index for the data stream via manual or "
                         + "automated rollover",

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CheckShrinkReadyStep.java

@@ -23,7 +23,6 @@
 import org.elasticsearch.xpack.core.ilm.step.info.SingleMessageFieldInfo;
 
 import java.io.IOException;
-import java.util.Locale;
 import java.util.Objects;
 
 /**
@@ -158,8 +157,7 @@ public Info(String nodeId, long expectedShards, long numberShardsLeftToAllocate)
             if (numberShardsLeftToAllocate < 0) {
                 this.message = "Waiting for all shards to become active";
             } else {
-                this.message = String.format(
-                    Locale.ROOT,
+                this.message = Strings.format(
                     "Waiting for node [%s] to contain [%d] shards, found [%d], remaining [%d]",
                     nodeId,
                     expectedShards,

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CheckTargetShardsCountStep.java

@@ -10,11 +10,10 @@
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.xpack.core.ilm.step.info.SingleMessageFieldInfo;
 
-import java.util.Locale;
-
 /**
  * This step checks whether the new shrunken index's shards count is a factor of the source index's shards count.
  */
@@ -53,8 +52,7 @@ public Result isConditionMet(Index index, ClusterState clusterState) {
             int sourceNumberOfShards = indexMetadata.getNumberOfShards();
             if (sourceNumberOfShards % numberOfShards != 0) {
                 String policyName = indexMetadata.getLifecyclePolicyName();
-                String errorMessage = String.format(
-                    Locale.ROOT,
+                String errorMessage = Strings.format(
                     "lifecycle action of policy [%s] for index [%s] cannot make progress "
                         + "because the target shards count [%d] must be a factor of the source index's shards count [%d]",
                     policyName,

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CleanupShrinkIndexStep.java

@@ -66,27 +66,24 @@ void performDuringNoSnapshot(IndexMetadata indexMetadata, ClusterState currentCl
         }
         getClient().admin()
             .indices()
-            .delete(
-                new DeleteIndexRequest(shrinkIndexName).masterNodeTimeout(TimeValue.MAX_VALUE),
-                new ActionListener<AcknowledgedResponse>() {
-                    @Override
-                    public void onResponse(AcknowledgedResponse acknowledgedResponse) {
-                        // even if not all nodes acked the delete request yet we can consider this operation as successful as
-                        // we'll generate a new index name and attempt to shrink into the newly generated name
-                        listener.onResponse(null);
-                    }
+            .delete(new DeleteIndexRequest(shrinkIndexName).masterNodeTimeout(TimeValue.MAX_VALUE), new ActionListener<>() {
+                @Override
+                public void onResponse(AcknowledgedResponse acknowledgedResponse) {
+                    // even if not all nodes acked the delete request yet we can consider this operation as successful as
+                    // we'll generate a new index name and attempt to shrink into the newly generated name
+                    listener.onResponse(null);
+                }
 
-                    @Override
-                    public void onFailure(Exception e) {
-                        if (e instanceof IndexNotFoundException) {
-                            // we can move on if the index was deleted in the meantime
-                            listener.onResponse(null);
-                        } else {
-                            listener.onFailure(e);
-                        }
+                @Override
+                public void onFailure(Exception e) {
+                    if (e instanceof IndexNotFoundException) {
+                        // we can move on if the index was deleted in the meantime
+                        listener.onResponse(null);
+                    } else {
+                        listener.onFailure(e);
                     }
                 }
-            );
+            });
     }
 
 }

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ClusterStateWaitStep.java

@@ -12,7 +12,7 @@
 
 /**
  * Checks whether a condition has been met based on the cluster state.
- *
+ * <p>
  * If checking a condition not based on the cluster state, or which may take time to evaluate, use {@link AsyncWaitStep}.
  */
 public abstract class ClusterStateWaitStep extends Step {
@@ -35,19 +35,19 @@ public boolean isCompletable() {
 
     public static class Result {
         private final boolean complete;
-        private final ToXContentObject infomationContext;
+        private final ToXContentObject informationContext;
 
-        public Result(boolean complete, ToXContentObject infomationContext) {
+        public Result(boolean complete, ToXContentObject informationContext) {
             this.complete = complete;
-            this.infomationContext = infomationContext;
+            this.informationContext = informationContext;
         }
 
         public boolean isComplete() {
             return complete;
         }
 
-        public ToXContentObject getInfomationContext() {
-            return infomationContext;
+        public ToXContentObject getInformationContext() {
+            return informationContext;
         }
     }
 

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/ClusterStateWaitUntilThresholdStep.java

@@ -19,7 +19,6 @@
 import org.elasticsearch.xpack.core.ilm.step.info.SingleMessageFieldInfo;
 
 import java.time.Clock;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -30,7 +29,7 @@
  * If the action response is complete, the {@link ClusterStateWaitUntilThresholdStep}'s nextStepKey will be the nextStepKey of the
  * wrapped action. When the threshold level is surpassed, if the underlying step's condition was not met, the nextStepKey will be changed to
  * the provided {@link #nextKeyOnThresholdBreach} and this step will stop waiting.
- *
+ * <p>
  * Failures encountered whilst executing the wrapped action will be propagated directly.
  */
 public class ClusterStateWaitUntilThresholdStep extends ClusterStateWaitStep {
@@ -72,14 +71,13 @@ public Result isConditionMet(Index index, ClusterState clusterState) {
                 // we may not have passed the time threshold, but the step is not completable due to a different reason
                 thresholdPassed.set(true);
 
-                String message = String.format(
-                    Locale.ROOT,
+                String message = Strings.format(
                     "[%s] lifecycle step, as part of [%s] action, for index [%s] Is not "
                         + "completable, reason: [%s]. Abandoning execution and moving to the next fallback step [%s]",
                     getKey().name(),
                     getKey().action(),
                     idxMeta.getIndex().getName(),
-                    Strings.toString(stepResult.getInfomationContext()),
+                    Strings.toString(stepResult.getInformationContext()),
                     nextKeyOnThresholdBreach
                 );
                 logger.debug(message);
@@ -90,8 +88,7 @@ public Result isConditionMet(Index index, ClusterState clusterState) {
                 // we retried this step enough, next step will be the configured to {@code nextKeyOnThresholdBreach}
                 thresholdPassed.set(true);
 
-                String message = String.format(
-                    Locale.ROOT,
+                String message = Strings.format(
                     "[%s] lifecycle step, as part of [%s] action, for index [%s] executed for"
                         + " more than [%s]. Abandoning execution and moving to the next fallback step [%s]",
                     getKey().name(),

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CopyExecutionStateStep.java

@@ -23,7 +23,7 @@
  * Copies the execution state data from one index to another, typically after a
  * new index has been created. As part of the execution state copy it will set the target index
  * "current step" to the provided target next step {@link org.elasticsearch.xpack.core.ilm.Step.StepKey}.
- *
+ * <p>
  * Useful for actions such as shrink.
  */
 public class CopyExecutionStateStep extends ClusterStateActionStep {

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/CopySettingsStep.java

@@ -12,11 +12,11 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.LifecycleExecutionState;
 import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.Objects;
 import java.util.function.BiFunction;
 
@@ -78,9 +78,8 @@ public ClusterState performAction(Index index, ClusterState clusterState) {
         String targetIndexName = targetIndexNameSupplier.apply(sourceIndexName, sourceIndexMetadata.getLifecycleExecutionState());
         IndexMetadata targetIndexMetadata = clusterState.metadata().index(targetIndexName);
         if (targetIndexMetadata == null) {
-            String errorMessage = String.format(
-                Locale.ROOT,
-                "index [%s] is being referenced by ILM action [%s] on step [%s] but " + "it doesn't exist",
+            String errorMessage = Strings.format(
+                "index [%s] is being referenced by ILM action [%s] on step [%s] but it doesn't exist",
                 targetIndexName,
                 getKey().action(),
                 getKey().name()