Dry up empty validate methods in + empty implementations of Acknowled…

…gedRequest (elastic#103299) A lot of the validate methods in AcknowledgedRequest are empty and there's a couple noop implementations of the class as well that can just go away.
mamh-java · Jan 22, 2024 · 0579ae7 · 0579ae7
1 parent cd38c3a
commit 0579ae7
Show file tree

Hide file tree

Showing 71 changed files with 74 additions and 438 deletions.
diff --git a/.../java/org/elasticsearch/datastreams/lifecycle/action/DeleteDataStreamLifecycleAction.java b/.../java/org/elasticsearch/datastreams/lifecycle/action/DeleteDataStreamLifecycleAction.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.datastreams.lifecycle.action;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -56,11 +55,6 @@ public String[] getNames() {
             return names;
         }
 
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
-
         @Override
         public String[] indices() {
             return names;

diff --git a/...ain/java/org/elasticsearch/datastreams/lifecycle/action/PutDataStreamLifecycleAction.java b/...ain/java/org/elasticsearch/datastreams/lifecycle/action/PutDataStreamLifecycleAction.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.datastreams.lifecycle.action;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -129,11 +128,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             return builder;
         }
 
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
-
         @Override
         public String[] indices() {
             return names;

diff --git a/...a/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java b/...a/org/elasticsearch/action/admin/cluster/desirednodes/TransportDesiredNodesActionsIT.java
@@ -12,6 +12,7 @@
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionFuture;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.ClusterStateUpdateTask;
 import org.elasticsearch.cluster.desirednodes.VersionConflictException;
@@ -271,9 +272,7 @@ public void testDeleteDesiredNodesTasksAreBatchedCorrectly() throws Exception {
 
         final List<ActionFuture<ActionResponse.Empty>> deleteDesiredNodesFutures = new ArrayList<>(15);
         for (int i = 0; i < 15; i++) {
-            deleteDesiredNodesFutures.add(
-                client().execute(TransportDeleteDesiredNodesAction.TYPE, new TransportDeleteDesiredNodesAction.Request())
-            );
+            deleteDesiredNodesFutures.add(client().execute(TransportDeleteDesiredNodesAction.TYPE, new AcknowledgedRequest.Plain()));
         }
 
         for (ActionFuture<ActionResponse.Empty> future : deleteDesiredNodesFutures) {
@@ -349,8 +348,7 @@ private UpdateDesiredNodesRequest randomDryRunUpdateDesiredNodesRequest(Version
     }
 
     private void deleteDesiredNodes() {
-        final TransportDeleteDesiredNodesAction.Request request = new TransportDeleteDesiredNodesAction.Request();
-        client().execute(TransportDeleteDesiredNodesAction.TYPE, request).actionGet();
+        client().execute(TransportDeleteDesiredNodesAction.TYPE, new AcknowledgedRequest.Plain()).actionGet();
     }
 
     private DesiredNodes getLatestDesiredNodes() {

diff --git a/...rg/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java b/...rg/elasticsearch/action/admin/cluster/desirednodes/TransportDeleteDesiredNodesAction.java
@@ -35,9 +35,7 @@
 
 import java.io.IOException;
 
-public class TransportDeleteDesiredNodesAction extends TransportMasterNodeAction<
-    TransportDeleteDesiredNodesAction.Request,
-    ActionResponse.Empty> {
+public class TransportDeleteDesiredNodesAction extends TransportMasterNodeAction<AcknowledgedRequest.Plain, ActionResponse.Empty> {
 
     public static final ActionType<ActionResponse.Empty> TYPE = ActionType.emptyResponse("cluster:admin/desired_nodes/delete");
     private final MasterServiceTaskQueue<DeleteDesiredNodesTask> taskQueue;
@@ -56,7 +54,7 @@ public TransportDeleteDesiredNodesAction(
             clusterService,
             threadPool,
             actionFilters,
-            Request::new,
+            AcknowledgedRequest.Plain::new,
             indexNameExpressionResolver,
             in -> ActionResponse.Empty.INSTANCE,
             EsExecutors.DIRECT_EXECUTOR_SERVICE
@@ -65,13 +63,17 @@ public TransportDeleteDesiredNodesAction(
     }
 
     @Override
-    protected void masterOperation(Task task, Request request, ClusterState state, ActionListener<ActionResponse.Empty> listener)
-        throws Exception {
+    protected void masterOperation(
+        Task task,
+        AcknowledgedRequest.Plain request,
+        ClusterState state,
+        ActionListener<ActionResponse.Empty> listener
+    ) throws Exception {
         taskQueue.submitTask("delete-desired-nodes", new DeleteDesiredNodesTask(listener), request.masterNodeTimeout());
     }
 
     @Override
-    protected ClusterBlockException checkBlock(Request request, ClusterState state) {
+    protected ClusterBlockException checkBlock(AcknowledgedRequest.Plain request, ClusterState state) {
         return state.blocks().globalBlockedException(ClusterBlockLevel.METADATA_WRITE);
     }
 

diff --git a/...r/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/...r/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.admin.cluster.reroute;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.cluster.routing.allocation.command.AllocationCommand;
 import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands;
@@ -111,11 +110,6 @@ public AllocationCommands getCommands() {
         return commands;
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);

diff --git a/...va/org/elasticsearch/action/admin/indices/dangling/delete/DeleteDanglingIndexRequest.java b/...va/org/elasticsearch/action/admin/indices/dangling/delete/DeleteDanglingIndexRequest.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.admin.indices.dangling.delete;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -36,11 +35,6 @@ public DeleteDanglingIndexRequest(String indexUUID, boolean acceptDataLoss) {
         this.acceptDataLoss = acceptDataLoss;
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     public String getIndexUUID() {
         return indexUUID;
     }

diff --git a/.../elasticsearch/action/admin/indices/dangling/import_index/ImportDanglingIndexRequest.java b/.../elasticsearch/action/admin/indices/dangling/import_index/ImportDanglingIndexRequest.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.admin.indices.dangling.import_index;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -32,11 +31,6 @@ public ImportDanglingIndexRequest(StreamInput in) throws IOException {
         this.acceptDataLoss = in.readBoolean();
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     public ImportDanglingIndexRequest(String indexUUID, boolean acceptDataLoss) {
         super();
         this.indexUUID = Objects.requireNonNull(indexUUID, "indexUUID cannot be null");

diff --git a/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.ingest;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -42,11 +41,6 @@ public String getId() {
         return id;
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);

diff --git a/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java
@@ -8,7 +8,6 @@
 
 package org.elasticsearch.action.ingest;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
@@ -54,11 +53,6 @@ public PutPipelineRequest(StreamInput in) throws IOException {
         this(null, null, null, null);
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     public String getId() {
         return id;
     }

diff --git a/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
@@ -7,6 +7,7 @@
  */
 package org.elasticsearch.action.support.master;
 
+import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.cluster.ack.AckedRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -82,4 +83,21 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeTimeValue(timeout);
     }
 
+    @Override
+    public ActionRequestValidationException validate() {
+        return null;
+    }
+
+    /**
+     * AcknowledgedRequest that does not have any additional fields. Should be used instead of implementing noop children for
+     * AcknowledgedRequest.
+     */
+    public static final class Plain extends AcknowledgedRequest<Plain> {
+
+        public Plain(StreamInput in) throws IOException {
+            super(in);
+        }
+
+        public Plain() {}
+    }
 }
diff --git a/...c/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteDesiredNodesAction.java b/...c/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteDesiredNodesAction.java
@@ -9,6 +9,7 @@
 package org.elasticsearch.rest.action.admin.cluster;
 
 import org.elasticsearch.action.admin.cluster.desirednodes.TransportDeleteDesiredNodesAction;
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
@@ -30,7 +31,7 @@ public List<Route> routes() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-        final TransportDeleteDesiredNodesAction.Request deleteDesiredNodesRequest = new TransportDeleteDesiredNodesAction.Request();
+        final AcknowledgedRequest.Plain deleteDesiredNodesRequest = new AcknowledgedRequest.Plain();
         deleteDesiredNodesRequest.masterNodeTimeout(request.paramAsTime("master_timeout", deleteDesiredNodesRequest.masterNodeTimeout()));
         return restChannel -> client.execute(
             TransportDeleteDesiredNodesAction.TYPE,

diff --git a/...c/main/java/org/elasticsearch/xpack/autoscaling/action/DeleteAutoscalingPolicyAction.java b/...c/main/java/org/elasticsearch/xpack/autoscaling/action/DeleteAutoscalingPolicyAction.java
@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.autoscaling.action;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
@@ -49,11 +48,6 @@ public void writeTo(final StreamOutput out) throws IOException {
             out.writeString(name);
         }
 
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
-
         @Override
         public boolean equals(final Object o) {
             if (this == o) return true;

diff --git a/...rc/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java b/...rc/main/java/org/elasticsearch/xpack/autoscaling/action/GetAutoscalingCapacityAction.java
@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.autoscaling.action;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
@@ -51,11 +50,6 @@ public void writeTo(final StreamOutput out) throws IOException {
             super.writeTo(out);
         }
 
-        @Override
-        public ActionRequestValidationException validate() {
-            return null;
-        }
-
         @Override
         public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
             return new CancellableTask(id, type, action, "", parentTaskId, headers);

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/DeleteLicenseRequestBuilder.java
@@ -6,17 +6,17 @@
  */
 package org.elasticsearch.license;
 
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.client.internal.ElasticsearchClient;
-import org.elasticsearch.protocol.xpack.license.DeleteLicenseRequest;
 
 public class DeleteLicenseRequestBuilder extends AcknowledgedRequestBuilder<
-    DeleteLicenseRequest,
+    AcknowledgedRequest.Plain,
     AcknowledgedResponse,
     DeleteLicenseRequestBuilder> {
 
     public DeleteLicenseRequestBuilder(ElasticsearchClient client) {
-        super(client, TransportDeleteLicenseAction.TYPE, new DeleteLicenseRequest());
+        super(client, TransportDeleteLicenseAction.TYPE, new AcknowledgedRequest.Plain());
     }
 }
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartBasicRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/PostStartBasicRequest.java
@@ -6,7 +6,6 @@
  */
 package org.elasticsearch.license;
 
-import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -24,11 +23,6 @@ public PostStartBasicRequest(StreamInput in) throws IOException {
         acknowledge = in.readBoolean();
     }
 
-    @Override
-    public ActionRequestValidationException validate() {
-        return null;
-    }
-
     public PostStartBasicRequest acknowledge(boolean acknowledge) {
         this.acknowledge = acknowledge;
         return this;

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/RestDeleteLicenseAction.java
@@ -7,9 +7,9 @@
 
 package org.elasticsearch.license;
 
+import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.core.RestApiVersion;
-import org.elasticsearch.protocol.xpack.license.DeleteLicenseRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.action.RestToXContentListener;
@@ -35,7 +35,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        DeleteLicenseRequest deleteLicenseRequest = new DeleteLicenseRequest();
+        AcknowledgedRequest.Plain deleteLicenseRequest = new AcknowledgedRequest.Plain();
         deleteLicenseRequest.timeout(request.paramAsTime("timeout", deleteLicenseRequest.timeout()));
         deleteLicenseRequest.masterNodeTimeout(request.paramAsTime("master_timeout", deleteLicenseRequest.masterNodeTimeout()));