From 3e32ffaa23df168052342bbb39f1166e3de7753c Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Wed, 22 Jun 2022 17:04:25 -0700 Subject: [PATCH] Correct class definitions in deprecated package org.opensearch.action.support.master Signed-off-by: Tianli Feng --- .../action/support/master/AcknowledgedRequest.java | 3 +-- .../action/support/master/AcknowledgedRequestBuilder.java | 2 -- .../support/master/MasterNodeOperationRequestBuilder.java | 3 +-- .../master/MasterNodeReadOperationRequestBuilder.java | 8 +++----- .../action/support/master/TransportMasterNodeAction.java | 3 +-- .../support/master/TransportMasterNodeReadAction.java | 3 +-- .../support/master/info/ClusterInfoRequestBuilder.java | 1 - 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java index 857f4dc26a111..52a1052669985 100644 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java +++ b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java @@ -31,7 +31,6 @@ package org.opensearch.action.support.master; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest; import org.opensearch.common.io.stream.StreamInput; import java.io.IOException; @@ -42,7 +41,7 @@ * * @opensearch.internal */ -public abstract class AcknowledgedRequest> extends +public abstract class AcknowledgedRequest> extends org.opensearch.action.support.clustermanager.AcknowledgedRequest { protected AcknowledgedRequest() { diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java index e247734691eca..bd5ecd93a51d2 100644 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java @@ -32,8 +32,6 @@ package org.opensearch.action.support.master; import org.opensearch.action.ActionType; -import org.opensearch.action.support.clustermanager.AcknowledgedRequest; -import org.opensearch.action.support.clustermanager.AcknowledgedResponse; import org.opensearch.client.OpenSearchClient; /** diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java index 4522f3f57d3a9..0b6bd572a6b3b 100644 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java @@ -35,7 +35,6 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.clustermanager.ClusterManagerNodeOperationRequestBuilder; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest; import org.opensearch.client.OpenSearchClient; import org.opensearch.common.unit.TimeValue; @@ -47,7 +46,7 @@ */ @Deprecated public abstract class MasterNodeOperationRequestBuilder< - Request extends ClusterManagerNodeRequest, + Request extends MasterNodeRequest, Response extends ActionResponse, RequestBuilder extends MasterNodeOperationRequestBuilder> extends ClusterManagerNodeOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java index 2ac6b2ba05b4c..ae134bdeca3c2 100644 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java @@ -34,9 +34,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeOperationRequestBuilder; import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadOperationRequestBuilder; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest; import org.opensearch.client.OpenSearchClient; /** @@ -47,10 +45,10 @@ */ @Deprecated public abstract class MasterNodeReadOperationRequestBuilder< - Request extends ClusterManagerNodeReadRequest, + Request extends MasterNodeReadRequest, Response extends ActionResponse, - RequestBuilder extends ClusterManagerNodeReadOperationRequestBuilder> extends - ClusterManagerNodeOperationRequestBuilder { + RequestBuilder extends MasterNodeReadOperationRequestBuilder> extends + ClusterManagerNodeReadOperationRequestBuilder { protected MasterNodeReadOperationRequestBuilder(OpenSearchClient client, ActionType action, Request request) { super(client, action, request); diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java index 3514d941c937d..544325153f685 100644 --- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java +++ b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java @@ -35,7 +35,6 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest; import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeAction; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; @@ -50,7 +49,7 @@ * A base class for operations that needs to be performed on the cluster-manager node. * * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeRequest} + * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link TransportClusterManagerNodeAction} */ @Deprecated public abstract class TransportMasterNodeAction, Response extends ActionResponse> extends diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java index 9b3d34ad3d931..0b3f309acc189 100644 --- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java +++ b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java @@ -34,7 +34,6 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest; import org.opensearch.action.support.clustermanager.TransportClusterManagerNodeReadAction; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; @@ -47,7 +46,7 @@ * Can also be executed on the local node if needed. * * @opensearch.internal - * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link ClusterManagerNodeRequest} + * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link TransportClusterManagerNodeReadAction} */ @Deprecated public abstract class TransportMasterNodeReadAction, Response extends ActionResponse> extends diff --git a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java index c13dbe296dff2..7052e13625f97 100644 --- a/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java @@ -33,7 +33,6 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionResponse; -import org.opensearch.action.support.clustermanager.info.ClusterInfoRequest; import org.opensearch.client.OpenSearchClient; /**