diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java index 6c6723a25a201..9d4a7280c4120 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java +++ b/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 ); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComposableIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComposableIndexTemplateAction.java index 35e44d9a67b20..100de70420fbc 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteComposableIndexTemplateAction.java +++ b/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 ); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComponentTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComponentTemplateAction.java index ecd928a1bb5b6..e7cdf2f7c872f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComponentTemplateAction.java +++ b/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 ); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java index 2ca82a3ddbd68..20a57221a3c2e 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutComposableIndexTemplateAction.java +++ b/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 ); } diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java index 5f2fac1e079c4..d21cc684a41e8 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java +++ b/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 ); } } diff --git a/server/src/main/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportAction.java b/server/src/main/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportAction.java index f9a15c6bf8a64..58fbb9c391bb6 100644 --- a/server/src/main/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/ReservedStateAwareHandledTransportAction.java @@ -53,7 +53,7 @@ protected void doExecute(Task task, Request request, ActionListener li clusterService.state().metadata().reservedStateMetadata().values(), reservedStateHandlerName().get(), modifiedKeys(request), - request.toString() + request::toString ); doExecuteProtected(task, request, listener); } diff --git a/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java index c505fe95ce76d..44545edba9b1f 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java +++ b/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 ); } diff --git a/server/src/main/java/org/elasticsearch/reservedstate/ActionWithReservedState.java b/server/src/main/java/org/elasticsearch/reservedstate/ActionWithReservedState.java index a9f2cdf3b7716..a1bb8eafaabd9 100644 --- a/server/src/main/java/org/elasticsearch/reservedstate/ActionWithReservedState.java +++ b/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 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, String handlerName, Set modified, - String request + Supplier requestSupplier ) { List 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)) ); } } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java index 8513cf5eff45f..828f3147d0306 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/template/reservedstate/ReservedComposableIndexTemplateActionTests.java +++ b/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 ); }