Refactor ParameterizedMessage usages in action/admin/cluster/* to use message supplier #86576

relates #86549

server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java

@@ -11,7 +11,6 @@ package org.elasticsearch.action.admin.cluster.health;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.ActiveShardCount;
@@ -128,7 +127,7 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
 
                 @Override
                 public void onFailure(Exception e) {
-                    logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
+                    logger.error(() -> "unexpected failure during [" + source + "]", e);
                     listener.onFailure(e);
                 }
             }.submit(clusterService.getMasterService(), source);
@@ -166,7 +165,7 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
                     } else {
                         final Level level = e instanceof NotMasterException ? Level.TRACE : Level.ERROR;
                         assert e instanceof NotMasterException : e; // task cannot fail, nor will it trigger a publication which fails
-                        logger.log(level, () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
+                        logger.log(level, () -> "unexpected failure during [" + source + "]", e);
                         // TransportMasterNodeAction implements the retry logic, which is triggered by passing a NotMasterException
                         listener.onFailure(e);
                     }

server/src/main/java/org/elasticsearch/action/admin/cluster/node/reload/TransportNodesReloadSecureSettingsAction.java

@@ -8,8 +8,6 @@
 
 package org.elasticsearch.action.admin.cluster.node.reload;
 
-import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
@@ -138,10 +136,7 @@ public class TransportNodesReloadSecureSettingsAction extends TransportNodesActi
                 try {
                     p.reload(settingsWithKeystore);
                 } catch (final Exception e) {
-                    logger.warn(
-                        (Supplier<?>) () -> new ParameterizedMessage("Reload failed for plugin [{}]", p.getClass().getSimpleName()),
-                        e
-                    );
+                    logger.warn(() -> "Reload failed for plugin [" + p.getClass().getSimpleName() + "]", e);
                     exceptions.add(e);
                 }
             });

server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java

@@ -9,7 +9,6 @@ package org.elasticsearch.action.admin.cluster.repositories.cleanup;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRunnable;
 import org.elasticsearch.action.StepListener;
@@ -238,11 +237,11 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA
                             logger.debug("Finished repository cleanup operations on [{}][{}]", repositoryName, repositoryStateId);
                         } else {
                             logger.debug(
-                                () -> new ParameterizedMessage(
-                                    "Failed to finish repository cleanup operations on [{}][{}]",
-                                    repositoryName,
-                                    repositoryStateId
-                                ),
+                                () -> "Failed to finish repository cleanup operations on ["
+                                    + repositoryName
+                                    + "]["
+                                    + repositoryStateId
+                                    + "]",
                                 failure
                             );
                         }
@@ -266,10 +265,7 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA
                                     if (failure != null) {
                                         e.addSuppressed(failure);
                                     }
-                                    logger.warn(
-                                        () -> new ParameterizedMessage("[{}] failed to remove repository cleanup task", repositoryName),
-                                        e
-                                    );
+                                    logger.warn(() -> "[" + repositoryName + "] failed to remove repository cleanup task", e);
                                     listener.onFailure(e);
                                 }
 
@@ -285,11 +281,11 @@ public final class TransportCleanupRepositoryAction extends TransportMasterNodeA
                                         listener.onResponse(result);
                                     } else {
                                         logger.warn(
-                                            () -> new ParameterizedMessage(
-                                                "Failed to run repository cleanup operations on [{}][{}]",
-                                                repositoryName,
-                                                repositoryStateId
-                                            ),
+                                            () -> "Failed to run repository cleanup operations on ["
+                                                + repositoryName
+                                                + "]["
+                                                + repositoryStateId
+                                                + "]",
                                             failure
                                         );
                                         listener.onFailure(failure);

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/SettingsUpdater.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.action.admin.cluster.settings;
 
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlocks;
@@ -169,12 +168,13 @@ final class SettingsUpdater {
         final Logger logger
     ) {
         logger.warn(
-            (Supplier<?>) () -> new ParameterizedMessage(
-                "ignoring existing invalid {} setting: [{}] with value [{}]; archiving",
-                settingType,
-                e.getKey(),
-                e.getValue()
-            ),
+            (Supplier<?>) () -> "ignoring existing invalid "
+                + settingType
+                + " setting: ["
+                + e.getKey()
+                + "] with value ["
+                + e.getValue()
+                + "]; archiving",
             ex
         );
     }

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java

@@ -10,7 +10,6 @@ package org.elasticsearch.action.admin.cluster.settings;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
@@ -205,7 +204,7 @@ public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAct
 
                     @Override
                     public void onFailure(Exception e) {
-                        logger.debug(new ParameterizedMessage("failed to perform [{}]", REROUTE_TASK_SOURCE), e);
+                        logger.debug(() -> "failed to perform [" + REROUTE_TASK_SOURCE + "]", e);
                         if (MasterService.isPublishFailureException(e)) {
                             listener.onResponse(
                                 new ClusterUpdateSettingsResponse(
@@ -223,7 +222,7 @@ public class TransportClusterUpdateSettingsAction extends TransportMasterNodeAct
 
             @Override
             public void onFailure(Exception e) {
-                logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", UPDATE_TASK_SOURCE), e);
+                logger.debug(() -> "failed to perform [" + UPDATE_TASK_SOURCE + "]", e);
                 super.onFailure(e);
             }