Use supplier in validateForReservedState

server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java

@@ -95,7 +95,7 @@ protected void validateForReservedState(DeleteRepositoryRequest request, Cluster
             ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComposableIndexTemplateAction.java

@@ -99,7 +99,7 @@ protected void validateForReservedState(Request request, ClusterState state) {
             ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComponentTemplateAction.java

@@ -134,7 +134,7 @@ protected void validateForReservedState(PutComponentTemplateAction.Request reque
             ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java

@@ -145,7 +145,7 @@ protected void validateForReservedState(Request request, ClusterState state) {
             ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 

server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java

@@ -84,7 +84,7 @@ protected void validateForReservedState(PutPipelineRequest request, ClusterState
             ProjectStateRegistry.get(state).reservedStateMetadata(projectResolver.getProjectId()).values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 }

server/src/main/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportAction.java

@@ -53,7 +53,7 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
             clusterService.state().metadata().reservedStateMetadata().values(),
             reservedStateHandlerName().get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
         doExecuteProtected(task, request, listener);
     }

server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java

@@ -143,7 +143,7 @@ protected void validateForReservedState(Request request, ClusterState state) {
             state.metadata().reservedStateMetadata().values(),
             handlerName.get(),
             modifiedKeys(request),
-            request.toString()
+            request::toString
         );
     }
 

server/src/main/java/org/elasticsearch/reservedstate/ActionWithReservedState.java

@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import static org.elasticsearch.core.Strings.format;
 
@@ -53,13 +54,13 @@ default Set<String> modifiedKeys(T request) {
      * @param reservedStateMetadata the metadata to check
      * @param handlerName the name of the reserved state handler related to this implementation
      * @param modified the set of modified keys by the related request
-     * @param request a string representation of the request for error reporting purposes
+     * @param requestSupplier a supplier for a string representation of the request for error reporting purposes
      */
     default void validateForReservedState(
         Collection<ReservedStateMetadata> reservedStateMetadata,
         String handlerName,
         Set<String> modified,
-        String request
+        Supplier<String> requestSupplier
     ) {
         List<String> errors = new ArrayList<>();
 
@@ -72,7 +73,7 @@ default void validateForReservedState(
 
         if (errors.isEmpty() == false) {
             throw new IllegalArgumentException(
-                format("Failed to process request [%s] with errors: [%s]", request, String.join(", ", errors))
+                format("Failed to process request [%s] with errors: [%s]", requestSupplier.get(), String.join(", ", errors))
             );
         }
     }

server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java

@@ -963,7 +963,7 @@ public void testTemplatesWithReservedPrefix() throws Exception {
                     withReservedState.reservedStateMetadata(projectId).values(),
                     ReservedComposableIndexTemplateAction.NAME,
                     modifiedKeys,
-                    pr.name()
+                    pr::name
                 )
             ).getMessage()
         );
@@ -979,7 +979,7 @@ public void testTemplatesWithReservedPrefix() throws Exception {
             withReservedState.reservedStateMetadata(projectId).values(),
             ReservedComposableIndexTemplateAction.NAME,
             modifiedKeysOK,
-            prOK.name()
+            prOK::name
         );
     }