From a2b4a6f246fd6dc990138c145a629c7cd166c3fd Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Tue, 20 May 2025 07:09:27 -0700 Subject: [PATCH] Add temporary LegacyActionRequest (#128107) In order to remove ActionType, ActionRequest will become strongly typed, referring to the ActionResponse type. As a precursor to that, this commit adds a LegacyActionRequest which all existing ActionRequest implementations now inherit from. This will allow adding the ActionResponse type to ActionRequest in a future commit without modifying every implementation at once. --- .../ingest/common/GrokProcessorGetAction.java | 6 +-- .../mustache/MultiSearchTemplateRequest.java | 4 +- .../mustache/SearchTemplateRequest.java | 5 ++- .../action/PainlessContextAction.java | 4 +- .../index/rankeval/RankEvalRequest.java | 4 +- .../elasticsearch/rest/root/MainRequest.java | 4 +- .../netty4/Netty4ChunkedContinuationsIT.java | 8 ++-- .../node/tasks/CancellableTasksIT.java | 5 ++- .../admin/cluster/tasks/ListTasksIT.java | 4 +- .../MockedRequestActionBasedRerankerIT.java | 4 +- .../action/LegacyActionRequest.java | 30 +++++++++++++++ .../ClusterFormationInfoAction.java | 20 ++++------ .../CoordinationDiagnosticsAction.java | 10 ++--- .../coordination/MasterHistoryAction.java | 11 +++--- .../node/tasks/get/GetTaskRequest.java | 4 +- .../remote/RemoteClusterNodesAction.java | 11 ++---- .../cluster/remote/RemoteInfoRequest.java | 4 +- .../stats/RemoteClusterStatsRequest.java | 4 +- .../GetScriptContextRequest.java | 4 +- .../GetScriptLanguageRequest.java | 4 +- .../mapping/get/GetFieldMappingsRequest.java | 14 ++++--- .../resolve/ResolveClusterActionRequest.java | 4 +- .../indices/resolve/ResolveIndexAction.java | 16 ++++---- .../action/bulk/BulkRequest.java | 3 +- .../FieldCapabilitiesNodeRequest.java | 4 +- .../fieldcaps/FieldCapabilitiesRequest.java | 4 +- .../action/get/MultiGetRequest.java | 4 +- .../get/TransportGetFromTranslogAction.java | 4 +- ...ansportShardMultiGetFomTranslogAction.java | 4 +- .../ingest/SimulatePipelineRequest.java | 4 +- .../action/search/ClearScrollRequest.java | 4 +- .../search/ClosePointInTimeRequest.java | 4 +- .../action/search/MultiSearchRequest.java | 4 +- .../action/search/OpenPointInTimeRequest.java | 4 +- .../action/search/SearchRequest.java | 23 +++++------ .../action/search/SearchScrollRequest.java | 4 +- .../action/search/SearchShardsRequest.java | 4 +- .../support/broadcast/BroadcastRequest.java | 4 +- .../BroadcastUnpromotableRequest.java | 4 +- .../local/LocalClusterStateRequest.java | 10 +++-- .../support/master/MasterNodeRequest.java | 11 +++--- .../support/nodes/BaseNodesRequest.java | 4 +- .../replication/ReplicationRequest.java | 6 ++- .../InstanceShardOperationRequest.java | 4 +- .../single/shard/SingleShardRequest.java | 12 +++--- .../support/tasks/BaseTasksRequest.java | 6 +-- .../AbstractSynonymsPagedResultAction.java | 4 +- .../synonyms/DeleteSynonymRuleAction.java | 4 +- .../action/synonyms/DeleteSynonymsAction.java | 4 +- .../action/synonyms/GetSynonymRuleAction.java | 4 +- .../action/synonyms/PutSynonymRuleAction.java | 4 +- .../action/synonyms/PutSynonymsAction.java | 4 +- .../termvectors/MultiTermVectorsRequest.java | 4 +- .../elasticsearch/health/GetHealthAction.java | 4 +- .../health/node/action/HealthNodeRequest.java | 4 +- .../reindex/AbstractBulkByScrollRequest.java | 8 ++-- .../index/shard/PrimaryReplicaSyncer.java | 8 ++-- .../StatelessPrimaryRelocationAction.java | 4 +- ...StatelessUnpromotableRelocationAction.java | 4 +- .../VerifyNodeRepositoryAction.java | 4 +- .../action/ActionModuleTests.java | 2 +- .../support/MappedActionFiltersTests.java | 3 +- ...StateAwareHandledTransportActionTests.java | 4 +- ...portActionFilterChainRefCountingTests.java | 3 +- .../TransportActionFilterChainTests.java | 3 +- .../action/support/TransportActionTests.java | 4 +- .../ClearCcrRestoreSessionRequest.java | 4 +- .../DeleteInternalCcrRepositoryRequest.java | 4 +- .../GetCcrRestoreFileChunkRequest.java | 4 +- .../PutInternalCcrRepositoryRequest.java | 4 +- .../license/GetFeatureUsageRequest.java | 4 +- .../protocol/xpack/XPackInfoRequest.java | 4 +- .../xpack/graph/GraphExploreRequest.java | 25 +++++------- .../xpack/watcher/DeleteWatchRequest.java | 4 +- .../xpack/watcher/PutWatchRequest.java | 22 +++++------ .../action/AbstractGetResourcesRequest.java | 4 +- .../xpack/core/async/AsyncStopRequest.java | 4 +- .../core/async/DeleteAsyncResultRequest.java | 4 +- .../core/async/GetAsyncResultRequest.java | 4 +- .../core/async/GetAsyncStatusRequest.java | 5 ++- .../core/esql/action/EsqlQueryRequest.java | 4 +- .../action/BaseInferenceActionRequest.java | 4 +- .../action/InferenceActionProxy.java | 4 +- .../ml/action/AuditMlNotificationAction.java | 4 +- .../CancelJobModelSnapshotUpgradeAction.java | 4 +- .../ml/action/CoordinatedInferenceAction.java | 6 +-- .../ml/action/DeleteExpiredDataAction.java | 5 ++- .../ml/action/DeleteModelSnapshotAction.java | 4 +- .../ml/action/EstimateModelMemoryAction.java | 6 +-- .../ml/action/EvaluateDataFrameAction.java | 4 +- .../core/ml/action/GetBucketsAction.java | 4 +- .../ml/action/GetCalendarEventsAction.java | 4 +- .../core/ml/action/GetCalendarsAction.java | 4 +- .../core/ml/action/GetCategoriesAction.java | 4 +- .../ml/action/GetDatafeedsStatsAction.java | 8 ++-- .../core/ml/action/GetInfluencersAction.java | 4 +- .../ml/action/GetModelSnapshotsAction.java | 4 +- .../ml/action/GetOverallBucketsAction.java | 4 +- .../core/ml/action/GetRecordsAction.java | 4 +- .../core/ml/action/InferModelAction.java | 38 ++++++++----------- .../xpack/core/ml/action/MlInfoAction.java | 4 +- .../ml/action/PostCalendarEventsAction.java | 4 +- .../PreviewDataFrameAnalyticsAction.java | 11 +++--- .../core/ml/action/PreviewDatafeedAction.java | 9 +++-- .../core/ml/action/PutCalendarAction.java | 4 +- .../xpack/core/ml/action/PutFilterAction.java | 4 +- .../ml/action/UpdateCalendarJobAction.java | 4 +- .../core/ml/action/UpdateFilterAction.java | 4 +- .../ml/action/UpdateModelSnapshotAction.java | 4 +- .../ml/action/ValidateDetectorAction.java | 4 +- .../ml/action/ValidateJobConfigAction.java | 4 +- .../action/MonitoringBulkRequest.java | 4 +- .../rollup/action/GetRollupCapsAction.java | 4 +- .../action/GetRollupIndexCapsAction.java | 4 +- .../action/SubmitAsyncSearchRequest.java | 4 +- .../DelegatePkiAuthenticationRequest.java | 4 +- .../core/security/action/GrantRequest.java | 4 +- .../apikey/AbstractCreateApiKeyRequest.java | 4 +- .../apikey/BaseUpdateApiKeyRequest.java | 4 +- .../action/apikey/GetApiKeyRequest.java | 4 +- .../apikey/InvalidateApiKeyRequest.java | 16 ++++---- .../action/apikey/QueryApiKeyRequest.java | 4 +- .../enrollment/KibanaEnrollmentRequest.java | 4 +- .../enrollment/NodeEnrollmentRequest.java | 4 +- .../OpenIdConnectAuthenticateRequest.java | 4 +- .../oidc/OpenIdConnectLogoutRequest.java | 4 +- ...IdConnectPrepareAuthenticationRequest.java | 4 +- .../privilege/DeletePrivilegesRequest.java | 4 +- .../GetBuiltinPrivilegesRequest.java | 4 +- .../privilege/GetPrivilegesRequest.java | 4 +- .../privilege/PutPrivilegesRequest.java | 7 +++- .../action/profile/GetProfilesRequest.java | 4 +- .../profile/SetProfileEnabledRequest.java | 4 +- .../profile/SuggestProfilesRequest.java | 4 +- .../profile/UpdateProfileDataRequest.java | 4 +- .../action/role/BulkDeleteRolesRequest.java | 4 +- .../action/role/BulkPutRolesRequest.java | 4 +- .../action/role/DeleteRoleRequest.java | 4 +- .../security/action/role/GetRolesRequest.java | 4 +- .../security/action/role/PutRoleRequest.java | 4 +- .../action/role/QueryRoleRequest.java | 4 +- .../rolemapping/DeleteRoleMappingRequest.java | 4 +- .../rolemapping/GetRoleMappingsRequest.java | 7 ++-- .../rolemapping/PutRoleMappingRequest.java | 6 +-- .../action/saml/SamlAuthenticateRequest.java | 4 +- .../saml/SamlCompleteLogoutRequest.java | 4 +- .../saml/SamlInvalidateSessionRequest.java | 4 +- .../action/saml/SamlLogoutRequest.java | 4 +- .../SamlPrepareAuthenticationRequest.java | 4 +- .../action/saml/SamlSpMetadataRequest.java | 4 +- .../CreateServiceAccountTokenRequest.java | 4 +- .../DeleteServiceAccountTokenRequest.java | 4 +- .../GetServiceAccountCredentialsRequest.java | 4 +- .../service/GetServiceAccountRequest.java | 4 +- .../action/token/CreateTokenRequest.java | 4 +- .../action/token/InvalidateTokenRequest.java | 10 ++--- .../action/user/AuthenticateRequest.java | 4 +- .../action/user/ChangePasswordRequest.java | 4 +- .../action/user/DeleteUserRequest.java | 4 +- .../action/user/GetUserPrivilegesRequest.java | 4 +- .../security/action/user/GetUsersRequest.java | 4 +- .../action/user/HasPrivilegesRequest.java | 4 +- .../user/ProfileHasPrivilegesRequest.java | 5 ++- .../security/action/user/PutUserRequest.java | 4 +- .../action/user/QueryUserRequest.java | 4 +- .../action/user/SetEnabledRequest.java | 4 +- .../ssl/action/GetCertificateInfoAction.java | 4 +- .../action/AbstractFindStructureRequest.java | 4 +- .../action/TestGrokPatternAction.java | 18 ++++----- .../transform/action/GetCheckpointAction.java | 4 +- .../action/GetCheckpointNodeAction.java | 4 +- .../transport/actions/QueryWatchesAction.java | 7 ++-- .../actions/ack/AckWatchRequest.java | 4 +- .../activate/ActivateWatchRequest.java | 6 +-- .../actions/execute/ExecuteWatchRequest.java | 14 +++---- .../actions/get/GetWatchRequest.java | 4 +- .../action/MockIndicesRequest.java | 2 +- .../ApiFilteringActionFilterTests.java | 4 +- .../apikey/InvalidateApiKeyRequestTests.java | 4 +- ...DownsampleShardPersistentTaskExecutor.java | 4 +- .../action/PostAnalyticsEventAction.java | 6 +-- .../action/ConnectorActionRequest.java | 10 ++--- .../action/DeleteConnectorSecretRequest.java | 4 +- .../action/GetConnectorSecretRequest.java | 4 +- .../action/PostConnectorSecretRequest.java | 4 +- .../action/PutConnectorSecretRequest.java | 7 ++-- .../action/ConnectorSyncJobActionRequest.java | 4 +- .../rules/action/DeleteQueryRuleAction.java | 5 ++- .../action/DeleteQueryRulesetAction.java | 5 ++- .../rules/action/GetQueryRuleAction.java | 7 ++-- .../rules/action/GetQueryRulesetAction.java | 9 +++-- .../rules/action/ListQueryRulesetsAction.java | 6 +-- .../rules/action/PutQueryRuleAction.java | 12 +++--- .../rules/action/PutQueryRulesetAction.java | 10 ++--- .../rules/action/TestQueryRulesetAction.java | 9 +++-- .../action/DeleteSearchApplicationAction.java | 4 +- .../action/GetSearchApplicationAction.java | 6 +-- .../action/ListSearchApplicationAction.java | 7 ++-- .../action/PutSearchApplicationAction.java | 7 ++-- .../SearchApplicationSearchRequest.java | 4 +- .../xpack/eql/action/EqlSearchRequest.java | 10 ++--- .../AsyncTaskManagementServiceTests.java | 4 +- .../compute/operator/DriverTaskRunner.java | 4 +- .../esql/action/EsqlGetQueryRequest.java | 4 +- .../esql/action/EsqlListQueriesRequest.java | 4 +- .../fleet/action/DeleteSecretRequest.java | 4 +- .../action/GetGlobalCheckpointsAction.java | 7 ++-- .../xpack/fleet/action/GetSecretRequest.java | 4 +- .../xpack/fleet/action/PostSecretRequest.java | 4 +- .../DeleteSamlServiceProviderRequest.java | 4 +- .../action/PutSamlServiceProviderRequest.java | 4 +- .../SamlInitiateSingleSignOnRequest.java | 4 +- .../xpack/idp/action/SamlMetadataRequest.java | 4 +- .../SamlValidateAuthnRequestRequest.java | 4 +- .../action/DeletePipelineRequest.java | 4 +- .../logstash/action/GetPipelineRequest.java | 4 +- .../logstash/action/PutPipelineRequest.java | 4 +- .../action/CancelReindexDataStreamAction.java | 4 +- .../action/CreateIndexFromSourceAction.java | 6 +-- .../GetMigrationReindexStatusAction.java | 4 +- .../action/ReindexDataStreamAction.java | 4 +- .../action/ReindexDataStreamIndexAction.java | 4 +- .../action/GetStackTracesRequest.java | 4 +- .../AsyncTaskManagementServiceTests.java | 4 +- .../action/cache/FrozenCacheInfoAction.java | 8 ++-- .../cache/FrozenCacheInfoNodeAction.java | 4 +- ...lusterSecurityFcActionAuthorizationIT.java | 3 +- ...tReloadRemoteClusterCredentialsAction.java | 11 +++--- ...TransportSLMGetExpiredSnapshotsAction.java | 4 +- .../testkit/analyze/BlobAnalyzeAction.java | 13 +++---- .../ContendedRegisterAnalyzeAction.java | 4 +- .../analyze/GetBlobChecksumAction.java | 6 +-- .../analyze/RepositoryAnalyzeAction.java | 8 ++-- .../UncontendedRegisterAnalyzeAction.java | 4 +- ...nsportRepositoryVerifyIntegrityAction.java | 6 +-- ...toryVerifyIntegrityCoordinationAction.java | 4 +- ...oryVerifyIntegrityResponseChunkAction.java | 4 +- .../xpack/sql/action/AbstractSqlRequest.java | 4 +- 238 files changed, 682 insertions(+), 645 deletions(-) create mode 100644 server/src/main/java/org/elasticsearch/action/LegacyActionRequest.java 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 f149d768bf46..033a45946fb9 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 @@ package org.elasticsearch.ingest.common; 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 @@ import static org.elasticsearch.rest.RestRequest.Method.GET; 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 07a00b33407f..29d9ad6a8eed 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 java.util.Objects; 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 b535b3556b5b..2190b39bb658 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 class SearchTemplateRequest extends ActionRequest implements CompositeInd 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 efcd63be4688..5df68e889d7c 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 4bb30fdb0dd0..53d947cea681 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 @@ -9,9 +9,9 @@ package org.elasticsearch.index.rankeval; -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; @@ -26,7 +26,7 @@ import java.util.Objects; /** * 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 edcf84551292..d6bbac30fb8f 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 80d91acfde28..5d0023c0deaa 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 @@ -15,11 +15,11 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.ESNetty4IntegTestCase; import org.elasticsearch.ElasticsearchException; 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.CountDownActionListener; import org.elasticsearch.action.support.SubscribableListener; @@ -337,14 +337,14 @@ public class Netty4ChunkedContinuationsIT extends ESNetty4IntegTestCase { 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 +525,7 @@ public class Netty4ChunkedContinuationsIT extends ESNetty4IntegTestCase { 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 5607585dca0b..3f3ee0c5598f 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 @@ -14,11 +14,11 @@ import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionFuture; 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.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 +118,7 @@ public class CancellableTasksIT extends ESIntegTestCase { /** * Allow some parts of the request to be completed + * * @return a pending child requests */ static Set allowPartialRequest(TestRequest request) throws Exception { @@ -418,7 +419,7 @@ public class CancellableTasksIT extends ESIntegTestCase { } } - 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 3419a3d95ebd..92e740ee8984 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 @@ -10,11 +10,11 @@ package org.elasticsearch.action.admin.cluster.tasks; 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.HandledTransportAction; import org.elasticsearch.action.support.PlainActionFuture; @@ -142,7 +142,7 @@ public class ListTasksIT extends ESSingleNodeTestCase { } } - 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 43cae6788d4f..fa9e58d179a2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/rank/MockedRequestActionBasedRerankerIT.java @@ -16,10 +16,10 @@ import org.apache.lucene.search.TopDocs; import org.elasticsearch.TransportVersion; 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.search.SearchPhaseController; import org.elasticsearch.action.support.ActionFilters; import org.elasticsearch.action.support.HandledTransportAction; @@ -142,7 +142,7 @@ public class MockedRequestActionBasedRerankerIT extends AbstractRerankerIT { } } - public static class TestRerankingActionRequest extends ActionRequest { + public static class TestRerankingActionRequest extends LegacyActionRequest { private final List 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 000000000000..0a19eb7f4d47 --- /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 f5f12f5d17ba..bf3b3915b62f 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 @@ public class ClusterFormationInfoAction extends ActionType { + public static class TransportAction extends HandledTransportAction { private final Coordinator coordinator; @Inject @@ -129,19 +127,15 @@ public class ClusterFormationInfoAction extends ActionType 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 47ad8e2610ab..fe2493aa1a64 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 @@ public class CoordinationDiagnosticsAction extends ActionType 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 40c634968581..11118a89efe4 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 @@ public class MasterHistoryAction extends ActionType 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 0b36091cf27e..736212bdf541 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 4e52107933c2..dd07ea22d378 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 @@ import java.util.Objects; 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 5a95b122f331..644de985ecd9 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 6c3c5cbb50ec..8b1c0f331497 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 @@ import java.io.IOException; /** * 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 63fd3c0b8d1c..3e27d6fe7df2 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 5e9c923ef268..7294f02c04cb 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 415ccd5bf2a7..1bab7267b108 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 @@ import java.util.Arrays; /** * 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 class GetFieldMappingsRequest extends ActionRequest implements IndicesReq 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 class GetFieldMappingsRequest extends ActionRequest implements IndicesReq 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 3f9e0cbf299e..6e42eddd8021 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 @@ package org.elasticsearch.action.admin.indices.resolve; 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.Arrays; 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 1db614a502cc..6c9e9ddf59e0 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; @@ -75,7 +75,7 @@ public class ResolveIndexAction extends ActionType 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(); @@ -517,12 +517,12 @@ public class ResolveIndexAction extends ActionType /** * Resolves the specified names and/or wildcard expressions to index abstractions. Returns results in the supplied lists. * - * @param localIndices The names and wildcard expressions to resolve - * @param projectState Project state - * @param resolver Resolver instance for matching names - * @param indices List containing any matching indices - * @param aliases List containing any matching aliases - * @param dataStreams List containing any matching data streams + * @param localIndices The names and wildcard expressions to resolve + * @param projectState Project state + * @param resolver Resolver instance for matching names + * @param indices List containing any matching indices + * @param aliases List containing any matching aliases + * @param dataStreams List containing any matching data streams */ static void resolveIndices( @Nullable OriginalIndices localIndices, 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 cd4602ead42b..0acc6f955f5b 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.ActionRequest; 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; * 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 565f2491e5d0..c305d77972fb 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.List; 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 efbde6264e91..5d4f6c5f0cc5 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.Map; 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 e6469ab75299..b73aaffbbf01 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 @@ package org.elasticsearch.action.get; 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; @@ -45,7 +45,7 @@ import java.util.Locale; // 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 c4c7d8e5e7c7..556017c81e79 100644 --- a/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/action/get/TransportGetFromTranslogAction.java @@ -12,10 +12,10 @@ package org.elasticsearch.action.get; 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; @@ -85,7 +85,7 @@ public class TransportGetFromTranslogAction extends HandledTransportAction< }); } - 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 46893c9240a4..643d4076f713 100644 --- a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java +++ b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetFomTranslogAction.java @@ -11,9 +11,9 @@ package org.elasticsearch.action.get; 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; @@ -106,7 +106,7 @@ public class TransportShardMultiGetFomTranslogAction extends HandledTransportAct }); } - 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 258aa71d00d1..926c1c2e8500 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.cluster.metadata.ProjectId; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.ReleasableBytesReference; @@ -39,7 +39,7 @@ import java.util.List; 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 4909d8c4d229..2588576feb0d 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 java.util.List; 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 b36ec586535e..adace209f533 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 org.elasticsearch.xcontent.XContentParser; 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 202218047552..aa728e888b87 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; @@ -46,7 +46,7 @@ import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeSt /** * A multi search API request. */ -public class MultiSearchRequest extends ActionRequest implements CompositeIndicesRequest { +public class MultiSearchRequest extends LegacyActionRequest implements CompositeIndicesRequest { public static final int MAX_CONCURRENT_SEARCH_REQUESTS_DEFAULT = 0; private int maxConcurrentSearchRequests = 0; 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 d68e2ce1b02b..aa707d72bc6f 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 java.util.Objects; 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 862831f33cab..fda2df81d3f9 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 @@ package org.elasticsearch.action.search; 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; @@ -45,14 +46,14 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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")); @@ -160,12 +161,12 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla * 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, @@ -629,7 +630,7 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla * 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
    • @@ -650,7 +651,7 @@ public class SearchRequest extends ActionRequest implements IndicesRequest.Repla * 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 1d34288665ae..e4e02add642e 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; @@ -26,7 +26,7 @@ import java.util.Objects; 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 TimeValue 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 be1b19480370..9e2837aa1f8b 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 @@ import java.util.Objects; /** * 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 e0c1d94ed1de..f985cc53335e 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 org.elasticsearch.core.TimeValue; 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 ac5fff1d1700..9825b8630832 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 @@ import static org.elasticsearch.action.support.IndicesOptions.strictSingleIndexN /** * 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/local/LocalClusterStateRequest.java b/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java index e10060b2754f..eb46471ad06e 100644 --- a/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java @@ -10,9 +10,11 @@ package org.elasticsearch.action.support.local; import org.elasticsearch.TransportVersions; -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.master.MasterNodeReadRequest; +import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.core.TimeValue; @@ -24,7 +26,7 @@ import java.util.Objects; /** * A base request for actions that are executed locally on the node that receives the request. */ -public abstract class LocalClusterStateRequest extends ActionRequest { +public abstract class LocalClusterStateRequest extends LegacyActionRequest { /** * The timeout for waiting until the cluster is unblocked. @@ -38,7 +40,7 @@ public abstract class LocalClusterStateRequest extends ActionRequest { /** * This constructor exists solely for BwC purposes. It should exclusively be used by requests that used to extend - * {@link org.elasticsearch.action.support.master.MasterNodeReadRequest} and still need to be able to serialize incoming request. + * {@link MasterNodeReadRequest} and still need to be able to serialize incoming request. */ @UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION) protected LocalClusterStateRequest(StreamInput in) throws IOException { @@ -47,7 +49,7 @@ public abstract class LocalClusterStateRequest extends ActionRequest { /** * This constructor exists solely for BwC purposes. It should exclusively be used by requests that used to extend - * {@link org.elasticsearch.action.support.master.MasterNodeRequest} and still need to be able to serialize incoming request. + * {@link MasterNodeRequest} and still need to be able to serialize incoming request. */ @UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION) protected LocalClusterStateRequest(StreamInput in, boolean readLocal) throws IOException { 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 8d29025c1f0b..2f0bf8870830 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 @@ -10,10 +10,11 @@ package org.elasticsearch.action.support.master; 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; @@ -21,7 +22,7 @@ import java.util.Objects; /** * 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 @@ -29,7 +30,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 #INFINITE_MASTER_NODE_TIMEOUT}, since @@ -60,7 +61,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 @@ -109,7 +110,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 #INFINITE_MASTER_NODE_TIMEOUT} since 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 ea1c1a7e61a0..804ec172d4e3 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.io.IOException; 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 debc64914a17..b64f9e408124 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; * 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 fd95f3079f6c..f13faa621ca4 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 @@ import java.io.IOException; // 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 cb410d8bf19f..527371654c1d 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.io.IOException; 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 @@ public abstract class SingleShardRequestnull 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 ba348f8b62b7..fab3f41334d7 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 class BaseTasksRequest> extends /** * 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 c1e2efb0834e..3fb7b5d27bed 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 abstract class AbstractSynonymsPagedResultAction { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final String synonymRuleId; private final boolean refresh; 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 4901ea518c56..419273093133 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 class DeleteSynonymsAction extends ActionType { 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 ed0e9418a6ad..366aadcc2d75 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 class GetSynonymRuleAction extends ActionType { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final SynonymRule synonymRule; private final boolean refresh; 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 1b9b6b36cb2f..65310f6cf837 100644 --- a/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java +++ b/server/src/main/java/org/elasticsearch/action/synonyms/PutSynonymsAction.java @@ -10,9 +10,9 @@ package org.elasticsearch.action.synonyms; 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.action.ValidateActions; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -41,7 +41,7 @@ public class PutSynonymsAction extends ActionType { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final String synonymsSetId; private final SynonymRule[] synonymRules; private final boolean refresh; 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 d5b5ef77db92..2864e7a49798 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 @@ import java.util.Set; // 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 991f9bffb66f..f7416c400723 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 class GetHealthAction extends ActionType { } } - 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 3c27594a5068..b9763ccc0f31 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 @@ import java.util.Map; /** * 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 e71156e6dda1..2f63776d7f1c 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; @@ -30,7 +30,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; 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); @@ -117,8 +117,8 @@ public abstract class AbstractBulkByScrollRequest 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 59f000260e09..456f5fe00eec 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.ActionRequest; 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 @@ public class TransportActionFilterChainTests extends ESTestCase { ); } - 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 7228e2c86db9..81401379faeb 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 @@ public class TransportActionTests extends ESTestCase { return transportAction; } - private static class TestRequest extends ActionRequest { + private static class TestRequest extends LegacyActionRequest { @Override public ActionRequestValidationException validate() { return null; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/ClearCcrRestoreSessionRequest.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/ClearCcrRestoreSessionRequest.java index c0668a9fb19c..402d94980a6b 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/ClearCcrRestoreSessionRequest.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/ClearCcrRestoreSessionRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.ccr.action.repositories; -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.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; @@ -21,7 +21,7 @@ import java.io.IOException; import static org.elasticsearch.xpack.ccr.Ccr.TRANSPORT_VERSION_ACTION_WITH_SHARD_ID; -public class ClearCcrRestoreSessionRequest extends ActionRequest implements RemoteClusterAwareRequest, IndicesRequest { +public class ClearCcrRestoreSessionRequest extends LegacyActionRequest implements RemoteClusterAwareRequest, IndicesRequest { private DiscoveryNode node; private final String sessionUUID; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryRequest.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryRequest.java index bc7ca12a49e2..0d31313d6ccc 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryRequest.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/DeleteInternalCcrRepositoryRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.ccr.action.repositories; -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; import java.util.Objects; -public class DeleteInternalCcrRepositoryRequest extends ActionRequest { +public class DeleteInternalCcrRepositoryRequest extends LegacyActionRequest { private final String name; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkRequest.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkRequest.java index 5f36e71e63a4..ac488853376b 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkRequest.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/GetCcrRestoreFileChunkRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.xpack.ccr.action.repositories; -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.node.DiscoveryNode; import org.elasticsearch.common.io.stream.StreamInput; @@ -21,7 +21,7 @@ import java.io.IOException; import static org.elasticsearch.xpack.ccr.Ccr.TRANSPORT_VERSION_ACTION_WITH_SHARD_ID; -public class GetCcrRestoreFileChunkRequest extends ActionRequest implements RemoteClusterAwareRequest, IndicesRequest { +public class GetCcrRestoreFileChunkRequest extends LegacyActionRequest implements RemoteClusterAwareRequest, IndicesRequest { private final DiscoveryNode node; private final String sessionUUID; diff --git a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryRequest.java b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryRequest.java index 6d92062035d7..6c6023149042 100644 --- a/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryRequest.java +++ b/x-pack/plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/repositories/PutInternalCcrRepositoryRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.ccr.action.repositories; -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; import java.util.Objects; -public class PutInternalCcrRepositoryRequest extends ActionRequest { +public class PutInternalCcrRepositoryRequest extends LegacyActionRequest { private final String name; private final String type; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageRequest.java index c675dcba1ff0..7afb76987edb 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/GetFeatureUsageRequest.java @@ -7,13 +7,13 @@ package org.elasticsearch.license; -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 GetFeatureUsageRequest extends ActionRequest { +public class GetFeatureUsageRequest extends LegacyActionRequest { public GetFeatureUsageRequest() {} diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java index 2ac0139ac030..c80adc7712da 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/XPackInfoRequest.java @@ -8,8 +8,8 @@ package org.elasticsearch.protocol.xpack; 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.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.license.License; @@ -21,7 +21,7 @@ import java.util.Locale; /** * Fetch information about X-Pack from the cluster. */ -public class XPackInfoRequest extends ActionRequest { +public class XPackInfoRequest extends LegacyActionRequest { public enum Category { BUILD, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java index f2e045b08328..33242294b723 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/protocol/xpack/graph/GraphExploreRequest.java @@ -7,9 +7,9 @@ package org.elasticsearch.protocol.xpack.graph; 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; @@ -33,7 +33,7 @@ import java.util.List; * Holds the criteria required to guide the exploration of connected terms which * can be returned as a graph. */ -public class GraphExploreRequest extends ActionRequest implements IndicesRequest.Replaceable, ToXContentObject { +public class GraphExploreRequest extends LegacyActionRequest implements IndicesRequest.Replaceable, ToXContentObject { public static final String NO_HOPS_ERROR_MESSAGE = "Graph explore request must have at least one hop"; public static final String NO_VERTICES_ERROR_MESSAGE = "Graph explore hop must have at least one VertexRequest"; @@ -158,9 +158,8 @@ public class GraphExploreRequest extends ActionRequest implements IndicesRequest * available but can still overrun due to the nature of their "best efforts" * timeout support. When a timeout occurs partial results are returned. * - * @param timeout - * a {@link TimeValue} object which determines the maximum length - * of time to spend exploring + * @param timeout a {@link TimeValue} object which determines the maximum length + * of time to spend exploring */ public GraphExploreRequest timeout(TimeValue timeout) { if (timeout == null) { @@ -212,8 +211,7 @@ public class GraphExploreRequest extends ActionRequest implements IndicesRequest * background frequencies of terms found in the documents *

      * - * @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 class GraphExploreRequest extends ActionRequest implements IndicesRequest * 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 class GraphExploreRequest extends ActionRequest implements IndicesRequest * 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 class GraphExploreRequest extends ActionRequest implements IndicesRequest * 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 1b67e9af02fd..ad929928d14f 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 @@ import java.io.IOException; /** * 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 63840a9de222..ae4e0424d6d8 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 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; * 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 final class PutWatchRequest extends ActionRequest { /** * 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 final class PutWatchRequest extends ActionRequest { /** * 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 final class PutWatchRequest extends ActionRequest { /** * 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 final class PutWatchRequest extends ActionRequest { /** * 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 65754543d3fe..ae08fd32f328 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.io.IOException; 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 7113cbca279d..2cd54c47b659 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 @@ import java.util.Objects; /** * 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 4e6f1d9c69cc..89ba09cd222e 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 1b51cf87dcd8..ca9371aed6e7 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 org.elasticsearch.core.TimeValue; 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 3581b9db1988..a06726099095 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 @@ import java.util.Objects; /** * 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 9faa78d3b34f..95f9d7935426 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 e4c461431e62..799f75cfd052 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 @@ import java.util.Objects; * 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 a37ccc525a4d..d8ebe8c0123f 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 class InferenceActionProxy extends ActionType { 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 2090f1cb1bd5..91fc91151c68 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 class AuditMlNotificationAction extends ActionType 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 0a4525e0524d..9d0a8d2bc998 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 @@ public class CancelJobModelSnapshotUpgradeAction extends ActionType 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 a5df3ee8ed70..9fd0819ecb5a 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 @@ public class EstimateModelMemoryAction extends ActionType 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 937a061541dc..46d3d0283210 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 @@ public class EvaluateDataFrameAction extends ActionType { 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 98a79b3e1b80..0e8f0cb64ac5 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 @@ public class GetCalendarEventsAction extends ActionType 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 bdeece989201..4e76b4d68877 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 @@ public class GetCategoriesAction extends ActionType 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 e3e4184c18df..d393bf719606 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 @@ public class GetInfluencersAction extends ActionType { 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 496b5d69772b..f465e5212ddd 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 @@ public class InferModelAction extends ActionType { 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 class InferModelAction extends ActionType { 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 class InferModelAction extends ActionType { 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 class InferModelAction extends ActionType { 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 class InferModelAction extends ActionType { * 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 class InferModelAction extends ActionType { 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) @@ -412,7 +406,7 @@ public class InferModelAction extends ActionType { 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 94bb7047bfe2..6a0b8c1403db 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 @@ public class MlInfoAction extends ActionType { 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 d3cfa22e0aaa..07ebfd850343 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 @@ public class PostCalendarEventsAction extends ActionType, 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 59f38eee9a40..25bd8ca09bd2 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 @@ public class PreviewDataFrameAnalyticsAction extends ActionType 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 7988f885a27d..968d0b3fb38a 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 @@ public class PreviewDatafeedAction extends ActionType 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 class PreviewDatafeedAction extends ActionType { 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 1e4c649cb9dc..9ae30e8b83a2 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 @@ public class PutFilterAction extends ActionType { 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 e98eb38db6ea..22ffc0bdad10 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 @@ public class UpdateCalendarJobAction extends ActionType { 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 a6a84a35980e..7c78544d0478 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 @@ public class UpdateModelSnapshotAction extends ActionType 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 6831f985fdc7..a78ff1857f0a 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 @@ public class ValidateDetectorAction extends ActionType { 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 76cba60667c3..eb17afbaa5a3 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 @@ public class ValidateJobConfigAction extends ActionType { 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 36bc2db95932..4b65bc335008 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; * 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 d73f0a663984..64fa334e6c55 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 @@ public class GetRollupCapsAction extends ActionType 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 8e449abdea73..f61a2fafc6ec 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 50b08ef7d410..fdba9cf416b2 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 @@ -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.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -24,7 +24,7 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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; @@ -119,9 +119,9 @@ public final class InvalidateApiKeyRequest extends ActionRequest { /** * 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) { @@ -131,9 +131,9 @@ public final class InvalidateApiKeyRequest extends ActionRequest { /** * 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) { @@ -143,9 +143,9 @@ public final class InvalidateApiKeyRequest extends ActionRequest { /** * 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 73392057ec74..63f470b0cc7c 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 java.util.List; 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 10f212b0d9ce..7d1c246a3fb1 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 df82739fc3ff..41738a1ff831 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 564dfbdf65e0..ebbec9d19bd3 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 @@ -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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 a8050fc3352f..b63478c2ef20 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 java.io.IOException; 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 26388709b084..11f527141d97 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 6bee6e9bc3ad..680b20bd8d3d 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 bbcd2bbe255c..9d9970ce1672 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 582317c91623..d761bce3d392 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 e1e9b7236430..45223286aa3f 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 7a7d969ddb14..2d76b95c1399 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 java.util.Set; 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 671c55579bbf..03983c116c7c 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 5b92996dafc3..18bf2b009e76 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 java.util.Set; 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 90d59e0e39f4..8059b78157a2 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 java.util.stream.Collectors; 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 d7009a683b0e..a19b12c40472 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 38648f81fbcd..6975fda7b1f2 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.io.IOException; 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 121ea62ee99e..c04abb6668d3 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 310bd6c70779..7791ff28ac3b 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 @@ import static org.elasticsearch.action.support.TransportAction.localOnly; /** * 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 46ba00a4f276..965ba67009cc 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 c61f9b7156dd..5b16db79ebcb 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 java.util.List; 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 5e75f53f12e8..c53aab8801b7 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 e1b018fdb7d7..c9807fe5151e 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 class GetRoleMappingsRequest extends ActionRequest { /** * 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 44bfaa435e14..4faf5d43a4d5 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 @@ -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; @@ -29,10 +29,10 @@ import static org.elasticsearch.xpack.core.security.authc.support.mapper.Express /** * 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 1a5041c8d985..d3241dd3cb81 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 @@ import java.util.List; /** * 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 b4e0cd5ab90e..8d5d7c8f85b0 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 a9314ddcf012..e23885e88654 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 fa6dad6215b1..cb95ab0f19d5 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 067bb156aa90..02627fa63668 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 @@ -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.common.io.stream.StreamOutput; import org.elasticsearch.core.Nullable; @@ -17,7 +17,7 @@ import java.io.IOException; /** * 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 99b86aa22e3f..b2d7de183b00 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 java.io.IOException; 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 5ec9f2333f8e..8dec45ccb5ea 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 java.util.Objects; 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 281541be396b..d3937d821df6 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 java.util.Objects; 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 c0cdffdfd5df..12d30803a784 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 java.util.Objects; 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 1d9c60d33cf0..e17b7e4d6eb1 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 org.elasticsearch.core.Nullable; 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 3b1d67090e8d..113f4729a42d 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; * 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 6c4b157dcf1f..d0a587939e6e 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 final class InvalidateTokenRequest extends ActionRequest { /** * @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 78533dd93564..5f22c73aa8ce 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 c5a807b06bb3..4051bf54f5ec 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 7144489ba6ec..5f3510ecf9cc 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 308fc7e5f3eb..5c7dfc679e39 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 @@ import java.io.IOException; /** * 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 29c48f29709f..6ad0d6ace842 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 56485ed6b156..d46916f58128 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 @@ import java.io.IOException; /** * 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 740f9aef6713..bde60dcdfb65 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 java.util.Objects; 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 1ac96fddf345..00f86ff023cc 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 c5f804d39020..5d539a1ff927 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; * 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 7b5019498751..53fce1f620cd 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 @@ import static org.elasticsearch.action.ValidateActions.addValidationError; /** * 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 32d9725a909c..7aec426351d1 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 @@ public class GetCertificateInfoAction extends 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 61be7cb3fe69..4fdd068774ad 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 @@ public class GetCheckpointAction extends ActionType 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 15e8369908e5..e84d522e4b42 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.search.sort.FieldSortBuilder; 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 @@ public class QueryWatchesAction extends ActionType 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 class QueryWatchesAction extends ActionType } @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 2540f29fcc76..8e81a3eefcad 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 @@ import java.util.Locale; /** * 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 669ba097a94d..d0152b4a6f02 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 @@ import java.io.IOException; /** * 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 class ActivateWatchRequest extends ActionRequest { /** * @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 2f2617f956ed..9bb0e3a47bad 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 @@ import java.util.Map; /** * 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 class ExecuteWatchRequest extends ActionRequest { } /** - * @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 class ExecuteWatchRequest extends ActionRequest { /** * 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 class ExecuteWatchRequest extends ActionRequest { /** * @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 8a21665f30b9..52baecc9f62e 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 @@ import java.io.IOException; /** * 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 f64f9e762a54..da45d7b34c49 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 @@ package org.elasticsearch.action; 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 4e816c599ccc..c5365c19632b 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 @@ public class ApiFilteringActionFilterTests extends ESTestCase { 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 e8be471ba423..adfbd49452dd 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 @@ package org.elasticsearch.xpack.core.security.action.apikey; 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; @@ -93,7 +93,7 @@ public class InvalidateApiKeyRequestTests extends ESTestCase { } 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 7935acc46cc0..3f1653590843 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.LogManager; 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; @@ -260,7 +260,7 @@ public class DownsampleShardPersistentTaskExecutor extends PersistentTasksExecut 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 a7bf5d62de22..e216e0dbb131 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; @@ -45,11 +45,11 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 723ff12b3b1e..0783086cc569 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,8 +7,8 @@ package org.elasticsearch.xpack.application.connector.action; -import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.cluster.metadata.MetadataCreateIndexService; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.indices.InvalidIndexNameException; @@ -21,7 +21,7 @@ import static org.elasticsearch.xpack.application.connector.ConnectorTemplateReg /** * Abstract base class for action requests targeting the connectors index. */ -public abstract class ConnectorActionRequest extends ActionRequest { +public abstract class ConnectorActionRequest extends LegacyActionRequest { public ConnectorActionRequest() { super(); @@ -34,7 +34,7 @@ public abstract class ConnectorActionRequest extends ActionRequest { /** * Validates the given index name and updates the validation exception if the name is invalid. * - * @param indexName The index name to validate. If null, no validation is performed. + * @param indexName The index name to validate. If null, no validation is performed. * @param validationException The exception to accumulate validation errors. * @return The updated or original {@code validationException} with any new validation errors added, if the index name is invalid. */ @@ -53,10 +53,10 @@ public abstract class ConnectorActionRequest extends ActionRequest { * Validates that the given index name starts with the required prefix for Elastic-managed connectors. * If the index name does not start with the required prefix, the validation exception is updated with an error message. * - * @param indexName The index name to validate. If null, no validation is performed. + * @param indexName The index name to validate. If null, no validation is performed. * @param validationException The exception to accumulate validation errors. * @return The updated or original {@code validationException} with any new validation errors added, - * if the index name does not start with the required prefix. + * if the index name does not start with the required prefix. */ public ActionRequestValidationException validateManagedConnectorIndexPrefix( String indexName, 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 efc8b2b6c660..d273650d9c0d 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 java.util.Objects; 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 e8792dd3755b..10ade525ee6f 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 java.util.Objects; 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 90672f7ca712..b02e95f95db9 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 java.util.Objects; 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 94bfceaddb84..e7ddc224ae7c 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.io.stream.StreamOutput; 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 java.util.Objects; 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 class PutConnectorSecretRequest extends ActionRequest implements ToXConte 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 11a3334aed4e..73a582a866aa 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,7 +7,7 @@ package org.elasticsearch.xpack.application.connector.syncjob.action; -import org.elasticsearch.action.ActionRequest; +import org.elasticsearch.action.LegacyActionRequest; import org.elasticsearch.common.io.stream.StreamInput; import java.io.IOException; @@ -15,7 +15,7 @@ import java.io.IOException; /** * Abstract base class for action requests targeting the connector sync job index. */ -public abstract class ConnectorSyncJobActionRequest extends ActionRequest { +public abstract class ConnectorSyncJobActionRequest extends LegacyActionRequest { 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 da7866bd62bd..8038d313d246 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 class DeleteQueryRuleAction { 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 1b4ae187b263..a81ff63a3131 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 class DeleteQueryRulesetAction { 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 0e7b244e579c..edd307d67174 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 class GetQueryRuleAction { (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 025bb8fab606..bf3755416714 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 class GetQueryRulesetAction { } ); + 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 b863f844985b..debffc8374a2 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.xcontent.ConstructingObjectParser; @@ -31,11 +31,11 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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); 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 7cf8289a4934..19bf0057b55b 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 class PutQueryRuleAction { 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 ccd1e68833f3..f4ca857f8fd9 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 class PutQueryRulesetAction { 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 4af3900578ef..38af98fd083b 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; @@ -35,14 +35,14 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstr public class TestQueryRulesetAction { // 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; @@ -120,6 +120,7 @@ public class TestQueryRulesetAction { } ); + 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 98ae7cdef770..4d34504f17f8 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 final 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 ca9026c4b67f..61b32d59a23f 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 d2c24cf3c6d5..d8037762ee15 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstr 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 class ListSearchApplicationAction { "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 798a8fa2327a..849edfe91f19 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 @@ import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg 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 class PutSearchApplicationAction { 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 105b58308217..671407c0c9ce 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 java.util.Objects; 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 1e923fd300f4..a11f81c1a4ba 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.action.ValidateActions.addValidationError; 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 final long MIN_KEEP_ALIVE = TimeValue.timeValueMinutes(1).millis(); public static final TimeValue DEFAULT_KEEP_ALIVE = TimeValue.timeValueDays(5); @@ -273,13 +273,13 @@ public class EqlSearchRequest extends ActionRequest implements IndicesRequest.Re 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); @@ -459,7 +459,7 @@ public class EqlSearchRequest extends ActionRequest implements IndicesRequest.Re 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 2e71c2c0a1ad..c87bf6089aca 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 409f5ed39c01..8415456e9d18 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 @@ public class DriverTaskRunner { 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/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlGetQueryRequest.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlGetQueryRequest.java index a0e5fc0c9443..e68626609d94 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlGetQueryRequest.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlGetQueryRequest.java @@ -7,15 +7,15 @@ package org.elasticsearch.xpack.esql.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.TaskId; import java.io.IOException; -public class EsqlGetQueryRequest extends ActionRequest { +public class EsqlGetQueryRequest extends LegacyActionRequest { private final TaskId id; public EsqlGetQueryRequest(TaskId id) { diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlListQueriesRequest.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlListQueriesRequest.java index 7ef639f4cd10..1a01d9487ff4 100644 --- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlListQueriesRequest.java +++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlListQueriesRequest.java @@ -7,13 +7,13 @@ package org.elasticsearch.xpack.esql.action; -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 EsqlListQueriesRequest extends ActionRequest { +public class EsqlListQueriesRequest extends LegacyActionRequest { public EsqlListQueriesRequest() {} public EsqlListQueriesRequest(StreamInput streamInput) throws IOException { 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 9a08eccf3b25..c0a4d8a18941 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 2c28ea776848..edcf82bc8765 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 @@ package org.elasticsearch.xpack.fleet.action; 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.rest.RestStatus; 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 class GetGlobalCheckpointsAction extends ActionType 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 6f6bc1811126..1840cc7aa1c6 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 org.elasticsearch.xcontent.XContentType; 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 635d8b8f3097..3d6838367c81 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 class CancelReindexDataStreamAction extends ActionType { 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 492d8c0b97b8..b19aa58400be 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 @@ public class ReindexDataStreamIndexAction extends ActionType { super(NAME); } - public static class Request extends ActionRequest { + public static class Request extends LegacyActionRequest { private final DiscoveryNode discoveryNode; @@ -58,14 +58,14 @@ public class FrozenCacheInfoAction extends ActionType { } } - 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 b24af3c876b7..db16b5e0942a 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 @@ public class FrozenCacheInfoNodeAction extends ActionType * 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 @@ public class TransportReloadRemoteClusterCredentialsAction extends TransportActi 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 a033d357ec03..ad3ca863097c 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 @@ package org.elasticsearch.xpack.slm; 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 @@ public class TransportSLMGetExpiredSnapshotsAction extends TransportAction< }).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 3712ff789822..e6a885b0f644 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.ExceptionsHelper; 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; @@ -170,7 +170,6 @@ import static org.elasticsearch.repositories.blobstore.testkit.SnapshotRepositor * * 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 { @@ -218,10 +217,10 @@ class BlobAnalyzeAction extends HandledTransportAction listener; + private final ActionListener listener; private final Random random; private final boolean checksumWholeBlob; private final long checksumStart; @@ -239,10 +238,10 @@ class BlobAnalyzeAction extends HandledTransportAction listener + ActionListener listener ) { this.transportService = transportService; this.task = task; @@ -724,7 +723,7 @@ class BlobAnalyzeAction 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 class RepositoryAnalyzeAction extends HandledTransportAction * 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;