diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java index d93fb33302121..44900a43240aa 100644 --- a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java +++ b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java @@ -10,10 +10,10 @@ import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.client.internal.node.NodeClient; @@ -43,11 +43,11 @@ public class GrokProcessorGetAction { - static final ActionType INSTANCE = new ActionType<>("cluster:admin/ingest/processor/grok/get"); + static final ActionType INSTANCE = new ActionType<>("cluster:admin/ingest/processor/grok/get"); private GrokProcessorGetAction() {/* no instances */} - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final boolean sorted; private final String ecsCompatibility; diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java index 07a00b33407f1..29d9ad6a8eedb 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/MultiSearchTemplateRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.script.mustache; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.MultiSearchRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.IndicesOptions; @@ -30,7 +30,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class MultiSearchTemplateRequest extends ActionRequest implements CompositeIndicesRequest { +public class MultiSearchTemplateRequest extends LegacyActionRequest implements CompositeIndicesRequest { private int maxConcurrentSearchRequests = 0; private List requests = new ArrayList<>(); diff --git a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java index b535b3556b5be..2190b39bb658e 100644 --- a/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java +++ b/modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/SearchTemplateRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.script.mustache; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.Strings; @@ -34,7 +34,7 @@ /** * A request to execute a search based on a search template. */ -public class SearchTemplateRequest extends ActionRequest implements CompositeIndicesRequest, ToXContentObject { +public class SearchTemplateRequest extends LegacyActionRequest implements CompositeIndicesRequest, ToXContentObject { private SearchRequest request; private boolean simulate = false; @@ -171,6 +171,7 @@ public ActionRequestValidationException validate() { private static final ParseField PROFILE_FIELD = new ParseField("profile"); private static final ObjectParser PARSER; + static { PARSER = new ObjectParser<>("search_template"); PARSER.declareField((parser, request, s) -> request.setScriptParams(parser.map()), PARAMS_FIELD, ObjectParser.ValueType.OBJECT); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java index efcd63be46888..5df68e889d7c4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.painless.action; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.client.internal.node.NodeClient; @@ -61,7 +61,7 @@ public class PainlessContextAction { private PainlessContextAction() {/* no instances */} - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private String scriptContextName; diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java index 8e0d838e602e7..9a1e2c519e0dc 100644 --- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java +++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.index.rankeval; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.action.support.IndicesOptions; @@ -27,7 +27,7 @@ /** * Request to perform a search ranking evaluation. */ -public final class RankEvalRequest extends ActionRequest implements IndicesRequest.Replaceable { +public final class RankEvalRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { private RankEvalSpec rankingEvaluationSpec; diff --git a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainRequest.java b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainRequest.java index edcf845512924..d6bbac30fb8f4 100644 --- a/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainRequest.java +++ b/modules/rest-root/src/main/java/org/elasticsearch/rest/root/MainRequest.java @@ -9,14 +9,14 @@ package org.elasticsearch.rest.root; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -public class MainRequest extends ActionRequest { +public class MainRequest extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java index 402730f063e5b..ce79f640960f5 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/elasticsearch/http/netty4/Netty4ChunkedContinuationsIT.java @@ -20,6 +20,7 @@ import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.CountDownActionListener; import org.elasticsearch.action.support.SubscribableListener; @@ -337,14 +338,14 @@ public static class YieldsContinuationsPlugin extends Plugin implements ActionPl static final String ROUTE = "/_test/yields_continuations"; static final String FAIL_INDEX_PARAM = "fail_index"; - private static final ActionType TYPE = new ActionType<>("test:yields_continuations"); + private static final ActionType TYPE = new ActionType<>("test:yields_continuations"); @Override public Collection> getActions() { return List.of(new ActionHandler<>(TYPE, TransportYieldsContinuationsAction.class)); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { final int failIndex; public Request(int failIndex) { @@ -525,7 +526,7 @@ public static class InfiniteContinuationsPlugin extends Plugin implements Action return List.of(new ActionHandler<>(TYPE, TransportInfiniteContinuationsAction.class)); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java index 22bba47b0c5f9..702524d5b8dae 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java @@ -19,6 +19,7 @@ import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.LatchedActionListener; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.GroupedActionListener; @@ -118,6 +119,7 @@ static void randomDescendants(TestRequest request, Set result) { /** * Allow some parts of the request to be completed + * * @return a pending child requests */ static Set allowPartialRequest(TestRequest request) throws Exception { @@ -418,7 +420,7 @@ static void waitForRootTask(ActionFuture rootTask, boolean expectT } } - static class TestRequest extends ActionRequest { + static class TestRequest extends LegacyActionRequest { final int id; final DiscoveryNode node; final List subRequests; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/tasks/ListTasksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/tasks/ListTasksIT.java index 4efe013b40baf..4dbec225177cb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/tasks/ListTasksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/tasks/ListTasksIT.java @@ -15,6 +15,7 @@ import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.PlainActionFuture; @@ -142,7 +143,7 @@ public static class TestPlugin extends Plugin implements ActionPlugin { } } - public static class TestRequest extends ActionRequest { + public static class TestRequest extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java index dbdd6e8c50027..ee48361b9307f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java @@ -20,6 +20,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchPhaseController; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; @@ -142,7 +143,7 @@ public static class TestRerankingActionType extends ActionType docFeatures; diff --git a/server/src/main/java/org/elasticsearch/action/LegacyActionRequest.java b/server/src/main/java/org/elasticsearch/action/LegacyActionRequest.java new file mode 100644 index 0000000000000..0a19eb7f4d471 --- /dev/null +++ b/server/src/main/java/org/elasticsearch/action/LegacyActionRequest.java @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the "Elastic License + * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side + * Public License v 1"; you may not use this file except in compliance with, at + * your election, the "Elastic License 2.0", the "GNU Affero General Public + * License v3.0 only", or the "Server Side Public License, v 1". + */ + +package org.elasticsearch.action; + +import org.elasticsearch.common.io.stream.StreamInput; + +import java.io.IOException; + +/** + * An action request with an unspecified response type. + * + * @deprecated Use {@link ActionRequest} with a specific {@link ActionResponse} type. + */ +@Deprecated +public abstract class LegacyActionRequest extends ActionRequest { + public LegacyActionRequest() { + super(); + } + + public LegacyActionRequest(StreamInput in) throws IOException { + super(in); + } +} diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/ClusterFormationInfoAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/ClusterFormationInfoAction.java index 848dc8639c699..50ac126c4e36e 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/ClusterFormationInfoAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/ClusterFormationInfoAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.action.admin.cluster.coordination; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.coordination.ClusterFormationFailureHelper; @@ -41,7 +41,7 @@ private ClusterFormationInfoAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public Request() {} @@ -106,7 +106,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ClusterFormationInfoAction.Response response = (ClusterFormationInfoAction.Response) o; + Response response = (Response) o; return clusterFormationState.equals(response.clusterFormationState); } @@ -119,9 +119,7 @@ public int hashCode() { /** * This transport action fetches the ClusterFormationState from a remote node. */ - public static class TransportAction extends HandledTransportAction< - ClusterFormationInfoAction.Request, - ClusterFormationInfoAction.Response> { + public static class TransportAction extends HandledTransportAction { private final Coordinator coordinator; @Inject @@ -130,19 +128,15 @@ public TransportAction(TransportService transportService, ActionFilters actionFi ClusterFormationInfoAction.NAME, transportService, actionFilters, - ClusterFormationInfoAction.Request::new, + Request::new, transportService.getThreadPool().executor(ThreadPool.Names.CLUSTER_COORDINATION) ); this.coordinator = coordinator; } @Override - protected void doExecute( - Task task, - ClusterFormationInfoAction.Request request, - ActionListener listener - ) { - listener.onResponse(new ClusterFormationInfoAction.Response(coordinator.getClusterFormationState())); + protected void doExecute(Task task, Request request, ActionListener listener) { + listener.onResponse(new Response(coordinator.getClusterFormationState())); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/CoordinationDiagnosticsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/CoordinationDiagnosticsAction.java index a2ac23ecec4b3..76b041411350a 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/CoordinationDiagnosticsAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/CoordinationDiagnosticsAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.action.admin.cluster.coordination; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.coordination.CoordinationDiagnosticsService; @@ -42,7 +42,7 @@ private CoordinationDiagnosticsAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { final boolean explain; // Non-private for testing public Request(boolean explain) { @@ -105,7 +105,7 @@ public void writeTo(StreamOutput out) throws IOException { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - CoordinationDiagnosticsAction.Response response = (CoordinationDiagnosticsAction.Response) o; + Response response = (Response) o; return result.equals(response.result); } @@ -131,14 +131,14 @@ public TransportAction( CoordinationDiagnosticsAction.NAME, transportService, actionFilters, - CoordinationDiagnosticsAction.Request::new, + Request::new, transportService.getThreadPool().executor(ThreadPool.Names.CLUSTER_COORDINATION) ); this.coordinationDiagnosticsService = coordinationDiagnosticsService; } @Override - protected void doExecute(Task task, CoordinationDiagnosticsAction.Request request, ActionListener listener) { + protected void doExecute(Task task, Request request, ActionListener listener) { listener.onResponse(new Response(coordinationDiagnosticsService.diagnoseMasterStability(request.explain))); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/MasterHistoryAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/MasterHistoryAction.java index 40c634968581d..11118a89efe45 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/MasterHistoryAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/coordination/MasterHistoryAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.action.admin.cluster.coordination; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.coordination.MasterHistoryService; @@ -42,7 +42,7 @@ private MasterHistoryAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public Request() {} @@ -94,6 +94,7 @@ public Response(StreamInput in) throws IOException { /** * Returns an ordered list of DiscoveryNodes that the node responding has seen to be master nodes over the last 30 minutes, ordered * oldest first. Note that these DiscoveryNodes can be null. + * * @return a list of DiscoveryNodes that the node responding has seen to be master nodes over the last 30 minutes, ordered oldest * first */ @@ -113,7 +114,7 @@ public void writeTo(StreamOutput out) throws IOException { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - MasterHistoryAction.Response response = (MasterHistoryAction.Response) o; + Response response = (Response) o; return masterHistory.equals(response.masterHistory); } @@ -136,8 +137,8 @@ public TransportAction(TransportService transportService, ActionFilters actionFi } @Override - protected void doExecute(Task task, MasterHistoryAction.Request request, ActionListener listener) { - listener.onResponse(new MasterHistoryAction.Response(masterHistoryService.getLocalMasterHistory().getRawNodes())); + protected void doExecute(Task task, Request request, ActionListener listener) { + listener.onResponse(new Response(masterHistoryService.getLocalMasterHistory().getRawNodes())); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java index 0b36091cf27e3..736212bdf5419 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.admin.cluster.node.tasks.get; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -23,7 +23,7 @@ /** * A request to get node tasks */ -public class GetTaskRequest extends ActionRequest { +public class GetTaskRequest extends LegacyActionRequest { private TaskId taskId = TaskId.EMPTY_TASK_ID; private boolean waitForCompletion = false; private TimeValue timeout = null; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteClusterNodesAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteClusterNodesAction.java index 9bdef4bfe4a13..cbf153efce6c7 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteClusterNodesAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteClusterNodesAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.action.admin.cluster.remote; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.RemoteClusterActionType; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoMetrics; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; @@ -40,13 +40,10 @@ public class RemoteClusterNodesAction { public static final String NAME = "cluster:internal/remote_cluster/nodes"; - public static final ActionType TYPE = new ActionType<>(NAME); - public static final RemoteClusterActionType REMOTE_TYPE = new RemoteClusterActionType<>( - NAME, - RemoteClusterNodesAction.Response::new - ); + public static final ActionType TYPE = new ActionType<>(NAME); + public static final RemoteClusterActionType REMOTE_TYPE = new RemoteClusterActionType<>(NAME, Response::new); - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final Request ALL_NODES = new Request(false); public static final Request REMOTE_CLUSTER_SERVER_NODES = new Request(true); private final boolean remoteClusterServer; diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java index 5a95b122f331c..644de985ecd9d 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/remote/RemoteInfoRequest.java @@ -9,13 +9,13 @@ package org.elasticsearch.action.admin.cluster.remote; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; -public final class RemoteInfoRequest extends ActionRequest { +public final class RemoteInfoRequest extends LegacyActionRequest { public RemoteInfoRequest() {} diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java index 6c3c5cbb50ece..8b1c0f3314970 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/stats/RemoteClusterStatsRequest.java @@ -10,8 +10,8 @@ package org.elasticsearch.action.admin.cluster.stats; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ /** * A request to get cluster level stats from the remote cluster. */ -public class RemoteClusterStatsRequest extends ActionRequest { +public class RemoteClusterStatsRequest extends LegacyActionRequest { public RemoteClusterStatsRequest(StreamInput in) throws IOException { super(in); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptContextRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptContextRequest.java index 63fd3c0b8d1c3..3e27d6fe7df27 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptContextRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptContextRequest.java @@ -8,13 +8,13 @@ */ package org.elasticsearch.action.admin.cluster.storedscripts; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; -public class GetScriptContextRequest extends ActionRequest { +public class GetScriptContextRequest extends LegacyActionRequest { public GetScriptContextRequest() { super(); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptLanguageRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptLanguageRequest.java index 5e9c923ef2684..7294f02c04cb4 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptLanguageRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/GetScriptLanguageRequest.java @@ -9,13 +9,13 @@ package org.elasticsearch.action.admin.cluster.storedscripts; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; -public class GetScriptLanguageRequest extends ActionRequest { +public class GetScriptLanguageRequest extends LegacyActionRequest { public GetScriptLanguageRequest() { super(); } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java index 415ccd5bf2a73..1bab7267b108e 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.admin.indices.mapping.get; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -23,11 +23,11 @@ /** * Request the mappings of specific fields - * + *

* Note: there is a new class with the same name for the Java HLRC that uses a typeless format. * Any changes done to this class should go to that client class as well. */ -public class GetFieldMappingsRequest extends ActionRequest implements IndicesRequest.Replaceable { +public class GetFieldMappingsRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { private String[] fields = Strings.EMPTY_ARRAY; @@ -84,7 +84,9 @@ public boolean includeDataStreams() { return true; } - /** @param fields a list of fields to retrieve the mapping for */ + /** + * @param fields a list of fields to retrieve the mapping for + */ public GetFieldMappingsRequest fields(String... fields) { this.fields = fields; return this; @@ -98,7 +100,9 @@ public boolean includeDefaults() { return includeDefaults; } - /** Indicates whether default mapping settings should be returned */ + /** + * Indicates whether default mapping settings should be returned + */ public GetFieldMappingsRequest includeDefaults(boolean includeDefaults) { this.includeDefaults = includeDefaults; return this; diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java index 3f9e0cbf299e6..6e42eddd80216 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveClusterActionRequest.java @@ -11,9 +11,9 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Objects; -public class ResolveClusterActionRequest extends ActionRequest implements IndicesRequest.Replaceable { +public class ResolveClusterActionRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpen(); public static final String TRANSPORT_VERSION_ERROR_MESSAGE_PREFIX = "ResolveClusterAction requires at least version"; diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java index d61901b246d05..91a8264b56da1 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexAction.java @@ -10,11 +10,11 @@ package org.elasticsearch.action.admin.indices.resolve; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.RemoteClusterActionType; import org.elasticsearch.action.support.ActionFilters; @@ -73,7 +73,7 @@ private ResolveIndexAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest.Replaceable { + public static class Request extends LegacyActionRequest implements IndicesRequest.Replaceable { public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpen(); diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java index cd4602ead42b5..0acc6f955f5b6 100644 --- a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java +++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequest.java @@ -16,6 +16,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.DocWriteRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.ActiveShardCount; @@ -56,7 +57,7 @@ * Note that we only support refresh on the bulk request not per item. * @see org.elasticsearch.client.internal.Client#bulk(BulkRequest) */ -public class BulkRequest extends ActionRequest +public class BulkRequest extends LegacyActionRequest implements CompositeIndicesRequest, WriteRequest, diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java index 565f2491e5d01..c305d77972fbf 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.fieldcaps; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; @@ -30,7 +30,7 @@ import java.util.Map; import java.util.Objects; -class FieldCapabilitiesNodeRequest extends ActionRequest implements IndicesRequest { +class FieldCapabilitiesNodeRequest extends LegacyActionRequest implements IndicesRequest { private final List shardIds; private final String[] fields; diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java index efbde6264e91c..5d4f6c5f0cc53 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.fieldcaps; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; @@ -34,7 +34,7 @@ import java.util.Objects; import java.util.Set; -public final class FieldCapabilitiesRequest extends ActionRequest implements IndicesRequest.Replaceable, ToXContentObject { +public final class FieldCapabilitiesRequest extends LegacyActionRequest implements IndicesRequest.Replaceable, ToXContentObject { public static final String NAME = "field_caps_request"; public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpenAndForbidClosed(); diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java index cc1d0497bd51a..b583dffccd84e 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetRequest.java @@ -11,10 +11,10 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.RealtimeRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; @@ -48,7 +48,7 @@ // It's not possible to suppress teh warning at #realtime(boolean) at a method-level. @SuppressWarnings("unchecked") -public class MultiGetRequest extends ActionRequest +public class MultiGetRequest extends LegacyActionRequest implements Iterable, CompositeIndicesRequest, diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java index 3cbd7497dcf39..50a117a2b9f10 100644 --- a/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java @@ -13,10 +13,10 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.IndicesOptions; @@ -87,7 +87,7 @@ protected void doExecute(Task task, Request request, ActionListener li }); } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final GetRequest getRequest; private final ShardId shardId; diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java index e953ff527f637..9545851629a20 100644 --- a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java @@ -12,9 +12,9 @@ import org.apache.lucene.store.AlreadyClosedException; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.TransportActions; @@ -108,7 +108,7 @@ protected void doExecute(Task task, Request request, ActionListener li }); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final MultiGetShardRequest multiGetShardRequest; private final ShardId shardId; diff --git a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java index 6adcd80cb9b19..a388e1f38d6d1 100644 --- a/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java +++ b/server/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.ingest; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Objects; -public class SimulatePipelineRequest extends ActionRequest implements ToXContentObject { +public class SimulatePipelineRequest extends LegacyActionRequest implements ToXContentObject { private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(SimulatePipelineRequest.class); private String id; private boolean verbose; diff --git a/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java index 4909d8c4d229d..2588576feb0de 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/ClearScrollRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.search; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ToXContentObject; @@ -24,7 +24,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class ClearScrollRequest extends ActionRequest implements ToXContentObject { +public class ClearScrollRequest extends LegacyActionRequest implements ToXContentObject { private List scrollIds; diff --git a/server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeRequest.java b/server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeRequest.java index b36ec586535e8..adace209f5338 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/ClosePointInTimeRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.search; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Base64; -public class ClosePointInTimeRequest extends ActionRequest implements ToXContentObject { +public class ClosePointInTimeRequest extends LegacyActionRequest implements ToXContentObject { private static final ParseField ID = new ParseField("id"); private final BytesReference id; diff --git a/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java index 8467ee6fd86f3..b5cc71640380d 100644 --- a/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/MultiSearchRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.search; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.CheckedBiConsumer; import org.elasticsearch.common.TriFunction; @@ -50,7 +50,7 @@ /** * A multi search API request. */ -public class MultiSearchRequest extends ActionRequest implements CompositeIndicesRequest { +public class MultiSearchRequest extends LegacyActionRequest implements CompositeIndicesRequest { private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RestSearchAction.class); public static final String FIRST_LINE_EMPTY_DEPRECATION_MESSAGE = "support for empty first line before any action metadata in msearch API is deprecated " diff --git a/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java b/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java index d68e2ce1b02b7..aa707d72bc6f1 100644 --- a/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/OpenPointInTimeRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.search; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +29,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public final class OpenPointInTimeRequest extends ActionRequest implements IndicesRequest.Replaceable { +public final class OpenPointInTimeRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { private String[] indices; private IndicesOptions indicesOptions = DEFAULT_INDICES_OPTIONS; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 2f057c9a2d89d..eb77f606e5137 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -11,10 +11,11 @@ import org.elasticsearch.TransportVersions; import org.elasticsearch.Version; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; +import org.elasticsearch.client.internal.Client; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -46,14 +47,14 @@ /** * A request to execute search against one or more indices (or all). *

- * Note, the search {@link #source(org.elasticsearch.search.builder.SearchSourceBuilder)} + * Note, the search {@link #source(SearchSourceBuilder)} * is required. The search source is the different search options, including aggregations and such. *

* - * @see org.elasticsearch.client.internal.Client#search(SearchRequest) + * @see Client#search(SearchRequest) * @see SearchResponse */ -public class SearchRequest extends ActionRequest implements IndicesRequest.Replaceable, Rewriteable { +public class SearchRequest extends LegacyActionRequest implements IndicesRequest.Replaceable, Rewriteable { public static final ToXContent.Params FORMAT_PARAMS = new ToXContent.MapParams(Collections.singletonMap("pretty", "false")); @@ -169,12 +170,12 @@ public boolean allowsRemoteIndices() { * Used when a {@link SearchRequest} is created and executed as part of a cross-cluster search request * performing reduction on each cluster in order to minimize network round-trips between the coordinating node and the remote clusters. * - * @param parentTaskId the parent taskId of the original search request + * @param parentTaskId the parent taskId of the original search request * @param originalSearchRequest the original search request - * @param indices the indices to search against - * @param clusterAlias the alias to prefix index names with in the returned search results - * @param absoluteStartMillis the absolute start time to be used on the remote clusters to ensure that the same value is used - * @param finalReduce whether the reduction should be final or not + * @param indices the indices to search against + * @param clusterAlias the alias to prefix index names with in the returned search results + * @param absoluteStartMillis the absolute start time to be used on the remote clusters to ensure that the same value is used + * @param finalReduce whether the reduction should be final or not */ static SearchRequest subSearchRequest( TaskId parentTaskId, @@ -664,7 +665,7 @@ public void setWaitForCheckpointsTimeout(final TimeValue waitForCheckpointsTimeo * the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for * instance a shard can not match any documents based on its rewrite method ie. if date filters are mandatory to match but the shard * bounds and the query are disjoint. - * + *

* When unspecified, the pre-filter phase is executed if any of these conditions is met: *

    *
  • The request targets more than 128 shards
    • @@ -685,7 +686,7 @@ public void setPreFilterShardSize(int preFilterShardSize) { * This filter roundtrip can limit the number of shards significantly if for * instance a shard can not match any documents based on its rewrite method ie. if date filters are mandatory to match but the shard * bounds and the query are disjoint. - * + *

    * When unspecified, the pre-filter phase is executed if any of these conditions is met: *

      *
    • The request targets more than 128 shards
      • diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java index 71b88b03a5463..76ac07372285b 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchScrollRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.search; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -27,7 +27,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class SearchScrollRequest extends ActionRequest implements ToXContentObject { +public class SearchScrollRequest extends LegacyActionRequest implements ToXContentObject { private String scrollId; private Scroll scroll; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchShardsRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchShardsRequest.java index be1b194803709..9e2837aa1f8b5 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchShardsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchShardsRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.search; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ /** * A request to find the list of target shards that might match the query for the given target indices. */ -public final class SearchShardsRequest extends ActionRequest implements IndicesRequest.Replaceable { +public final class SearchShardsRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { private String[] indices; private final IndicesOptions indicesOptions; @Nullable diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java index e0c1d94ed1de3..f985cc53335e2 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.support.broadcast; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ import java.io.IOException; -public class BroadcastRequest> extends ActionRequest implements IndicesRequest.Replaceable { +public class BroadcastRequest> extends LegacyActionRequest implements IndicesRequest.Replaceable { public static final IndicesOptions DEFAULT_INDICES_OPTIONS = IndicesOptions.strictExpandOpenAndForbidClosed(); diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java index ac5fff1d1700f..9825b86308324 100644 --- a/server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/unpromotable/BroadcastUnpromotableRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.support.broadcast.unpromotable; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,7 +29,7 @@ /** * A request that is broadcast to the unpromotable assigned replicas of a primary. */ -public class BroadcastUnpromotableRequest extends ActionRequest implements IndicesRequest { +public class BroadcastUnpromotableRequest extends LegacyActionRequest implements IndicesRequest { /** * Holds the index shard routing table that will be used by {@link TransportBroadcastUnpromotableAction} to broadcast the requests to diff --git a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java index 10d8fe02e18a9..b0dae6be7750f 100644 --- a/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/master/MasterNodeRequest.java @@ -11,10 +11,11 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; +import org.elasticsearch.rest.RestUtils; import java.io.IOException; import java.util.Objects; @@ -22,7 +23,7 @@ /** * A based request for master based operation. */ -public abstract class MasterNodeRequest> extends ActionRequest { +public abstract class MasterNodeRequest> extends LegacyActionRequest { /** * The default timeout for master-node requests. It's super-trappy to have such a default, because it makes it all too easy to forget @@ -30,7 +31,7 @@ public abstract class MasterNodeRequest - * For requests which originate in the REST layer, use {@link org.elasticsearch.rest.RestUtils#getMasterNodeTimeout} to determine the + * For requests which originate in the REST layer, use {@link RestUtils#getMasterNodeTimeout} to determine the * timeout. *

      * For internally-generated requests, choose an appropriate timeout. Often this will be {@link TimeValue#MAX_VALUE} (or {@link @@ -58,7 +59,7 @@ public abstract class MasterNodeRequest *

    • * For requests which originate in the REST layer, use - * {@link org.elasticsearch.rest.RestUtils#getMasterNodeTimeout} to determine the timeout. + * {@link RestUtils#getMasterNodeTimeout} to determine the timeout. *
      • *
    • * For internally-generated requests, choose an appropriate timeout. Often this will be an infinite @@ -107,7 +108,7 @@ private long getNewMasterTerm(StreamOutput out) { * Specifies how long to wait when the master has not been discovered yet, or is disconnected, or is busy processing other tasks. The * value {@link TimeValue#MINUS_ONE} means to wait forever in 8.15.0 onwards. *

      - * For requests which originate in the REST layer, use {@link org.elasticsearch.rest.RestUtils#getMasterNodeTimeout} to determine the + * For requests which originate in the REST layer, use {@link RestUtils#getMasterNodeTimeout} to determine the * timeout. *

      * For internally-generated requests, choose an appropriate timeout. Often this will be {@link TimeValue#MAX_VALUE} (or {@link diff --git a/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java index 87aa1044f2c6b..63183116e53ac 100644 --- a/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/nodes/BaseNodesRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.support.nodes; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Objects; -public abstract class BaseNodesRequest> extends ActionRequest { +public abstract class BaseNodesRequest> extends LegacyActionRequest { /** * Sequence of node specifications that describe the nodes that this request should target. See {@link DiscoveryNodes#resolveNodes} for diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java index debc64914a171..b64f9e4081247 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.support.replication; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.admin.indices.refresh.TransportShardRefreshAction; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.support.ActiveShardCount; @@ -33,7 +33,9 @@ * Requests that are run on a particular replica, first on the primary and then on the replicas like {@link IndexRequest} or * {@link TransportShardRefreshAction}. */ -public abstract class ReplicationRequest> extends ActionRequest implements IndicesRequest { +public abstract class ReplicationRequest> extends LegacyActionRequest + implements + IndicesRequest { public static final TimeValue DEFAULT_TIMEOUT = TimeValue.timeValueMinutes(1); diff --git a/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java index fd95f3079f6c9..f13faa621ca40 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/instance/InstanceShardOperationRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.support.single.instance; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; @@ -24,7 +24,7 @@ // TODO: This request and its associated transport action can be folded into UpdateRequest which is its only concrete production code // implementation -public abstract class InstanceShardOperationRequest> extends ActionRequest +public abstract class InstanceShardOperationRequest> extends LegacyActionRequest implements IndicesRequest { diff --git a/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java index cb410d8bf19f6..527371654c1d3 100644 --- a/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/single/shard/SingleShardRequest.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.support.single.shard; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.List; -public abstract class SingleShardRequest> extends ActionRequest +public abstract class SingleShardRequest> extends LegacyActionRequest implements IndicesRequest.RemoteClusterShardRequest { @@ -31,7 +31,7 @@ public abstract class SingleShardRequest * Whether index property is optional depends on the concrete implementation. If index property is required the * concrete implementation should use {@link #validateNonNullIndex()} to check if the index property has been set */ @@ -67,9 +67,9 @@ protected ActionRequestValidationException validateNonNullIndex() { /** * @return The concrete index this request is targeted for or null if index is optional. - * Whether index property is optional depends on the concrete implementation. If index property - * is required the concrete implementation should use {@link #validateNonNullIndex()} to check - * if the index property has been set + * Whether index property is optional depends on the concrete implementation. If index property + * is required the concrete implementation should use {@link #validateNonNullIndex()} to check + * if the index property has been set */ @Nullable public String index() { diff --git a/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java index ba348f8b62b79..fab3f41334d79 100644 --- a/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/tasks/BaseTasksRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.action.support.tasks; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -27,7 +27,7 @@ /** * A base class for task requests */ -public class BaseTasksRequest> extends ActionRequest { +public class BaseTasksRequest> extends LegacyActionRequest { public static final String[] ALL_ACTIONS = Strings.EMPTY_ARRAY; @@ -103,7 +103,7 @@ public final Request setNodes(String... nodes) { /** * Returns the id of the task that should be processed. - * + *

      * By default tasks with any ids are returned. */ public TaskId getTargetTaskId() { diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/AbstractSynonymsPagedResultAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/AbstractSynonymsPagedResultAction.java index c1e2efb0834e3..3fb7b5d27bed9 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/AbstractSynonymsPagedResultAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/AbstractSynonymsPagedResultAction.java @@ -9,10 +9,10 @@ package org.elasticsearch.action.synonyms; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -42,7 +42,7 @@ public AbstractSynonymsPagedResultAction(String name, Writeable.Reader reader /** * Base request class that includes support for pagination parameters */ - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private static final int MAX_SYNONYMS_RESULTS = 10_000; private final int from; private final int size; diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymRuleAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymRuleAction.java index 9f52f1552e421..bb9ee4a2d569d 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymRuleAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymRuleAction.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.synonyms; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -29,7 +29,7 @@ public DeleteSynonymRuleAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final String synonymRuleId; diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymsAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymsAction.java index 4901ea518c569..419273093133d 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymsAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/DeleteSynonymsAction.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.synonyms; import org.apache.logging.log4j.util.Strings; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +29,7 @@ public DeleteSynonymsAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; public Request(StreamInput in) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/GetSynonymRuleAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/GetSynonymRuleAction.java index dd3239372c5bf..b7cd22931b3db 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/GetSynonymRuleAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/GetSynonymRuleAction.java @@ -9,10 +9,10 @@ package org.elasticsearch.action.synonyms; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -33,7 +33,7 @@ public GetSynonymRuleAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final String synonymRuleId; diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymRuleAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymRuleAction.java index 6d0d24dbfee05..4c0c4f6c258a3 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymRuleAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymRuleAction.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.synonyms; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -38,7 +38,7 @@ public PutSynonymRuleAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final SynonymRule synonymRule; diff --git a/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java b/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java index 5e806ef2ef548..969f3962942dd 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java @@ -9,9 +9,9 @@ package org.elasticsearch.action.synonyms; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -40,7 +40,7 @@ public PutSynonymsAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final SynonymRule[] synonymRules; diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java index d5b5ef77db92a..2864e7a497983 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsRequest.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.termvectors; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.CompositeIndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.RealtimeRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.io.stream.StreamInput; @@ -30,7 +30,7 @@ // It's not possible to suppress teh warning at #realtime(boolean) at a method-level. @SuppressWarnings("unchecked") -public class MultiTermVectorsRequest extends ActionRequest +public class MultiTermVectorsRequest extends LegacyActionRequest implements Iterable, CompositeIndicesRequest, diff --git a/server/src/main/java/org/elasticsearch/health/GetHealthAction.java b/server/src/main/java/org/elasticsearch/health/GetHealthAction.java index 991f9bffb66f5..f7416c4007239 100644 --- a/server/src/main/java/org/elasticsearch/health/GetHealthAction.java +++ b/server/src/main/java/org/elasticsearch/health/GetHealthAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.health; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.client.internal.ParentTaskAssigningClient; @@ -150,7 +150,7 @@ public String toString() { } } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String indicatorName; private final boolean verbose; private final int size; diff --git a/server/src/main/java/org/elasticsearch/health/node/action/HealthNodeRequest.java b/server/src/main/java/org/elasticsearch/health/node/action/HealthNodeRequest.java index 3c27594a5068e..b9763ccc0f313 100644 --- a/server/src/main/java/org/elasticsearch/health/node/action/HealthNodeRequest.java +++ b/server/src/main/java/org/elasticsearch/health/node/action/HealthNodeRequest.java @@ -9,7 +9,7 @@ package org.elasticsearch.health.node.action; -import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.tasks.CancellableTask; import org.elasticsearch.tasks.Task; @@ -21,7 +21,7 @@ /** * This is a base class for all the requests that will be sent to the health node. */ -public abstract class HealthNodeRequest extends ActionRequest { +public abstract class HealthNodeRequest extends LegacyActionRequest { public HealthNodeRequest() {} diff --git a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java index a1d37a8c2cb97..cf9f55ec2a611 100644 --- a/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java +++ b/server/src/main/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequest.java @@ -9,8 +9,8 @@ package org.elasticsearch.index.reindex; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.ActiveShardCount; import org.elasticsearch.action.support.replication.ReplicationRequest; @@ -31,7 +31,7 @@ import static org.elasticsearch.core.TimeValue.timeValueMillis; import static org.elasticsearch.core.TimeValue.timeValueMinutes; -public abstract class AbstractBulkByScrollRequest> extends ActionRequest { +public abstract class AbstractBulkByScrollRequest> extends LegacyActionRequest { public static final int MAX_DOCS_ALL_MATCHES = -1; public static final TimeValue DEFAULT_SCROLL_TIMEOUT = timeValueMinutes(5); @@ -118,8 +118,8 @@ public AbstractBulkByScrollRequest(StreamInput in) throws IOException { * Constructor for actual use. * * @param searchRequest the search request to execute to get the documents to process - * @param setDefaults should this request set the defaults on the search request? Usually set to true but leave it false to support - * request slicing + * @param setDefaults should this request set the defaults on the search request? Usually set to true but leave it false to support + * request slicing */ public AbstractBulkByScrollRequest(SearchRequest searchRequest, boolean setDefaults) { this.searchRequest = searchRequest; diff --git a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java index 1143da30c2952..a62086a64bb94 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java +++ b/server/src/main/java/org/elasticsearch/index/shard/PrimaryReplicaSyncer.java @@ -11,8 +11,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.resync.ResyncReplicationRequest; import org.elasticsearch.action.resync.ResyncReplicationResponse; import org.elasticsearch.action.resync.TransportResyncReplicationAction; @@ -374,7 +374,7 @@ protected void doRun() throws Exception { } } - public static class ResyncRequest extends ActionRequest { + public static class ResyncRequest extends LegacyActionRequest { private final ShardId shardId; private final String allocationId; @@ -463,8 +463,8 @@ public void setSkippedOperations(int skippedOperations) { } @Override - public ResyncTask.Status getStatus() { - return new ResyncTask.Status(phase, totalOperations, resyncedOperations, skippedOperations); + public Status getStatus() { + return new Status(phase, totalOperations, resyncedOperations, skippedOperations); } public static class Status implements Task.Status { diff --git a/server/src/main/java/org/elasticsearch/indices/recovery/StatelessPrimaryRelocationAction.java b/server/src/main/java/org/elasticsearch/indices/recovery/StatelessPrimaryRelocationAction.java index 8a89e8686b4cd..d2ed922e9d62c 100644 --- a/server/src/main/java/org/elasticsearch/indices/recovery/StatelessPrimaryRelocationAction.java +++ b/server/src/main/java/org/elasticsearch/indices/recovery/StatelessPrimaryRelocationAction.java @@ -9,10 +9,10 @@ package org.elasticsearch.indices.recovery; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -27,7 +27,7 @@ public class StatelessPrimaryRelocationAction { "internal:index/shard/recovery/stateless_primary_relocation" ); - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final long recoveryId; private final ShardId shardId; diff --git a/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java b/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java index 65930bdbf944d..a2d4f2921555c 100644 --- a/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java +++ b/server/src/main/java/org/elasticsearch/repositories/VerifyNodeRepositoryAction.java @@ -10,10 +10,10 @@ package org.elasticsearch.repositories; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -67,7 +67,7 @@ protected void doExecute(Task task, Request request, ActionListener li } } - private static class Request extends ActionRequest { + private static class Request extends LegacyActionRequest { private final SubscribableListener closeListeners = new SubscribableListener<>(); private final RefCounted refs = LeakTracker.wrap(AbstractRefCounted.of(() -> closeListeners.onResponse(null))); diff --git a/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java index 59f000260e09c..456f5fe00eecb 100644 --- a/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java @@ -15,6 +15,7 @@ import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.LatchedActionListener; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; @@ -288,7 +289,7 @@ void execute( ); } - public static class TestRequest extends ActionRequest { + public static class TestRequest extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/server/src/test/java/org/elasticsearch/action/support/TransportActionTests.java b/server/src/test/java/org/elasticsearch/action/support/TransportActionTests.java index 7228e2c86db91..81401379faeb9 100644 --- a/server/src/test/java/org/elasticsearch/action/support/TransportActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/TransportActionTests.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.support; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; @@ -147,7 +147,7 @@ protected void doExecute(Task task, TestRequest request, ActionListener * - * @param maxNumberOfDocsPerHop - * shard-level sample size in documents + * @param maxNumberOfDocsPerHop shard-level sample size in documents */ public void sampleSize(int maxNumberOfDocsPerHop) { sampleSize = maxNumberOfDocsPerHop; @@ -253,8 +251,7 @@ public int maxDocsPerDiversityValue() { * significance (see the {@link SignificantTerms} aggregation) rather than * popularity (using the {@link TermsAggregator}). * - * @param value - * true if the significant_terms algorithm should be used. + * @param value true if the significant_terms algorithm should be used. */ public void useSignificance(boolean value) { this.useSignificance = value; @@ -268,8 +265,7 @@ public boolean useSignificance() { * Return detailed information about vertex frequencies as part of JSON * results - defaults to false * - * @param value - * true if detailed information is required in JSON responses + * @param value true if detailed information is required in JSON responses */ public void returnDetailedInfo(boolean value) { this.returnDetailedInfo = value; @@ -284,11 +280,10 @@ public boolean returnDetailedInfo() { * querying elasticsearch to identify terms which can then be connnected to * other terms in a subsequent hop. * - * @param guidingQuery - * optional choice of query which influences which documents are - * considered in this stage + * @param guidingQuery optional choice of query which influences which documents are + * considered in this stage * @return a {@link Hop} object that holds settings for a stage in the graph - * exploration + * exploration */ public Hop createNextHop(QueryBuilder guidingQuery) { Hop parent = null; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/DeleteWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/DeleteWatchRequest.java index 1b67e9af02fd0..ad929928d14f0 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/DeleteWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/DeleteWatchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.protocol.xpack.watcher; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ /** * A delete watch request to delete an watch by name (id) */ -public class DeleteWatchRequest extends ActionRequest { +public class DeleteWatchRequest extends LegacyActionRequest { private String id; private long version = Versions.MATCH_ANY; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java index 63840a9de2223..ae4e0424d6d8c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/watcher/PutWatchRequest.java @@ -6,15 +6,15 @@ */ package org.elasticsearch.protocol.xpack.watcher; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.index.seqno.SequenceNumbers; +import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.xcontent.XContentType; import java.io.IOException; @@ -28,7 +28,7 @@ * This request class contains the data needed to create a watch along with the name of the watch. * The name of the watch will become the ID of the indexed document. */ -public final class PutWatchRequest extends ActionRequest { +public final class PutWatchRequest extends LegacyActionRequest { private static final Pattern NO_WS_PATTERN = Pattern.compile("\\S+"); @@ -38,7 +38,7 @@ public final class PutWatchRequest extends ActionRequest { private boolean active = true; private long version = Versions.MATCH_ANY; - private long ifSeqNo = SequenceNumbers.UNASSIGNED_SEQ_NO; + private long ifSeqNo = UNASSIGNED_SEQ_NO; private long ifPrimaryTerm = UNASSIGNED_PRIMARY_TERM; public PutWatchRequest() {} @@ -135,9 +135,9 @@ public void setVersion(long version) { /** * only performs this put request if the watch's last modification was assigned the given * sequence number. Must be used in combination with {@link #setIfPrimaryTerm(long)} - * + *

      * If the watch's last modification was assigned a different sequence number a - * {@link org.elasticsearch.index.engine.VersionConflictEngineException} will be thrown. + * {@link VersionConflictEngineException} will be thrown. */ public PutWatchRequest setIfSeqNo(long seqNo) { if (seqNo < 0 && seqNo != UNASSIGNED_SEQ_NO) { @@ -150,9 +150,9 @@ public PutWatchRequest setIfSeqNo(long seqNo) { /** * only performs this put request if the watch's last modification was assigned the given * primary term. Must be used in combination with {@link #setIfSeqNo(long)} - * + *

      * If the watch last modification was assigned a different term a - * {@link org.elasticsearch.index.engine.VersionConflictEngineException} will be thrown. + * {@link VersionConflictEngineException} will be thrown. */ public PutWatchRequest setIfPrimaryTerm(long term) { if (term < 0) { @@ -165,7 +165,7 @@ public PutWatchRequest setIfPrimaryTerm(long term) { /** * If set, only perform this put watch request if the watch's last modification was assigned this sequence number. * If the watch last last modification was assigned a different sequence number a - * {@link org.elasticsearch.index.engine.VersionConflictEngineException} will be thrown. + * {@link VersionConflictEngineException} will be thrown. */ public long getIfSeqNo() { return ifSeqNo; @@ -173,9 +173,9 @@ public long getIfSeqNo() { /** * If set, only perform this put watch request if the watch's last modification was assigned this primary term. - * + *

      * If the watch's last modification was assigned a different term a - * {@link org.elasticsearch.index.engine.VersionConflictEngineException} will be thrown. + * {@link VersionConflictEngineException} will be thrown. */ public long getIfPrimaryTerm() { return ifPrimaryTerm; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java index 65754543d3fe8..ae08fd32f3286 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.tasks.CancellableTask; @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Objects; -public abstract class AbstractGetResourcesRequest extends ActionRequest { +public abstract class AbstractGetResourcesRequest extends LegacyActionRequest { private String resourceId; private PageParams pageParams = PageParams.defaultParams(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncStopRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncStopRequest.java index 7113cbca279d3..2cd54c47b6597 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncStopRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/AsyncStopRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.async; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -17,7 +17,7 @@ /** * Request for TransportEsqlAsyncStopAction action. */ -public class AsyncStopRequest extends ActionRequest { +public class AsyncStopRequest extends LegacyActionRequest { private final String id; /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultRequest.java index 4e6f1d9c69cc1..89ba09cd222e6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/DeleteAsyncResultRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.core.async; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.Objects; -public class DeleteAsyncResultRequest extends ActionRequest { +public class DeleteAsyncResultRequest extends LegacyActionRequest { private final String id; public DeleteAsyncResultRequest(String id) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncResultRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncResultRequest.java index 1b51cf87dcd83..ca9371aed6e77 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncResultRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncResultRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.async; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.Objects; -public class GetAsyncResultRequest extends ActionRequest { +public class GetAsyncResultRequest extends LegacyActionRequest { private final String id; private TimeValue waitForCompletionTimeout = TimeValue.MINUS_ONE; private TimeValue keepAlive = TimeValue.MINUS_ONE; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncStatusRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncStatusRequest.java index 3581b9db19887..a067260990955 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncStatusRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/async/GetAsyncStatusRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.async; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -19,12 +19,13 @@ /** * A request class to get a status update of the async search request */ -public class GetAsyncStatusRequest extends ActionRequest { +public class GetAsyncStatusRequest extends LegacyActionRequest { private final String id; private TimeValue keepAlive = TimeValue.MINUS_ONE; /** * Creates a new request + * * @param id The id of the search progress request. */ public GetAsyncStatusRequest(String id) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/action/EsqlQueryRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/action/EsqlQueryRequest.java index 9faa78d3b34f9..95f9d79354268 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/action/EsqlQueryRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/esql/action/EsqlQueryRequest.java @@ -7,13 +7,13 @@ package org.elasticsearch.xpack.core.esql.action; -import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.query.QueryBuilder; import java.io.IOException; -public abstract class EsqlQueryRequest extends ActionRequest { +public abstract class EsqlQueryRequest extends LegacyActionRequest { protected EsqlQueryRequest() {} diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/BaseInferenceActionRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/BaseInferenceActionRequest.java index c74298bcd9346..6947eb7d380f3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/BaseInferenceActionRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/BaseInferenceActionRequest.java @@ -8,7 +8,7 @@ package org.elasticsearch.xpack.core.inference.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.inference.TaskType; @@ -21,7 +21,7 @@ * Base class for inference action requests. Tracks request routing state to prevent potential routing loops * and supports both streaming and non-streaming inference operations. */ -public abstract class BaseInferenceActionRequest extends ActionRequest { +public abstract class BaseInferenceActionRequest extends LegacyActionRequest { private boolean hasBeenRerouted; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceActionProxy.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceActionProxy.java index 303a7568fe680..4746cf9d798cb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceActionProxy.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceActionProxy.java @@ -8,9 +8,9 @@ package org.elasticsearch.xpack.core.inference.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -38,7 +38,7 @@ public InferenceActionProxy() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final TaskType taskType; private final String inferenceEntityId; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/AuditMlNotificationAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/AuditMlNotificationAction.java index 2090f1cb1bd54..91fc91151c685 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/AuditMlNotificationAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/AuditMlNotificationAction.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -40,7 +40,7 @@ public enum AuditType { SYSTEM } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final AuditType auditType; private final String id; private final String message; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CancelJobModelSnapshotUpgradeAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CancelJobModelSnapshotUpgradeAction.java index 0a4525e0524d7..9d0a8d2bc998e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CancelJobModelSnapshotUpgradeAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CancelJobModelSnapshotUpgradeAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -43,7 +43,7 @@ private CancelJobModelSnapshotUpgradeAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final String ALL = "_all"; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java index 2984c203ded31..02e16e8cf0d6d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/CoordinatedInferenceAction.java @@ -8,9 +8,9 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -33,7 +33,7 @@ public CoordinatedInferenceAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public enum RequestModelType { INFERENCE_SERVICE_MODEL, @@ -41,7 +41,7 @@ public enum RequestModelType { BOOSTED_TREE_MODEL, NLP_MODEL, // Either an inference service model or ml pytorch model but not a boosted tree model UNKNOWN - }; + } public static Request forTextInput( String modelId, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java index 0dc430ee47a94..282c246ce277d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteExpiredDataAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -33,7 +33,7 @@ private DeleteExpiredDataAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final ParseField REQUESTS_PER_SECOND = new ParseField("requests_per_second"); public static final ParseField TIMEOUT = new ParseField("timeout"); @@ -103,6 +103,7 @@ public Request setJobId(String jobId) { /** * Not serialized, the expanded job Ids should only be used * on the executing node. + * * @return The expanded Ids in the case where {@code jobId} is not `_all` * otherwise null. */ diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteModelSnapshotAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteModelSnapshotAction.java index 2bdfcb311f939..679d532ef4c3e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteModelSnapshotAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/DeleteModelSnapshotAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -27,7 +27,7 @@ private DeleteModelSnapshotAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private String jobId; private String snapshotId; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EstimateModelMemoryAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EstimateModelMemoryAction.java index a5df3ee8ed703..9fd0819ecb5a2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EstimateModelMemoryAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EstimateModelMemoryAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.ByteSizeValue; @@ -37,13 +37,13 @@ private EstimateModelMemoryAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final ParseField ANALYSIS_CONFIG = Job.ANALYSIS_CONFIG; public static final ParseField OVERALL_CARDINALITY = new ParseField("overall_cardinality"); public static final ParseField MAX_BUCKET_CARDINALITY = new ParseField("max_bucket_cardinality"); - public static final ObjectParser PARSER = new ObjectParser<>(NAME, EstimateModelMemoryAction.Request::new); + public static final ObjectParser PARSER = new ObjectParser<>(NAME, Request::new); static { PARSER.declareObject(Request::setAnalysisConfig, (p, c) -> AnalysisConfig.STRICT_PARSER.apply(p, c).build(), ANALYSIS_CONFIG); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java index 9a350c3c68adb..1d8dc95cbea26 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -49,7 +49,7 @@ private EvaluateDataFrameAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private static final ParseField INDEX = new ParseField("index"); private static final ParseField QUERY = new ParseField("query"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetBucketsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetBucketsAction.java index a6f056a7b2c86..5f4b81f279987 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetBucketsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetBucketsAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ObjectParser; @@ -36,7 +36,7 @@ private GetBucketsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField EXPAND = new ParseField("expand"); public static final ParseField EXCLUDE_INTERIM = new ParseField("exclude_interim"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java index 98a79b3e1b800..0e8f0cb64ac5d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarEventsAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -37,7 +37,7 @@ private GetCalendarEventsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField START = new ParseField("start"); public static final ParseField END = new ParseField("end"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java index 27a08aa009a85..affb428e12f6b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCalendarsAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ObjectParser; @@ -34,7 +34,7 @@ private GetCalendarsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final String ALL = "_all"; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesAction.java index bdeece989201f..4e76b4d688770 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetCategoriesAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.tasks.CancellableTask; @@ -42,7 +42,7 @@ private GetCategoriesAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField CATEGORY_ID = CategoryDefinition.CATEGORY_ID; public static final ParseField FROM = new ParseField("from"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java index fafb9afa99f85..f47d62f28bed4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetDatafeedsStatsAction.java @@ -336,9 +336,7 @@ public static class Builder { private GetDatafeedRunningStateAction.Response datafeedRuntimeState; public Builder setDatafeedIds(Collection datafeedIds) { - this.statsBuilders = datafeedIds.stream() - .map(GetDatafeedsStatsAction.Response.DatafeedStats::builder) - .collect(Collectors.toList()); + this.statsBuilders = datafeedIds.stream().map(DatafeedStats::builder).collect(Collectors.toList()); return this; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java index e3e4184c18dfc..d393bf7196066 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetInfluencersAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ObjectParser; @@ -35,7 +35,7 @@ private GetInfluencersAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField START = new ParseField("start"); public static final ParseField END = new ParseField("end"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java index 7219bcb209fe9..90b76216004b2 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetModelSnapshotsAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -42,7 +42,7 @@ private GetModelSnapshotsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField SNAPSHOT_ID = new ParseField("snapshot_id"); public static final ParseField SORT = new ParseField("sort"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java index 12565ea49e058..87f4b50f32590 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetOverallBucketsAction.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.time.DateMathParser; @@ -59,7 +59,7 @@ private GetOverallBucketsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField TOP_N = new ParseField("top_n"); public static final ParseField BUCKET_SPAN = new ParseField("bucket_span"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java index 63735a1fe55f4..4275f22205250 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/GetRecordsAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ObjectParser; @@ -35,7 +35,7 @@ private GetRecordsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField START = new ParseField("start"); public static final ParseField END = new ParseField("end"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java index 05d9496e434c3..b89b14751a7ab 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/InferModelAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -48,7 +48,7 @@ private InferModelAction(String name) { super(name); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final ParseField ID = new ParseField("id"); public static final ParseField DEPLOYMENT_ID = new ParseField("deployment_id"); @@ -57,6 +57,7 @@ public static class Request extends ActionRequest { public static final ParseField INFERENCE_CONFIG = new ParseField("inference_config"); static final ObjectParser PARSER = new ObjectParser<>(NAME, Builder::new); + static { PARSER.declareString(Builder::setId, ID); PARSER.declareObjectArray(Builder::setDocs, (p, c) -> p.mapOrdered(), DOCS); @@ -92,23 +93,16 @@ public static Builder parseRequest(String id, XContentParser parser) { private TrainedModelPrefixStrings.PrefixType prefixType = TrainedModelPrefixStrings.PrefixType.NONE; private boolean chunked = false; - /** - * Build a request from a list of documents as maps. - * The inference timeout (how long the request waits in - * the inference queue for) is set to a high value {@code #DEFAULT_TIMEOUT_FOR_INGEST} - * to prefer slow ingest over dropping documents. - */ - /** * Build a request from a list of documents as maps. * - * @param id The model Id - * @param docs List of document maps - * @param update Inference config update + * @param id The model Id + * @param docs List of document maps + * @param update Inference config update * @param previouslyLicensed License has been checked previously * and can now be skipped - * @param inferenceTimeout The inference timeout (how long the - * request waits in the inference queue for) + * @param inferenceTimeout The inference timeout (how long the + * request waits in the inference queue for) * @return the new Request */ public static Request forIngestDocs( @@ -119,7 +113,7 @@ public static Request forIngestDocs( TimeValue inferenceTimeout ) { return new Request( - ExceptionsHelper.requireNonNull(id, InferModelAction.Request.ID), + ExceptionsHelper.requireNonNull(id, Request.ID), update, ExceptionsHelper.requireNonNull(Collections.unmodifiableList(docs), DOCS), null, @@ -132,13 +126,13 @@ public static Request forIngestDocs( * Build a request from a list of strings, each string * is one evaluation of the model. * - * @param id The model Id - * @param update Inference config update - * @param textInput Inference input + * @param id The model Id + * @param update Inference config update + * @param textInput Inference input * @param previouslyLicensed License has been checked previously * and can now be skipped - * @param inferenceTimeout The inference timeout (how long the - * request waits in the inference queue for) + * @param inferenceTimeout The inference timeout (how long the + * request waits in the inference queue for) * @return the new Request */ public static Request forTextInput( @@ -294,7 +288,7 @@ public void writeTo(StreamOutput out) throws IOException { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - InferModelAction.Request that = (InferModelAction.Request) o; + Request that = (Request) o; return Objects.equals(id, that.id) && Objects.equals(update, that.update) && Objects.equals(previouslyLicensed, that.previouslyLicensed) @@ -413,7 +407,7 @@ public void writeTo(StreamOutput out) throws IOException { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - InferModelAction.Response that = (InferModelAction.Response) o; + Response that = (Response) o; return isLicensed == that.isLicensed && Objects.equals(inferenceResults, that.inferenceResults) && Objects.equals(id, that.id); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java index 94bb7047bfe23..6a0b8c1403dbb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/MlInfoAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ToXContentObject; @@ -29,7 +29,7 @@ private MlInfoAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public Request() { super(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java index d3cfa22e0aaaa..07ebfd8503434 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PostCalendarEventsAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ObjectParser; @@ -38,7 +38,7 @@ private PostCalendarEventsAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private static final ObjectParser, Void> PARSER = new ObjectParser<>(NAME, ArrayList::new); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java index 634487aa0d39f..8010277424553 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDataFrameAnalyticsAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.tasks.CancellableTask; @@ -40,18 +40,19 @@ private PreviewDataFrameAnalyticsAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final ParseField CONFIG = new ParseField("config"); private final DataFrameAnalyticsConfig config; - static final ObjectParser PARSER = new ObjectParser<>("preview_data_frame_analytics_response", Request.Builder::new); + static final ObjectParser PARSER = new ObjectParser<>("preview_data_frame_analytics_response", Builder::new); + static { - PARSER.declareObject(Request.Builder::setConfig, DataFrameAnalyticsConfig.STRICT_PARSER::apply, CONFIG); + PARSER.declareObject(Builder::setConfig, DataFrameAnalyticsConfig.STRICT_PARSER::apply, CONFIG); } - public static Request.Builder fromXContent(XContentParser parser) { + public static Builder fromXContent(XContentParser parser) { return PARSER.apply(parser, null); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java index 7988f885a27da..968d0b3fb38aa 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PreviewDatafeedAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.core.ml.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -50,14 +50,15 @@ private PreviewDatafeedAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private static final String BLANK_ID = ""; public static final ParseField DATAFEED_CONFIG = new ParseField("datafeed_config"); public static final ParseField JOB_CONFIG = new ParseField("job_config"); - private static final ObjectParser PARSER = new ObjectParser<>("preview_datafeed_action", Request.Builder::new); + private static final ObjectParser PARSER = new ObjectParser<>("preview_datafeed_action", Builder::new); + static { PARSER.declareObject(Builder::setDatafeedBuilder, DatafeedConfig.STRICT_PARSER, DATAFEED_CONFIG); PARSER.declareObject(Builder::setJobBuilder, Job.REST_REQUEST_PARSER, JOB_CONFIG); @@ -65,7 +66,7 @@ public static class Request extends ActionRequest implements ToXContentObject { PARSER.declareString(Builder::setEnd, END_TIME); } - public static Request.Builder fromXContent(XContentParser parser, @Nullable String datafeedId) { + public static Builder fromXContent(XContentParser parser, @Nullable String datafeedId) { Builder builder = PARSER.apply(parser, null); // We don't need to check for "inconsistent ids" as we don't parse an ID from the body if (datafeedId != null) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutCalendarAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutCalendarAction.java index b6857dd12db4c..6d8932d959144 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutCalendarAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutCalendarAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -34,7 +34,7 @@ private PutCalendarAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static Request parseRequest(String calendarId, XContentParser parser) { Calendar.Builder builder = Calendar.STRICT_PARSER.apply(parser, null); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutFilterAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutFilterAction.java index 2105a6aeb6bb6..48e64e6320024 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutFilterAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutFilterAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ private PutFilterAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static Request parseRequest(String filterId, XContentParser parser) { MlFilter.Builder filter = MlFilter.STRICT_PARSER.apply(parser, null); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobAction.java index e98eb38db6ea2..22ffc0bdad109 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateCalendarJobAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xpack.core.ml.calendars.Calendar; @@ -25,7 +25,7 @@ private UpdateCalendarJobAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private String calendarId; private String jobIdsToAddExpression; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterAction.java index 4e232bea4cc5b..b8656fea70bdc 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateFilterAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -39,7 +39,7 @@ private UpdateFilterAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField ADD_ITEMS = new ParseField("add_items"); public static final ParseField REMOVE_ITEMS = new ParseField("remove_items"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotAction.java index d80b055cc0fcc..669abdbc5d770 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/UpdateModelSnapshotAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -35,7 +35,7 @@ private UpdateModelSnapshotAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private static final ObjectParser PARSER = new ObjectParser<>(NAME, Request::new); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateDetectorAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateDetectorAction.java index 6831f985fdc76..a78ff1857f0a9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateDetectorAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateDetectorAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -29,7 +29,7 @@ protected ValidateDetectorAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private Detector detector; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateJobConfigAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateJobConfigAction.java index 76cba60667c32..eb17afbaa5a36 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateJobConfigAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ValidateJobConfigAction.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.core.ml.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ protected ValidateJobConfigAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final Job job; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java index 36bc2db95932d..4b65bc3350080 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/action/MonitoringBulkRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.monitoring.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.bulk.BulkRequestParser; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -30,7 +30,7 @@ * Every monitoring document added to the request is associated to a {@link MonitoredSystem}. The monitored system is used * to resolve the index name in which the document will be indexed into. */ -public class MonitoringBulkRequest extends ActionRequest { +public class MonitoringBulkRequest extends LegacyActionRequest { private final List docs = new ArrayList<>(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupCapsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupCapsAction.java index d73f0a6639847..64fa334e6c55d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupCapsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupCapsAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.rollup.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -37,7 +37,7 @@ private GetRollupCapsAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentFragment { + public static class Request extends LegacyActionRequest implements ToXContentFragment { private String indexPattern; public Request(String indexPattern) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupIndexCapsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupIndexCapsAction.java index 82685b1203c23..b8e1059642082 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupIndexCapsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/action/GetRollupIndexCapsAction.java @@ -6,11 +6,11 @@ */ package org.elasticsearch.xpack.core.rollup.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -40,7 +40,7 @@ private GetRollupIndexCapsAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest.Replaceable, ToXContentFragment { + public static class Request extends LegacyActionRequest implements IndicesRequest.Replaceable, ToXContentFragment { private String[] indices; private IndicesOptions options; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/SubmitAsyncSearchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/SubmitAsyncSearchRequest.java index 4b9700a37ad71..6e34eb1ab244a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/SubmitAsyncSearchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/search/action/SubmitAsyncSearchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ * * @see AsyncSearchResponse */ -public class SubmitAsyncSearchRequest extends ActionRequest { +public class SubmitAsyncSearchRequest extends LegacyActionRequest { public static long MIN_KEEP_ALIVE = TimeValue.timeValueSeconds(1).millis(); private TimeValue waitForCompletionTimeout = TimeValue.timeValueSeconds(1); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationRequest.java index 5932e5ce5ff23..b063ff41a6ab5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/DelegatePkiAuthenticationRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ConstructingObjectParser; @@ -37,7 +37,7 @@ * The request object for {@code TransportDelegatePkiAuthenticationAction} containing the certificate chain for the target subject * distinguished name to be granted an access token. */ -public final class DelegatePkiAuthenticationRequest extends ActionRequest implements ToXContentObject { +public final class DelegatePkiAuthenticationRequest extends LegacyActionRequest implements ToXContentObject { private static final ParseField X509_CERTIFICATE_CHAIN_FIELD = new ParseField("x509_certificate_chain"); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GrantRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GrantRequest.java index 9675d66a183a5..9a3be903e8317 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GrantRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/GrantRequest.java @@ -7,14 +7,14 @@ package org.elasticsearch.xpack.core.security.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -public abstract class GrantRequest extends ActionRequest { +public abstract class GrantRequest extends LegacyActionRequest { protected final Grant grant; public GrantRequest() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/AbstractCreateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/AbstractCreateApiKeyRequest.java index 6e827a4a66a5d..dfd65c43ee59f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/AbstractCreateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/AbstractCreateApiKeyRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.apikey; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; @@ -26,7 +26,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public abstract class AbstractCreateApiKeyRequest extends ActionRequest { +public abstract class AbstractCreateApiKeyRequest extends LegacyActionRequest { protected final String id; protected String name; protected TimeValue expiration; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java index a592550484eb1..9dfd8a9aadb86 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/BaseUpdateApiKeyRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.apikey; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -23,7 +23,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public abstract class BaseUpdateApiKeyRequest extends ActionRequest { +public abstract class BaseUpdateApiKeyRequest extends LegacyActionRequest { @Nullable protected final List roleDescriptors; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/GetApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/GetApiKeyRequest.java index 8e449abdea737..f61a2fafc6ec3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/GetApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/GetApiKeyRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.apikey; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamOutput; @@ -22,7 +22,7 @@ /** * Request for get API key */ -public final class GetApiKeyRequest extends ActionRequest { +public final class GetApiKeyRequest extends LegacyActionRequest { private final String realmName; private final String userName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java index bcd8ff0493f72..87e35ebf61c8c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.core.security.action.apikey; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -25,7 +25,7 @@ /** * Request for invalidating API key(s) so that it can no longer be used */ -public final class InvalidateApiKeyRequest extends ActionRequest { +public final class InvalidateApiKeyRequest extends LegacyActionRequest { private final String realmName; private final String userName; @@ -129,9 +129,9 @@ public static InvalidateApiKeyRequest usingRealmAndUserName(String realmName, St /** * Creates invalidate API key request for given api key ids * - * @param id api key id + * @param id api key id * @param ownedByAuthenticatedUser set {@code true} if the request is only for the API keys owned by current authenticated user else - * {@code false} + * {@code false} * @return {@link InvalidateApiKeyRequest} */ public static InvalidateApiKeyRequest usingApiKeyId(String id, boolean ownedByAuthenticatedUser) { @@ -141,9 +141,9 @@ public static InvalidateApiKeyRequest usingApiKeyId(String id, boolean ownedByAu /** * Creates invalidate API key request for given api key id * - * @param ids array of api key ids + * @param ids array of api key ids * @param ownedByAuthenticatedUser set {@code true} if the request is only for the API keys owned by current authenticated user else - * {@code false} + * {@code false} * @return {@link InvalidateApiKeyRequest} */ public static InvalidateApiKeyRequest usingApiKeyIds(String[] ids, boolean ownedByAuthenticatedUser) { @@ -153,9 +153,9 @@ public static InvalidateApiKeyRequest usingApiKeyIds(String[] ids, boolean owned /** * Creates invalidate api key request for given api key name * - * @param name api key name + * @param name api key name * @param ownedByAuthenticatedUser set {@code true} if the request is only for the API keys owned by current authenticated user else - * {@code false} + * {@code false} * @return {@link InvalidateApiKeyRequest} */ public static InvalidateApiKeyRequest usingApiKeyName(String name, boolean ownedByAuthenticatedUser) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/QueryApiKeyRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/QueryApiKeyRequest.java index 73392057ec745..63f470b0cc7cb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/QueryApiKeyRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/apikey/QueryApiKeyRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.apikey; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -22,7 +22,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public final class QueryApiKeyRequest extends ActionRequest { +public final class QueryApiKeyRequest extends LegacyActionRequest { @Nullable private final QueryBuilder queryBuilder; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/KibanaEnrollmentRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/KibanaEnrollmentRequest.java index 10f212b0d9ce0..7d1c246a3fb14 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/KibanaEnrollmentRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/KibanaEnrollmentRequest.java @@ -7,13 +7,13 @@ package org.elasticsearch.xpack.core.security.action.enrollment; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; -public final class KibanaEnrollmentRequest extends ActionRequest { +public final class KibanaEnrollmentRequest extends LegacyActionRequest { public KibanaEnrollmentRequest() { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/NodeEnrollmentRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/NodeEnrollmentRequest.java index df82739fc3ff1..41738a1ff8311 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/NodeEnrollmentRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/enrollment/NodeEnrollmentRequest.java @@ -7,13 +7,13 @@ package org.elasticsearch.xpack.core.security.action.enrollment; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; -public final class NodeEnrollmentRequest extends ActionRequest { +public final class NodeEnrollmentRequest extends LegacyActionRequest { public NodeEnrollmentRequest() {} diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java index 3f1160df95e22..538135f56b9b4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.oidc; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ /** * Represents a request for authentication using OpenID Connect */ -public class OpenIdConnectAuthenticateRequest extends ActionRequest { +public class OpenIdConnectAuthenticateRequest extends LegacyActionRequest { /** * The URI where the OP redirected the browser after the authentication attempt. This is passed as is from the diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutRequest.java index a8050fc3352f9..b63478c2ef200 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.oidc; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -17,7 +17,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public final class OpenIdConnectLogoutRequest extends ActionRequest { +public final class OpenIdConnectLogoutRequest extends LegacyActionRequest { private String token; @Nullable diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequest.java index 26388709b084c..11f527141d974 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.oidc; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ /** * Represents a request to prepare an OAuth 2.0 authorization request */ -public class OpenIdConnectPrepareAuthenticationRequest extends ActionRequest { +public class OpenIdConnectPrepareAuthenticationRequest extends LegacyActionRequest { /** * The name of the OpenID Connect realm in the configuration that should be used for authentication diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequest.java index 6bee6e9bc3ad8..680b20bd8d3dd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/DeletePrivilegesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.privilege; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -23,7 +23,7 @@ /** * A request to delete an application privilege. */ -public final class DeletePrivilegesRequest extends ActionRequest +public final class DeletePrivilegesRequest extends LegacyActionRequest implements ApplicationPrivilegesRequest, WriteRequest { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetBuiltinPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetBuiltinPrivilegesRequest.java index bbcd2bbe255ce..9d9970ce16722 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetBuiltinPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetBuiltinPrivilegesRequest.java @@ -6,13 +6,13 @@ */ package org.elasticsearch.xpack.core.security.action.privilege; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; /** * Request to retrieve built-in (cluster/index) privileges. */ -public final class GetBuiltinPrivilegesRequest extends ActionRequest { +public final class GetBuiltinPrivilegesRequest extends LegacyActionRequest { public GetBuiltinPrivilegesRequest() {} diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequest.java index 582317c91623c..d761bce3d392c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/GetPrivilegesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.privilege; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -22,7 +22,7 @@ /** * Request to retrieve one or more application privileges. */ -public final class GetPrivilegesRequest extends ActionRequest implements ApplicationPrivilegesRequest { +public final class GetPrivilegesRequest extends LegacyActionRequest implements ApplicationPrivilegesRequest { @Nullable private String application; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequest.java index e1e9b72364301..45223286aa3f3 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/privilege/PutPrivilegesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.privilege; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,7 +27,10 @@ /** * Request object to put a one or more application privileges. */ -public final class PutPrivilegesRequest extends ActionRequest implements ApplicationPrivilegesRequest, WriteRequest { +public final class PutPrivilegesRequest extends LegacyActionRequest + implements + ApplicationPrivilegesRequest, + WriteRequest { private List privileges; private RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/GetProfilesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/GetProfilesRequest.java index 7a7d969ddb14d..2d76b95c13990 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/GetProfilesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/GetProfilesRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.profile; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class GetProfilesRequest extends ActionRequest { +public class GetProfilesRequest extends LegacyActionRequest { private final List uids; private final Set dataKeys; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SetProfileEnabledRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SetProfileEnabledRequest.java index 671c55579bbfe..03983c116c7c1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SetProfileEnabledRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SetProfileEnabledRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.core.security.action.profile; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -public class SetProfileEnabledRequest extends ActionRequest { +public class SetProfileEnabledRequest extends LegacyActionRequest { private final String uid; private final boolean enabled; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SuggestProfilesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SuggestProfilesRequest.java index 5b92996dafc3a..18bf2b009e766 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SuggestProfilesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/SuggestProfilesRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.core.security.action.profile; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,7 +30,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class SuggestProfilesRequest extends ActionRequest { +public class SuggestProfilesRequest extends LegacyActionRequest { private final Set dataKeys; /** diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java index 90d59e0e39f48..8059b78157a27 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/profile/UpdateProfileDataRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.profile; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest.RefreshPolicy; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -22,7 +22,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class UpdateProfileDataRequest extends ActionRequest { +public class UpdateProfileDataRequest extends LegacyActionRequest { private final String uid; private final Map labels; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkDeleteRolesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkDeleteRolesRequest.java index d7009a683b0e9..a19b12c404726 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkDeleteRolesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkDeleteRolesRequest.java @@ -7,14 +7,14 @@ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import java.util.List; import java.util.Objects; -public class BulkDeleteRolesRequest extends ActionRequest { +public class BulkDeleteRolesRequest extends LegacyActionRequest { private List roleNames; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkPutRolesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkPutRolesRequest.java index 38648f81fbcdd..6975fda7b1f20 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkPutRolesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/BulkPutRolesRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ import java.util.List; import java.util.Objects; -public class BulkPutRolesRequest extends ActionRequest { +public class BulkPutRolesRequest extends LegacyActionRequest { private List roles; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/DeleteRoleRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/DeleteRoleRequest.java index 121ea62ee99e7..c04abb6668d32 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/DeleteRoleRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/DeleteRoleRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ /** * A request delete a role from the security index */ -public class DeleteRoleRequest extends ActionRequest { +public class DeleteRoleRequest extends LegacyActionRequest { private String name; private WriteRequest.RefreshPolicy refreshPolicy = WriteRequest.RefreshPolicy.IMMEDIATE; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/GetRolesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/GetRolesRequest.java index 310bd6c707796..7791ff28ac3be 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/GetRolesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/GetRolesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ /** * Request to retrieve roles from the security index */ -public class GetRolesRequest extends ActionRequest { +public class GetRolesRequest extends LegacyActionRequest { private String[] names = Strings.EMPTY_ARRAY; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java index 46ba00a4f2768..965ba67009ccd 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; @@ -33,7 +33,7 @@ /** * Request object for adding a role to the security index */ -public class PutRoleRequest extends ActionRequest { +public class PutRoleRequest extends LegacyActionRequest { private String name; private String[] clusterPrivileges = Strings.EMPTY_ARRAY; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/QueryRoleRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/QueryRoleRequest.java index c61f9b7156dda..5b16db79ebcb6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/QueryRoleRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/role/QueryRoleRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.role; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -21,7 +21,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public final class QueryRoleRequest extends ActionRequest { +public final class QueryRoleRequest extends LegacyActionRequest { @Nullable private final QueryBuilder queryBuilder; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/DeleteRoleMappingRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/DeleteRoleMappingRequest.java index 5e75f53f12e80..c53aab8801b7b 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/DeleteRoleMappingRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/DeleteRoleMappingRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.rolemapping; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ /** * A request delete a role-mapping from the org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore */ -public class DeleteRoleMappingRequest extends ActionRequest implements WriteRequest { +public class DeleteRoleMappingRequest extends LegacyActionRequest implements WriteRequest { private String name; private RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/GetRoleMappingsRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/GetRoleMappingsRequest.java index e1b018fdb7d7a..c9807fe5151ee 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/GetRoleMappingsRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/GetRoleMappingsRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.rolemapping; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,10 +19,10 @@ /** * Request to retrieve role-mappings from X-Pack security - * + *

      * see org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore */ -public class GetRoleMappingsRequest extends ActionRequest { +public class GetRoleMappingsRequest extends LegacyActionRequest { private String[] names = Strings.EMPTY_ARRAY; @@ -44,6 +44,7 @@ public ActionRequestValidationException validate() { /** * Specify (by name) which role-mappings to delete. + * * @see ExpressionRoleMapping#getName() */ public void setNames(String... names) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java index 1ce27c1e7c372..cbad0490bdd73 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/rolemapping/PutRoleMappingRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.rolemapping; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,10 +30,10 @@ /** * Request object for adding/updating a role-mapping to the native store - * + *

      * see org.elasticsearch.xpack.security.authc.support.mapper.NativeRoleMappingStore */ -public class PutRoleMappingRequest extends ActionRequest implements WriteRequest { +public class PutRoleMappingRequest extends LegacyActionRequest implements WriteRequest { private String name = null; private boolean enabled = true; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateRequest.java index 1a5041c8d985d..d3241dd3cb813 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlAuthenticateRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.core.Nullable; @@ -17,7 +17,7 @@ /** * Represents a request to authenticate using SAML assertions. */ -public final class SamlAuthenticateRequest extends ActionRequest { +public final class SamlAuthenticateRequest extends LegacyActionRequest { private byte[] saml; private List validRequestIds; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlCompleteLogoutRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlCompleteLogoutRequest.java index b4e0cd5ab90ea..8d5d7c8f85b00 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlCompleteLogoutRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlCompleteLogoutRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.core.Nullable; @@ -20,7 +20,7 @@ /** * Represents a request to complete SAML LogoutResponse */ -public final class SamlCompleteLogoutRequest extends ActionRequest { +public final class SamlCompleteLogoutRequest extends LegacyActionRequest { @Nullable private String queryString; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlInvalidateSessionRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlInvalidateSessionRequest.java index a9314ddcf012e..e23885e886547 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlInvalidateSessionRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlInvalidateSessionRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.core.Nullable; @@ -19,7 +19,7 @@ /** * Represents a request to invalidate a SAML session using a {@code LogoutRequest}. */ -public final class SamlInvalidateSessionRequest extends ActionRequest { +public final class SamlInvalidateSessionRequest extends LegacyActionRequest { @Nullable private String realmName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlLogoutRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlLogoutRequest.java index fa6dad6215b1e..cb95ab0f19d5e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlLogoutRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlLogoutRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.core.Nullable; @@ -19,7 +19,7 @@ /** * Represents a request to prepare a SAML {@code <LogoutRequest>}. */ -public final class SamlLogoutRequest extends ActionRequest { +public final class SamlLogoutRequest extends LegacyActionRequest { private String token; @Nullable diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java index 3b5ddb21be91c..6cf9d732b93a8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlPrepareAuthenticationRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.saml; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -18,7 +18,7 @@ /** * Represents a request to prepare a SAML {@code <AuthnRequest>}. */ -public final class SamlPrepareAuthenticationRequest extends ActionRequest { +public final class SamlPrepareAuthenticationRequest extends LegacyActionRequest { @Nullable private String realmName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequest.java index 99b86aa22e3ff..b2d7de183b00d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/saml/SamlSpMetadataRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.saml; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -17,7 +17,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class SamlSpMetadataRequest extends ActionRequest { +public class SamlSpMetadataRequest extends LegacyActionRequest { private String realmName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/CreateServiceAccountTokenRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/CreateServiceAccountTokenRequest.java index 5ec9f2333f8e9..8dec45ccb5ea5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/CreateServiceAccountTokenRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/CreateServiceAccountTokenRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.service; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,7 +20,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class CreateServiceAccountTokenRequest extends ActionRequest { +public class CreateServiceAccountTokenRequest extends LegacyActionRequest { private final String namespace; private final String serviceName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/DeleteServiceAccountTokenRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/DeleteServiceAccountTokenRequest.java index 281541be396b2..d3937d821df62 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/DeleteServiceAccountTokenRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/DeleteServiceAccountTokenRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.service; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,7 +20,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class DeleteServiceAccountTokenRequest extends ActionRequest { +public class DeleteServiceAccountTokenRequest extends LegacyActionRequest { private final String namespace; private final String serviceName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountCredentialsRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountCredentialsRequest.java index c0cdffdfd5df3..12d30803a784e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountCredentialsRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountCredentialsRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.service; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class GetServiceAccountCredentialsRequest extends ActionRequest { +public class GetServiceAccountCredentialsRequest extends LegacyActionRequest { private final String namespace; private final String serviceName; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountRequest.java index 1d9c60d33cf07..e17b7e4d6eb12 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/service/GetServiceAccountRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.service; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -16,7 +16,7 @@ import java.io.IOException; import java.util.Objects; -public class GetServiceAccountRequest extends ActionRequest { +public class GetServiceAccountRequest extends LegacyActionRequest { @Nullable private final String namespace; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenRequest.java index 3b1d67090e8d4..113f4729a42d5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/CreateTokenRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.token; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ * fields for an OAuth 2.0 access token request that uses the password grant type or the * refresh_token grant type. */ -public final class CreateTokenRequest extends ActionRequest { +public final class CreateTokenRequest extends LegacyActionRequest { public enum GrantType { PASSWORD("password"), diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenRequest.java index 6c4b157dcf1f9..d0a587939e6e6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.token; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ /** * Request for invalidating a token so that it can no longer be used */ -public final class InvalidateTokenRequest extends ActionRequest { +public final class InvalidateTokenRequest extends LegacyActionRequest { public enum Type { ACCESS_TOKEN("token"), @@ -66,9 +66,9 @@ public InvalidateTokenRequest() {} /** * @param tokenString the string representation of the token to be invalidated - * @param tokenType the type of the token to be invalidated - * @param realmName the name of the realm for which all tokens will be invalidated - * @param userName the principal of the user for which all tokens will be invalidated + * @param tokenType the type of the token to be invalidated + * @param realmName the name of the realm for which all tokens will be invalidated + * @param userName the principal of the user for which all tokens will be invalidated */ public InvalidateTokenRequest( @Nullable String tokenString, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java index 78533dd93564f..5f22c73aa8ce4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/AuthenticateRequest.java @@ -7,14 +7,14 @@ package org.elasticsearch.xpack.core.security.action.user; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; -public class AuthenticateRequest extends ActionRequest { +public class AuthenticateRequest extends LegacyActionRequest { public static final AuthenticateRequest INSTANCE = new AuthenticateRequest(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ChangePasswordRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ChangePasswordRequest.java index c5a807b06bb33..4051bf54f5ec5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ChangePasswordRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ChangePasswordRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -22,7 +22,7 @@ /** * Request to change a user's password. */ -public class ChangePasswordRequest extends ActionRequest implements UserRequest, WriteRequest { +public class ChangePasswordRequest extends LegacyActionRequest implements UserRequest, WriteRequest { private String username; private char[] passwordHash; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/DeleteUserRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/DeleteUserRequest.java index 7144489ba6ecb..5f3510ecf9cc8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/DeleteUserRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/DeleteUserRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ /** * A request to delete a native user. */ -public class DeleteUserRequest extends ActionRequest implements UserRequest, WriteRequest { +public class DeleteUserRequest extends LegacyActionRequest implements UserRequest, WriteRequest { private String username; private RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesRequest.java index 308fc7e5f3eb1..5c7dfc679e393 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -16,7 +16,7 @@ /** * A request for checking a user's privileges */ -public final class GetUserPrivilegesRequest extends ActionRequest implements UserRequest { +public final class GetUserPrivilegesRequest extends LegacyActionRequest implements UserRequest { private String username; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java index 29c48f29709fd..6ad0d6ace842f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUsersRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.user; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,7 +20,7 @@ /** * Request to retrieve a native user. */ -public class GetUsersRequest extends ActionRequest implements UserRequest { +public class GetUsersRequest extends LegacyActionRequest implements UserRequest { private String[] usernames; private boolean withProfileUid; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/HasPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/HasPrivilegesRequest.java index 56485ed6b1565..d46916f58128d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/HasPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/HasPrivilegesRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xpack.core.security.authz.AuthorizationEngine; @@ -19,7 +19,7 @@ /** * A request for checking a user's privileges */ -public class HasPrivilegesRequest extends ActionRequest implements UserRequest { +public class HasPrivilegesRequest extends LegacyActionRequest implements UserRequest { private String username; private String[] clusterPrivileges; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ProfileHasPrivilegesRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ProfileHasPrivilegesRequest.java index 740f9aef67137..bde60dcdfb65f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ProfileHasPrivilegesRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/ProfileHasPrivilegesRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.tasks.CancellableTask; @@ -28,7 +28,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg; -public class ProfileHasPrivilegesRequest extends ActionRequest { +public class ProfileHasPrivilegesRequest extends LegacyActionRequest { @SuppressWarnings("unchecked") public static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( @@ -36,6 +36,7 @@ public class ProfileHasPrivilegesRequest extends ActionRequest { false, argv -> new ProfileHasPrivilegesRequest((List) argv[0], (PrivilegesToCheck) argv[1]) ); + static { PARSER.declareStringArray(constructorArg(), Fields.UIDS); PARSER.declareField( diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java index 1ac96fddf3454..00f86ff023ccb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/PutUserRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; @@ -26,7 +26,7 @@ /** * Request object to put a native user. */ -public class PutUserRequest extends ActionRequest implements UserRequest, WriteRequest { +public class PutUserRequest extends LegacyActionRequest implements UserRequest, WriteRequest { private String username; private String[] roles; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/QueryUserRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/QueryUserRequest.java index c5f804d39020a..5d539a1ff9279 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/QueryUserRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/QueryUserRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -25,7 +25,7 @@ * Request for the query Users API.
      * Model for API requests to the query users API */ -public final class QueryUserRequest extends ActionRequest { +public final class QueryUserRequest extends LegacyActionRequest { @Nullable private final QueryBuilder queryBuilder; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/SetEnabledRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/SetEnabledRequest.java index 7b5019498751c..53fce1f620cdb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/SetEnabledRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/SetEnabledRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.security.action.user; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -22,7 +22,7 @@ /** * The request that allows to set a user as enabled or disabled */ -public class SetEnabledRequest extends ActionRequest implements UserRequest, WriteRequest { +public class SetEnabledRequest extends LegacyActionRequest implements UserRequest, WriteRequest { private Boolean enabled; private String username; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/action/GetCertificateInfoAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/action/GetCertificateInfoAction.java index 32d9725a909c6..7aec426351d12 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/action/GetCertificateInfoAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/action/GetCertificateInfoAction.java @@ -6,11 +6,11 @@ */ package org.elasticsearch.xpack.core.ssl.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.client.internal.ElasticsearchClient; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -34,7 +34,7 @@ private GetCertificateInfoAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { Request() {} diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java index e06ffd3b95a05..3f202fafb588d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/AbstractFindStructureRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.core.textstructure.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -25,7 +25,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public abstract class AbstractFindStructureRequest extends ActionRequest { +public abstract class AbstractFindStructureRequest extends LegacyActionRequest { public static final int MIN_SAMPLE_LINE_COUNT = 2; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/TestGrokPatternAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/TestGrokPatternAction.java index 61aa1394dbccc..4f1c63ee6fda4 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/TestGrokPatternAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/textstructure/action/TestGrokPatternAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.core.textstructure.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,22 +30,20 @@ public class TestGrokPatternAction { - public static final ActionType INSTANCE = new ActionType<>( - "cluster:monitor/text_structure/test_grok_pattern" - ); + public static final ActionType INSTANCE = new ActionType<>("cluster:monitor/text_structure/test_grok_pattern"); - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public static final ParseField GROK_PATTERN = new ParseField("grok_pattern"); public static final ParseField TEXT = new ParseField("text"); public static final ParseField ECS_COMPATIBILITY = new ParseField("ecs_compatibility"); - private static final ObjectParser PARSER = createParser(); + private static final ObjectParser PARSER = createParser(); - private static ObjectParser createParser() { - ObjectParser parser = new ObjectParser<>("textstructure/testgrokpattern", false, Request.Builder::new); - parser.declareString(Request.Builder::grokPattern, GROK_PATTERN); - parser.declareStringArray(Request.Builder::text, TEXT); + private static ObjectParser createParser() { + ObjectParser parser = new ObjectParser<>("textstructure/testgrokpattern", false, Builder::new); + parser.declareString(Builder::grokPattern, GROK_PATTERN); + parser.declareStringArray(Builder::text, TEXT); return parser; } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java index 61be7cb3fe69e..4fdd068774adb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointAction.java @@ -8,11 +8,11 @@ package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.RemoteClusterActionType; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; @@ -47,7 +47,7 @@ private GetCheckpointAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest.Replaceable { + public static class Request extends LegacyActionRequest implements IndicesRequest.Replaceable { private String[] indices; private final IndicesOptions indicesOptions; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java index bdf0dd48886b4..e3bff41fc0a8a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/action/GetCheckpointNodeAction.java @@ -8,11 +8,11 @@ package org.elasticsearch.xpack.core.transform.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.OriginalIndices; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; @@ -88,7 +88,7 @@ public int hashCode() { } } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final Set shards; private final OriginalIndices originalIndices; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/QueryWatchesAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/QueryWatchesAction.java index 31c27cbe3d470..9c7331cfb1ab9 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/QueryWatchesAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/QueryWatchesAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.core.watcher.transport.actions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; @@ -19,7 +19,6 @@ import org.elasticsearch.xcontent.ConstructingObjectParser; import org.elasticsearch.xcontent.ObjectParser; import org.elasticsearch.xcontent.ParseField; -import org.elasticsearch.xcontent.ToXContent; import org.elasticsearch.xcontent.ToXContentFragment; import org.elasticsearch.xcontent.ToXContentObject; import org.elasticsearch.xcontent.XContentBuilder; @@ -44,7 +43,7 @@ private QueryWatchesAction() { super(NAME); } - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { public static final ParseField FROM_FIELD = new ParseField("from"); public static final ParseField SIZE_FIELD = new ParseField("size"); @@ -162,7 +161,7 @@ public void writeTo(StreamOutput out) throws IOException { } @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); if (from != null) { builder.field(FROM_FIELD.getPreferredName(), from); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/ack/AckWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/ack/AckWatchRequest.java index 2540f29fcc769..8e81a3eefcad1 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/ack/AckWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/ack/AckWatchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.watcher.transport.actions.ack; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,7 +20,7 @@ /** * A ack watch request to ack a watch by name (id) */ -public class AckWatchRequest extends ActionRequest { +public class AckWatchRequest extends LegacyActionRequest { private String watchId; private String[] actionIds = Strings.EMPTY_ARRAY; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/activate/ActivateWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/activate/ActivateWatchRequest.java index 669ba097a94d6..d0152b4a6f024 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/activate/ActivateWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/activate/ActivateWatchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.watcher.transport.actions.activate; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ /** * A ack watch request to ack a watch by name (id) */ -public class ActivateWatchRequest extends ActionRequest { +public class ActivateWatchRequest extends LegacyActionRequest { private String watchId; private boolean activate; @@ -54,7 +54,7 @@ public String getWatchId() { /** * @return {@code true} if the request is for activating the watch, {@code false} if its - * for deactivating it. + * for deactivating it. */ public boolean isActivate() { return activate; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java index 2f2617f956ed9..9bb0e3a47bada 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/execute/ExecuteWatchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.watcher.transport.actions.execute; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,7 +28,7 @@ /** * A request to execute a watch by id */ -public class ExecuteWatchRequest extends ActionRequest { +public class ExecuteWatchRequest extends LegacyActionRequest { public static final String INLINE_WATCH_ID = "_inlined_"; @@ -200,8 +200,8 @@ public void setWatchSource(WatchSourceBuilder watchSource) { } /** - * @return the execution modes for the actions. These modes determine the nature of the execution - * of the watch actions while the watch is executing. + * @return the execution modes for the actions. These modes determine the nature of the execution + * of the watch actions while the watch is executing. */ public Map getActionModes() { return actionModes; @@ -210,8 +210,8 @@ public Map getActionModes() { /** * Sets the action execution mode for the give action (identified by its id). * - * @param actionId the action id. - * @param actionMode the execution mode of the action. + * @param actionId the action id. + * @param actionMode the execution mode of the action. */ public void setActionMode(String actionId, ActionExecutionMode actionMode) { actionModes.put(actionId, actionMode); @@ -219,7 +219,7 @@ public void setActionMode(String actionId, ActionExecutionMode actionMode) { /** * @return whether the watch should execute in debug mode. In debug mode the execution {@code vars} - * will be returned as part of the watch record. + * will be returned as part of the watch record. */ public boolean isDebug() { return debug; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchRequest.java index 8a21665f30b9d..52baecc9f62e8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transport/actions/get/GetWatchRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.core.watcher.transport.actions.get; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -18,7 +18,7 @@ /** * The request to get the watch by name (id) */ -public class GetWatchRequest extends ActionRequest { +public class GetWatchRequest extends LegacyActionRequest { private String id; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/action/MockIndicesRequest.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/action/MockIndicesRequest.java index f64f9e762a542..da45d7b34c49e 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/action/MockIndicesRequest.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/action/MockIndicesRequest.java @@ -8,7 +8,7 @@ import org.elasticsearch.action.support.IndicesOptions; -public class MockIndicesRequest extends ActionRequest implements IndicesRequest, CompositeIndicesRequest { +public class MockIndicesRequest extends LegacyActionRequest implements IndicesRequest, CompositeIndicesRequest { private final String[] indices; private final IndicesOptions indicesOptions; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilterTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilterTests.java index 4e816c599ccc1..c5365c19632b1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilterTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/api/filtering/ApiFilteringActionFilterTests.java @@ -8,9 +8,9 @@ package org.elasticsearch.xpack.core.api.filtering; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilterChain; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; @@ -127,7 +127,7 @@ private ThreadContext getTestThreadContext(boolean isOperator) { return new ThreadContext(settings); } - private static class TestRequest extends ActionRequest { + private static class TestRequest extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequestTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequestTests.java index 8c84f6f0e9b5a..7169aa8b41855 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequestTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/apikey/InvalidateApiKeyRequestTests.java @@ -9,8 +9,8 @@ import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.InputStreamStreamInput; import org.elasticsearch.common.io.stream.OutputStreamStreamOutput; @@ -95,7 +95,7 @@ public void testRequestValidation() { } public void testRequestValidationFailureScenarios() throws IOException { - class Dummy extends ActionRequest { + class Dummy extends LegacyActionRequest { String realm; String user; String apiKeyId; diff --git a/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardPersistentTaskExecutor.java b/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardPersistentTaskExecutor.java index e5b9ca32808a7..579473d3b7b8e 100644 --- a/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardPersistentTaskExecutor.java +++ b/x-pack/plugin/downsample/src/main/java/org/elasticsearch/xpack/downsample/DownsampleShardPersistentTaskExecutor.java @@ -11,11 +11,11 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.BytesRef; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; @@ -263,7 +263,7 @@ private DelegatingAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest.RemoteClusterShardRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest.RemoteClusterShardRequest { private final DownsampleShardTask task; private final BytesRef lastDownsampleTsid; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/PostAnalyticsEventAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/PostAnalyticsEventAction.java index 7e5d05e9e222e..603672a65d166 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/PostAnalyticsEventAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/analytics/action/PostAnalyticsEventAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.analytics.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -39,11 +39,11 @@ public class PostAnalyticsEventAction { public static final String NAME = "cluster:admin/xpack/application/analytics/post_event"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private PostAnalyticsEventAction() {/* no instances */} - public static class Request extends ActionRequest implements AnalyticsEvent.Context, ToXContentObject { + public static class Request extends LegacyActionRequest implements AnalyticsEvent.Context, ToXContentObject { private final String eventCollectionName; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/action/ConnectorActionRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/action/ConnectorActionRequest.java index 1799121505da5..97bce41966757 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/action/ConnectorActionRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/action/ConnectorActionRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.application.connector.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.metadata.MetadataCreateIndexService; import org.elasticsearch.common.io.stream.StreamInput; @@ -24,7 +24,7 @@ * Abstract base class for action requests targeting the connectors index. Implements {@link org.elasticsearch.action.IndicesRequest} * to ensure index-level privilege support. This class defines the connectors index as the target for all derived action requests. */ -public abstract class ConnectorActionRequest extends ActionRequest implements IndicesRequest { +public abstract class ConnectorActionRequest extends LegacyActionRequest implements IndicesRequest { public ConnectorActionRequest() { super(); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/DeleteConnectorSecretRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/DeleteConnectorSecretRequest.java index efc8b2b6c660d..d273650d9c0da 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/DeleteConnectorSecretRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/DeleteConnectorSecretRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.application.connector.secrets.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class DeleteConnectorSecretRequest extends ActionRequest { +public class DeleteConnectorSecretRequest extends LegacyActionRequest { private final String id; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/GetConnectorSecretRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/GetConnectorSecretRequest.java index e8792dd3755bd..10ade525ee6f0 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/GetConnectorSecretRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/GetConnectorSecretRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.application.connector.secrets.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -19,7 +19,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class GetConnectorSecretRequest extends ActionRequest { +public class GetConnectorSecretRequest extends LegacyActionRequest { private final String id; diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PostConnectorSecretRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PostConnectorSecretRequest.java index 90672f7ca7120..b02e95f95db93 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PostConnectorSecretRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PostConnectorSecretRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.application.connector.secrets.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -23,7 +23,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class PostConnectorSecretRequest extends ActionRequest { +public class PostConnectorSecretRequest extends LegacyActionRequest { private static final ParseField VALUE_FIELD = new ParseField("value"); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PutConnectorSecretRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PutConnectorSecretRequest.java index 94bfceaddb84f..e7ddc224ae7ce 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PutConnectorSecretRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/secrets/action/PutConnectorSecretRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.application.connector.secrets.action; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -17,7 +17,6 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.xcontent.ConstructingObjectParser; import org.elasticsearch.xcontent.ParseField; -import org.elasticsearch.xcontent.ToXContent; import org.elasticsearch.xcontent.ToXContentObject; import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentParser; @@ -30,7 +29,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg; -public class PutConnectorSecretRequest extends ActionRequest implements ToXContentObject { +public class PutConnectorSecretRequest extends LegacyActionRequest implements ToXContentObject { private final String id; private final String value; @@ -68,7 +67,7 @@ public static PutConnectorSecretRequest fromXContent(XContentParser parser, Stri return PARSER.parse(parser, id); } - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field("value", value); builder.endObject(); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/syncjob/action/ConnectorSyncJobActionRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/syncjob/action/ConnectorSyncJobActionRequest.java index bb83fd78151df..86e4bce51cb72 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/syncjob/action/ConnectorSyncJobActionRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/connector/syncjob/action/ConnectorSyncJobActionRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.application.connector.syncjob.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.xpack.application.connector.ConnectorTemplateRegistry; @@ -20,7 +20,7 @@ * Implements {@link org.elasticsearch.action.IndicesRequest} to ensure index-level privilege support. * This class defines the connectors sync job index as the target for all derived action requests. */ -public abstract class ConnectorSyncJobActionRequest extends ActionRequest implements IndicesRequest { +public abstract class ConnectorSyncJobActionRequest extends LegacyActionRequest implements IndicesRequest { public ConnectorSyncJobActionRequest() { super(); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRuleAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRuleAction.java index da7866bd62bd8..8038d313d2468 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRuleAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRuleAction.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -33,7 +33,7 @@ public class DeleteQueryRuleAction { private DeleteQueryRuleAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String rulesetId; private final String ruleId; @@ -108,6 +108,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws false, (p) -> new Request((String) p[0], (String) p[1]) ); + static { PARSER.declareString(constructorArg(), RULESET_ID_FIELD); PARSER.declareString(constructorArg(), RULE_ID_FIELD); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRulesetAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRulesetAction.java index 1b4ae187b2631..a81ff63a3131a 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRulesetAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/DeleteQueryRulesetAction.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -33,7 +33,7 @@ public class DeleteQueryRulesetAction { private DeleteQueryRulesetAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String rulesetId; private static final ParseField RULESET_ID_FIELD = new ParseField("ruleset_id"); @@ -96,6 +96,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws return new Request((String) p[0]); } ); + static { PARSER.declareString(constructorArg(), RULESET_ID_FIELD); } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRuleAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRuleAction.java index 7e24a374a6daf..9cd73588a5efb 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRuleAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRuleAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -30,11 +30,11 @@ public class GetQueryRuleAction { public static final String NAME = "cluster:admin/xpack/query_rules/rule/get"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private GetQueryRuleAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String rulesetId; private final String ruleId; @@ -110,6 +110,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws (p) -> new Request((String) p[0], (String) p[1]) ); + static { PARSER.declareString(constructorArg(), RULESET_ID_FIELD); PARSER.declareString(constructorArg(), RULE_ID_FIELD); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetAction.java index 1d5ba878264f7..057b9ed4b81aa 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/GetQueryRulesetAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -31,13 +31,13 @@ public class GetQueryRulesetAction { - public static final ActionType TYPE = new ActionType<>("cluster:admin/xpack/query_rules/get"); + public static final ActionType TYPE = new ActionType<>("cluster:admin/xpack/query_rules/get"); public static final String NAME = TYPE.name(); - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private GetQueryRulesetAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String rulesetId; private static final ParseField RULESET_ID_FIELD = new ParseField("ruleset_id"); @@ -100,6 +100,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } ); + static { PARSER.declareString(constructorArg(), RULESET_ID_FIELD); } diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsAction.java index c85416c5f08c5..1cf9c99488889 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/ListQueryRulesetsAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.features.NodeFeature; @@ -32,13 +32,13 @@ public class ListQueryRulesetsAction { public static final String NAME = "cluster:admin/xpack/query_rules/list"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); public static final NodeFeature QUERY_RULE_LIST_TYPES = new NodeFeature("query_rule_list_types", true); private ListQueryRulesetsAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final PageParams pageParams; private static final ParseField PAGE_PARAMS_FIELD = new ParseField("pageParams"); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRuleAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRuleAction.java index 5f6d12ca719a0..21794db295e5f 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRuleAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRuleAction.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.DocWriteResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -34,11 +34,11 @@ public class PutQueryRuleAction { public static final String NAME = "cluster:admin/xpack/query_rules/rule/put"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private PutQueryRuleAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String queryRulesetId; private final QueryRule queryRule; @@ -131,12 +131,12 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws PARSER.declareObject(constructorArg(), (p, c) -> QueryRule.fromXContent(p), QUERY_RULE_FIELD); } - public static PutQueryRuleAction.Request parse(XContentParser parser, String resourceName) { + public static Request parse(XContentParser parser, String resourceName) { return PARSER.apply(parser, resourceName); } - public static PutQueryRuleAction.Request fromXContent(String queryRulesetId, XContentParser parser) throws IOException { - return new PutQueryRuleAction.Request(queryRulesetId, QueryRule.fromXContent(parser)); + public static Request fromXContent(String queryRulesetId, XContentParser parser) throws IOException { + return new Request(queryRulesetId, QueryRule.fromXContent(parser)); } @Override diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetAction.java index 842d5d5e0cee4..df746e20f9b86 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/PutQueryRulesetAction.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.DocWriteResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; @@ -36,11 +36,11 @@ public class PutQueryRulesetAction { public static final String NAME = "cluster:admin/xpack/query_rules/put"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private PutQueryRulesetAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final QueryRuleset queryRuleset; private static final ParseField QUERY_RULESET_FIELD = new ParseField("queryRuleset"); @@ -120,8 +120,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws PARSER.declareObject(constructorArg(), (p, c) -> QueryRuleset.fromXContent(c, p), QUERY_RULESET_FIELD); } - public static PutQueryRulesetAction.Request fromXContent(String id, XContentParser parser) throws IOException { - return new PutQueryRulesetAction.Request(QueryRuleset.fromXContent(id, parser)); + public static Request fromXContent(String id, XContentParser parser) throws IOException { + return new Request(QueryRuleset.fromXContent(id, parser)); } @Override diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/TestQueryRulesetAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/TestQueryRulesetAction.java index b8293ca64cf05..3bea532b82baa 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/TestQueryRulesetAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/rules/action/TestQueryRulesetAction.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.application.rules.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -38,14 +38,14 @@ public class TestQueryRulesetAction { public static final NodeFeature QUERY_RULES_TEST_API = new NodeFeature("query_rules.test", true); // TODO - We'd like to transition this to require less stringent permissions - public static final ActionType TYPE = new ActionType<>("cluster:admin/xpack/query_rules/test"); + public static final ActionType TYPE = new ActionType<>("cluster:admin/xpack/query_rules/test"); public static final String NAME = TYPE.name(); - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private TestQueryRulesetAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject, IndicesRequest { + public static class Request extends LegacyActionRequest implements ToXContentObject, IndicesRequest { private final String rulesetId; private final Map matchCriteria; @@ -123,6 +123,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } ); + static { PARSER.declareObject(constructorArg(), (p, c) -> p.map(), MATCH_CRITERIA_FIELD); PARSER.declareString(optionalConstructorArg(), RULESET_ID_FIELD); // Required for parsing diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/DeleteSearchApplicationAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/DeleteSearchApplicationAction.java index 93ad2f46b5583..4d23d81713326 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/DeleteSearchApplicationAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/DeleteSearchApplicationAction.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.application.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ public class DeleteSearchApplicationAction { private DeleteSearchApplicationAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String name; public static ParseField NAME_FIELD = new ParseField("name"); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/GetSearchApplicationAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/GetSearchApplicationAction.java index aa4a7f4375ed5..a359e83f09c8d 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/GetSearchApplicationAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/GetSearchApplicationAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ConstructingObjectParser; @@ -30,11 +30,11 @@ public class GetSearchApplicationAction { public static final String NAME = "cluster:admin/xpack/application/search_application/get"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private GetSearchApplicationAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final String name; public static final ParseField NAME_FIELD = new ParseField("name"); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/ListSearchApplicationAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/ListSearchApplicationAction.java index 5f82f628814cf..98611692676fc 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/ListSearchApplicationAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/ListSearchApplicationAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.application.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -35,11 +35,11 @@ public class ListSearchApplicationAction { public static final String NAME = "cluster:admin/xpack/application/search_application/list"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private ListSearchApplicationAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private static final String DEFAULT_QUERY = "*"; public static final ParseField QUERY = new ParseField("query"); @@ -110,6 +110,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws "list_search_application_request", p -> new Request((String) p[0], (PageParams) p[1]) ); + static { PARSER.declareString(optionalConstructorArg(), QUERY); PARSER.declareObject(constructorArg(), (p, c) -> PageParams.fromXContent(p), PAGE_PARAMS); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/PutSearchApplicationAction.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/PutSearchApplicationAction.java index 75bec0d61649f..22d8b73da3233 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/PutSearchApplicationAction.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/PutSearchApplicationAction.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.application.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.DocWriteResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -33,11 +33,11 @@ public class PutSearchApplicationAction { public static final String NAME = "cluster:admin/xpack/application/search_application/put"; - public static final ActionType INSTANCE = new ActionType<>(NAME); + public static final ActionType INSTANCE = new ActionType<>(NAME); private PutSearchApplicationAction() {/* no instances */} - public static class Request extends ActionRequest implements ToXContentObject { + public static class Request extends LegacyActionRequest implements ToXContentObject { private final SearchApplication searchApp; private final boolean create; @@ -110,6 +110,7 @@ public int hashCode() { false, (params) -> new Request((SearchApplication) params[0], (boolean) params[1]) ); + static { PARSER.declareObject(constructorArg(), (p, c) -> SearchApplication.fromXContent(c, p), SEARCH_APPLICATION); PARSER.declareBoolean(constructorArg(), CREATE); diff --git a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java index 105b58308217b..671407c0c9ce3 100644 --- a/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java +++ b/x-pack/plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/search/action/SearchApplicationSearchRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.application.search.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -31,7 +31,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstructorArg; -public class SearchApplicationSearchRequest extends ActionRequest implements IndicesRequest, ToXContentObject { +public class SearchApplicationSearchRequest extends LegacyActionRequest implements IndicesRequest, ToXContentObject { private static final ParseField QUERY_PARAMS_FIELD = new ParseField("params"); private static final ParseField NAME_FIELD = new ParseField("name"); diff --git a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java index 5804e11b72ff5..9d0485e5c3123 100644 --- a/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java +++ b/x-pack/plugin/eql/src/main/java/org/elasticsearch/xpack/eql/action/EqlSearchRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.eql.action; import org.elasticsearch.TransportVersions; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -42,7 +42,7 @@ import static org.elasticsearch.xpack.eql.action.RequestDefaults.FIELD_EVENT_CATEGORY; import static org.elasticsearch.xpack.eql.action.RequestDefaults.FIELD_TIMESTAMP; -public class EqlSearchRequest extends ActionRequest implements IndicesRequest.Replaceable, ToXContent { +public class EqlSearchRequest extends LegacyActionRequest implements IndicesRequest.Replaceable, ToXContent { public static long MIN_KEEP_ALIVE = TimeValue.timeValueMinutes(1).millis(); public static TimeValue DEFAULT_KEEP_ALIVE = TimeValue.timeValueDays(5); @@ -281,13 +281,13 @@ protected static ObjectParser objectParser EqlSearchRequest::waitForCompletionTimeout, (p, c) -> TimeValue.parseTimeValue(p.text(), KEY_WAIT_FOR_COMPLETION_TIMEOUT), WAIT_FOR_COMPLETION_TIMEOUT, - ObjectParser.ValueType.VALUE + ValueType.VALUE ); parser.declareField( EqlSearchRequest::keepAlive, (p, c) -> TimeValue.parseTimeValue(p.text(), KEY_KEEP_ALIVE), KEEP_ALIVE, - ObjectParser.ValueType.VALUE + ValueType.VALUE ); parser.declareBoolean(EqlSearchRequest::keepOnCompletion, KEEP_ON_COMPLETION); parser.declareString(EqlSearchRequest::resultPosition, RESULT_POSITION); @@ -467,7 +467,7 @@ private static List parseFetchFields(XContentParser parser) thro Token token = parser.currentToken(); if (token == Token.START_ARRAY) { - while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) { + while ((token = parser.nextToken()) != Token.END_ARRAY) { result.add(FieldAndFormat.fromXContent(parser)); } } diff --git a/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/async/AsyncTaskManagementServiceTests.java b/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/async/AsyncTaskManagementServiceTests.java index 5361f1e8d1974..2a7b58aecb1df 100644 --- a/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/async/AsyncTaskManagementServiceTests.java +++ b/x-pack/plugin/esql-core/src/test/java/org/elasticsearch/xpack/esql/core/async/AsyncTaskManagementServiceTests.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.esql.core.async; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionTestUtils; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.io.stream.StreamInput; @@ -50,7 +50,7 @@ public class AsyncTaskManagementServiceTests extends ESSingleNodeTestCase { private final ExecutorService executorService = Executors.newFixedThreadPool(1); - public static class TestRequest extends ActionRequest { + public static class TestRequest extends LegacyActionRequest { private final String string; public TestRequest(String string) { diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverTaskRunner.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverTaskRunner.java index 409f5ed39c017..8415456e9d185 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverTaskRunner.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/DriverTaskRunner.java @@ -8,10 +8,10 @@ package org.elasticsearch.compute.operator; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.CompositeIndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ChannelActionListener; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -65,7 +65,7 @@ protected void start(Driver driver, ActionListener driverListener) { runner.runToCompletion(drivers, listener); } - private static class DriverRequest extends ActionRequest implements CompositeIndicesRequest { + private static class DriverRequest extends LegacyActionRequest implements CompositeIndicesRequest { private final Driver driver; private final Executor executor; diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/DeleteSecretRequest.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/DeleteSecretRequest.java index 9a08eccf3b257..c0a4d8a18941e 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/DeleteSecretRequest.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/DeleteSecretRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.fleet.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.Objects; -public class DeleteSecretRequest extends ActionRequest { +public class DeleteSecretRequest extends LegacyActionRequest { private final String id; diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsAction.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsAction.java index 75c29b6635a46..08b4350680216 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsAction.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsAction.java @@ -9,12 +9,12 @@ import org.elasticsearch.ElasticsearchStatusException; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.IndicesOptions; @@ -41,7 +41,6 @@ import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; -import org.elasticsearch.xcontent.ToXContent; import org.elasticsearch.xcontent.ToXContentObject; import org.elasticsearch.xcontent.XContentBuilder; @@ -82,7 +81,7 @@ public void writeTo(StreamOutput out) { } @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.field("timed_out", timedOut); builder.array("global_checkpoints", globalCheckpoints); @@ -90,7 +89,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par } } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final String index; private final boolean waitForAdvance; diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretRequest.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretRequest.java index df1a5a48c26dd..3e6647dd9fb3f 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretRequest.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/GetSecretRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.fleet.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.Objects; -public class GetSecretRequest extends ActionRequest { +public class GetSecretRequest extends LegacyActionRequest { private final String id; diff --git a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java index 1043d2146e8a4..329a92773d38b 100644 --- a/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java +++ b/x-pack/plugin/fleet/src/main/java/org/elasticsearch/xpack/fleet/action/PostSecretRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.fleet.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xcontent.ConstructingObjectParser; @@ -20,7 +20,7 @@ import java.io.IOException; import java.util.Objects; -public class PostSecretRequest extends ActionRequest { +public class PostSecretRequest extends LegacyActionRequest { public static final ParseField VALUE_FIELD = new ParseField("value"); diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/DeleteSamlServiceProviderRequest.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/DeleteSamlServiceProviderRequest.java index 6f9559c0731b5..b2ced9e993eb6 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/DeleteSamlServiceProviderRequest.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/DeleteSamlServiceProviderRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.idp.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -22,7 +22,7 @@ /** * Request object to remove a service provider (by Entity ID) from the IdP. */ -public class DeleteSamlServiceProviderRequest extends ActionRequest { +public class DeleteSamlServiceProviderRequest extends LegacyActionRequest { private final String entityId; private final WriteRequest.RefreshPolicy refreshPolicy; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/PutSamlServiceProviderRequest.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/PutSamlServiceProviderRequest.java index 930bfc512e736..9561d306faa0e 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/PutSamlServiceProviderRequest.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/PutSamlServiceProviderRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.xpack.idp.action; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.ValidationException; @@ -25,7 +25,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class PutSamlServiceProviderRequest extends ActionRequest { +public class PutSamlServiceProviderRequest extends LegacyActionRequest { public static final WriteRequest.RefreshPolicy DEFAULT_REFRESH_POLICY = WriteRequest.RefreshPolicy.NONE; private final SamlServiceProviderDocument document; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlInitiateSingleSignOnRequest.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlInitiateSingleSignOnRequest.java index facbe4739dcce..6070b247093e1 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlInitiateSingleSignOnRequest.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlInitiateSingleSignOnRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.idp.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -17,7 +17,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class SamlInitiateSingleSignOnRequest extends ActionRequest { +public class SamlInitiateSingleSignOnRequest extends LegacyActionRequest { private String spEntityId; private String assertionConsumerService; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlMetadataRequest.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlMetadataRequest.java index cceafca37a60d..b79f2eee24339 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlMetadataRequest.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlMetadataRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.idp.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.Objects; -public class SamlMetadataRequest extends ActionRequest { +public class SamlMetadataRequest extends LegacyActionRequest { private String spEntityId; private String assertionConsumerService; diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestRequest.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestRequest.java index 97eb840c63058..24f32181db510 100644 --- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestRequest.java +++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/action/SamlValidateAuthnRequestRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.idp.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -16,7 +16,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; -public class SamlValidateAuthnRequestRequest extends ActionRequest { +public class SamlValidateAuthnRequestRequest extends LegacyActionRequest { private String queryString; diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/DeletePipelineRequest.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/DeletePipelineRequest.java index c4bd9cd1471f4..0a79350e543d6 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/DeletePipelineRequest.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/DeletePipelineRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.logstash.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import java.io.IOException; import java.util.Objects; -public class DeletePipelineRequest extends ActionRequest { +public class DeletePipelineRequest extends LegacyActionRequest { private final String id; diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/GetPipelineRequest.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/GetPipelineRequest.java index 488faad11d214..d730f81fd818e 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/GetPipelineRequest.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/GetPipelineRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.logstash.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Objects; -public class GetPipelineRequest extends ActionRequest { +public class GetPipelineRequest extends LegacyActionRequest { private final List ids; diff --git a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/PutPipelineRequest.java b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/PutPipelineRequest.java index 6f6bc18111262..1840cc7aa1c63 100644 --- a/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/PutPipelineRequest.java +++ b/x-pack/plugin/logstash/src/main/java/org/elasticsearch/xpack/logstash/action/PutPipelineRequest.java @@ -7,8 +7,8 @@ package org.elasticsearch.xpack.logstash.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentHelper; @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.Objects; -public class PutPipelineRequest extends ActionRequest { +public class PutPipelineRequest extends LegacyActionRequest { private final String id; private final String source; diff --git a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CancelReindexDataStreamAction.java b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CancelReindexDataStreamAction.java index 635d8b8f30978..3d6838367c816 100644 --- a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CancelReindexDataStreamAction.java +++ b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CancelReindexDataStreamAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.migrate.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,7 +28,7 @@ public CancelReindexDataStreamAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final String index; public Request(String index) { diff --git a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceAction.java b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceAction.java index 5ab009decd381..bc73b97fdcbae 100644 --- a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceAction.java +++ b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceAction.java @@ -6,10 +6,10 @@ */ package org.elasticsearch.xpack.migrate.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -38,7 +38,7 @@ private CreateIndexFromSourceAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest, ToXContent { + public static class Request extends LegacyActionRequest implements IndicesRequest, ToXContent { private final String sourceIndex; private final String destIndex; private Settings settingsOverride; @@ -152,7 +152,7 @@ public void fromXContent(XContentParser parser) throws IOException { * This only exists for the sake of testing the xcontent parser */ @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { if (mappingsOverride.containsKey("_doc")) { builder.field(MAPPINGS_OVERRIDE_FIELD.getPreferredName(), mappingsOverride.get("_doc")); } diff --git a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/GetMigrationReindexStatusAction.java b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/GetMigrationReindexStatusAction.java index bc084f3e0b5d6..2e56a41ebe9b6 100644 --- a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/GetMigrationReindexStatusAction.java +++ b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/GetMigrationReindexStatusAction.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.migrate.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; @@ -82,7 +82,7 @@ public String toString() { } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final String index; public Request(String index) { diff --git a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamAction.java b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamAction.java index 5ebd2040fbcb1..3baaa54a9a752 100644 --- a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamAction.java +++ b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamAction.java @@ -7,10 +7,10 @@ package org.elasticsearch.xpack.migrate.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.master.AcknowledgedResponse; import org.elasticsearch.common.io.stream.StreamInput; @@ -48,7 +48,7 @@ public enum Mode { UPGRADE } - public static class ReindexDataStreamRequest extends ActionRequest implements IndicesRequest, ToXContent { + public static class ReindexDataStreamRequest extends LegacyActionRequest implements IndicesRequest, ToXContent { private final Mode mode; private final String sourceDataStream; diff --git a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexAction.java b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexAction.java index dec3cf2901fcc..7fe523d49923c 100644 --- a/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexAction.java +++ b/x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexAction.java @@ -6,11 +6,11 @@ */ package org.elasticsearch.xpack.migrate.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionType; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -32,7 +32,7 @@ private ReindexDataStreamIndexAction() { super(NAME); } - public static class Request extends ActionRequest implements IndicesRequest { + public static class Request extends LegacyActionRequest implements IndicesRequest { private final String sourceIndex; diff --git a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/GetStackTracesRequest.java b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/GetStackTracesRequest.java index 155bf4bac3c3a..006ae24180a61 100644 --- a/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/GetStackTracesRequest.java +++ b/x-pack/plugin/profiling/src/main/java/org/elasticsearch/xpack/profiling/action/GetStackTracesRequest.java @@ -6,9 +6,9 @@ */ package org.elasticsearch.xpack.profiling.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.IndicesRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.common.ParsingException; @@ -36,7 +36,7 @@ /** * A request to get profiling details */ -public class GetStackTracesRequest extends ActionRequest implements IndicesRequest.Replaceable { +public class GetStackTracesRequest extends LegacyActionRequest implements IndicesRequest.Replaceable { public static final ParseField QUERY_FIELD = new ParseField("query"); public static final ParseField SAMPLE_SIZE_FIELD = new ParseField("sample_size"); public static final ParseField LIMIT_FIELD = new ParseField("limit"); diff --git a/x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/async/AsyncTaskManagementServiceTests.java b/x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/async/AsyncTaskManagementServiceTests.java index 65e5efbccb1af..77dfc21bff6e6 100644 --- a/x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/async/AsyncTaskManagementServiceTests.java +++ b/x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/async/AsyncTaskManagementServiceTests.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.ql.async; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionTestUtils; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.io.stream.StreamInput; @@ -50,7 +50,7 @@ public class AsyncTaskManagementServiceTests extends ESSingleNodeTestCase { private final ExecutorService executorService = Executors.newFixedThreadPool(1); - public static class TestRequest extends ActionRequest { + public static class TestRequest extends LegacyActionRequest { private final String string; public TestRequest(String string) { diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoAction.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoAction.java index 9d12b6d941a26..e550ddb1d2f99 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoAction.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoAction.java @@ -9,9 +9,9 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.node.DiscoveryNode; @@ -34,7 +34,7 @@ private FrozenCacheInfoAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final DiscoveryNode discoveryNode; @@ -58,14 +58,14 @@ public String getDescription() { } } - public static class TransportAction extends HandledTransportAction { + public static class TransportAction extends HandledTransportAction { private final FrozenCacheInfoNodeAction.Request nodeRequest = new FrozenCacheInfoNodeAction.Request(); private final TransportService transportService; @Inject public TransportAction(TransportService transportService, ActionFilters actionFilters) { - super(NAME, transportService, actionFilters, FrozenCacheInfoAction.Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE); + super(NAME, transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE); this.transportService = transportService; } diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoNodeAction.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoNodeAction.java index b24af3c876b7a..db16b5e0942a7 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoNodeAction.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/action/cache/FrozenCacheInfoNodeAction.java @@ -8,9 +8,9 @@ package org.elasticsearch.xpack.searchablesnapshots.action.cache; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.common.io.stream.StreamInput; @@ -33,7 +33,7 @@ private FrozenCacheInfoNodeAction() { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { public Request() {} diff --git a/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityFcActionAuthorizationIT.java b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityFcActionAuthorizationIT.java index c9630a4adab3b..6e789138fe3cf 100644 --- a/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityFcActionAuthorizationIT.java +++ b/x-pack/plugin/security/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/remotecluster/RemoteClusterSecurityFcActionAuthorizationIT.java @@ -13,6 +13,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.RemoteClusterActionType; import org.elasticsearch.action.admin.cluster.remote.RemoteClusterNodesAction; import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest; @@ -632,7 +633,7 @@ private static MockTransportService startTransport( return service; } - private static class MalformedGetRequest extends ActionRequest { + private static class MalformedGetRequest extends LegacyActionRequest { private final String otherIndexId; MalformedGetRequest(String otherIndexId) { diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java index a5f0c8f54b3a0..efa0517367b53 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/Security.java @@ -1579,7 +1579,7 @@ public void onIndexModule(IndexModule module) { return Arrays.asList(usageAction, infoAction); } - return Stream.of( + return List.of( new ActionHandler<>(ClearRealmCacheAction.INSTANCE, TransportClearRealmCacheAction.class), new ActionHandler<>(ClearRolesCacheAction.INSTANCE, TransportClearRolesCacheAction.class), new ActionHandler<>(ClearPrivilegesCacheAction.INSTANCE, TransportClearPrivilegesCacheAction.class), @@ -1648,7 +1648,7 @@ public void onIndexModule(IndexModule module) { new ActionHandler<>(UpdateIndexMigrationVersionAction.INSTANCE, UpdateIndexMigrationVersionAction.TransportAction.class), usageAction, infoAction - ).filter(Objects::nonNull).toList(); + ); } @Override diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportReloadRemoteClusterCredentialsAction.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportReloadRemoteClusterCredentialsAction.java index fefd47f9e352e..5f5b082dee2ce 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportReloadRemoteClusterCredentialsAction.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/settings/TransportReloadRemoteClusterCredentialsAction.java @@ -8,9 +8,9 @@ package org.elasticsearch.xpack.security.action.settings; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.cluster.ClusterState; @@ -21,6 +21,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.injection.guice.Inject; +import org.elasticsearch.rest.action.admin.cluster.RestReloadSecureSettingsAction; import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.RemoteClusterService; import org.elasticsearch.transport.TransportService; @@ -33,10 +34,10 @@ /** * This is a local-only action which updates remote cluster credentials for remote cluster connections, from keystore settings reloaded via - * a call to {@link org.elasticsearch.rest.action.admin.cluster.RestReloadSecureSettingsAction}. - * + * a call to {@link RestReloadSecureSettingsAction}. + *

      * It's invoked as part of the {@link Security#reload(Settings)} call. - * + *

      * This action is largely an implementation detail to work around the fact that Security is a plugin without direct access to many core * classes, including the {@link RemoteClusterService} which is required for a credentials reload. A transport action gives us access to * the {@link RemoteClusterService} which is injectable but not part of the plugin contract. @@ -85,7 +86,7 @@ private ClusterBlockException checkBlock(ClusterState clusterState) { return clusterState.blocks().globalBlockedException(ClusterBlockLevel.METADATA_READ); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final Settings settings; public Request(Settings settings) { diff --git a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMGetExpiredSnapshotsAction.java b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMGetExpiredSnapshotsAction.java index a033d357ec034..ad3ca863097cd 100644 --- a/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMGetExpiredSnapshotsAction.java +++ b/x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/TransportSLMGetExpiredSnapshotsAction.java @@ -10,11 +10,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.RefCountingRunnable; import org.elasticsearch.action.support.SubscribableListener; @@ -249,7 +249,7 @@ static List> getSnapshotsToDelete( }).toList(); } - public static final class Request extends ActionRequest { + public static final class Request extends LegacyActionRequest { private final Collection repositories; private final Map policies; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java index 47157ea9197e4..1c25d4c4e7084 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/BlobAnalyzeAction.java @@ -13,9 +13,9 @@ import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.GroupedActionListener; import org.elasticsearch.action.support.HandledTransportAction; @@ -145,7 +145,6 @@ * * On success, details of how long everything took are returned. On failure, cancels the remote read tasks to try and avoid consuming * unnecessary resources. - * */ class BlobAnalyzeAction extends HandledTransportAction { @@ -193,10 +192,10 @@ protected void doExecute(Task task, Request request, ActionListener li private static class BlobAnalysis { private final TransportService transportService; private final CancellableTask task; - private final BlobAnalyzeAction.Request request; + private final Request request; private final BlobStoreRepository repository; private final BlobContainer blobContainer; - private final ActionListener listener; + private final ActionListener listener; private final Random random; private final boolean checksumWholeBlob; private final long checksumStart; @@ -211,10 +210,10 @@ private static class BlobAnalysis { BlobAnalysis( TransportService transportService, CancellableTask task, - BlobAnalyzeAction.Request request, + Request request, BlobStoreRepository repository, BlobContainer blobContainer, - ActionListener listener + ActionListener listener ) { this.transportService = transportService; this.task = task; @@ -643,7 +642,7 @@ private WriteDetails(long bytesWritten, long elapsedNanos, long throttledNanos, } } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final String repositoryName; private final String blobPath; private final String blobName; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/ContendedRegisterAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/ContendedRegisterAnalyzeAction.java index f527a46371641..13ffea8943f3b 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/ContendedRegisterAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/ContendedRegisterAnalyzeAction.java @@ -11,10 +11,10 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.common.Strings; @@ -176,7 +176,7 @@ public void onFailure(Exception e) { } } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final String repositoryName; private final String containerPath; private final String registerName; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/GetBlobChecksumAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/GetBlobChecksumAction.java index 816f9e860a33a..cfc59b8510b89 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/GetBlobChecksumAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/GetBlobChecksumAction.java @@ -10,9 +10,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.common.blobstore.BlobContainer; @@ -40,7 +40,7 @@ import java.util.zip.CRC32; /** - * Action which instructs a node to read a range of a blob from a {@link org.elasticsearch.repositories.blobstore.BlobStoreRepository} + * Action which instructs a node to read a range of a blob from a {@link BlobStoreRepository} * (possibly the entire blob) and compute its checksum. It is acceptable if the blob is not found but we do not accept the blob being * otherwise unreadable. */ @@ -176,7 +176,7 @@ protected void doExecute(Task task, Request request, ActionListener li listener.onResponse(response); } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final String repositoryName; private final String blobPath; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java index ce729694d347c..27e13129cea35 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/RepositoryAnalyzeAction.java @@ -15,11 +15,11 @@ import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionRunnable; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.RefCountingRunnable; @@ -97,7 +97,7 @@ public class RepositoryAnalyzeAction extends HandledTransportAction INSTANCE = new ActionType<>("cluster:admin/repository/analyze"); + public static final ActionType INSTANCE = new ActionType<>("cluster:admin/repository/analyze"); static final String UNCONTENDED_REGISTER_NAME_PREFIX = "test-register-uncontended-"; static final String CONTENDED_REGISTER_NAME_PREFIX = "test-register-contended-"; @@ -113,7 +113,7 @@ public RepositoryAnalyzeAction( ClusterService clusterService, RepositoriesService repositoriesService ) { - super(INSTANCE.name(), transportService, actionFilters, RepositoryAnalyzeAction.Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE); + super(INSTANCE.name(), transportService, actionFilters, Request::new, EsExecutors.DIRECT_EXECUTOR_SERVICE); this.transportService = transportService; this.clusterService = clusterService; this.repositoriesService = repositoriesService; @@ -890,7 +890,7 @@ private void sendResponse(final long listingStartTimeNanos, final long deleteSta } } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String repositoryName; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/UncontendedRegisterAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/UncontendedRegisterAnalyzeAction.java index 23c25e466b917..48c1c77b6b075 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/UncontendedRegisterAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/analyze/UncontendedRegisterAnalyzeAction.java @@ -11,9 +11,9 @@ import org.apache.logging.log4j.Logger; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.common.Strings; @@ -135,7 +135,7 @@ public void onFailure(Exception e) { ); } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final String repositoryName; private final String containerPath; private final String registerName; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java index aa29f83341317..57f77cb8441d7 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityAction.java @@ -9,9 +9,9 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.action.support.SubscribableListener; @@ -57,13 +57,13 @@ class TransportRepositoryVerifyIntegrityAction extends HandledTransportAction< ActionFilters actionFilters, Executor executor ) { - super(ACTION_NAME, transportService, actionFilters, TransportRepositoryVerifyIntegrityAction.Request::new, executor); + super(ACTION_NAME, transportService, actionFilters, Request::new, executor); this.repositoriesService = repositoriesService; this.transportService = transportService; this.executor = executor; } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final DiscoveryNode coordinatingNode; private final long coordinatingTaskId; private final RepositoryVerifyIntegrityParams requestParams; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java index d5a5749997d8d..3e76b5bd2460a 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityCoordinationAction.java @@ -9,9 +9,9 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListenerResponseHandler; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionType; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.TransportAction; import org.elasticsearch.cluster.service.ClusterService; @@ -98,7 +98,7 @@ public class TransportRepositoryVerifyIntegrityCoordinationAction extends Transp private final ClusterService clusterService; private final Executor managementExecutor; - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final RepositoryVerifyIntegrityParams requestParams; private final RepositoryVerifyIntegrityResponseStream responseStream; diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java index 9015866fb3ec2..f9af156580a28 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/TransportRepositoryVerifyIntegrityResponseChunkAction.java @@ -8,9 +8,9 @@ package org.elasticsearch.repositories.blobstore.testkit.integrity; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.common.io.stream.StreamInput; @@ -43,7 +43,7 @@ class TransportRepositoryVerifyIntegrityResponseChunkAction extends HandledTrans this.activeRepositoryVerifyIntegrityTasks = activeRepositoryVerifyIntegrityTasks; } - static class Request extends ActionRequest { + static class Request extends LegacyActionRequest { private final long coordinatingTaskId; private final RepositoryVerifyIntegrityResponseChunk chunkContents; diff --git a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlRequest.java b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlRequest.java index 835168e17bdf8..295a46d53b81e 100644 --- a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlRequest.java +++ b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlRequest.java @@ -6,8 +6,8 @@ */ package org.elasticsearch.xpack.sql.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.xpack.sql.proto.Mode; @@ -24,7 +24,7 @@ *

      * Contains information about the client mode that can be used to generate different responses based on the caller type. */ -public abstract class AbstractSqlRequest extends ActionRequest { +public abstract class AbstractSqlRequest extends LegacyActionRequest { private RequestInfo requestInfo;