Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct class definitions in deprecated package org.opensearch.actionsupport.master #3661

Closed
wants to merge 1 commit into from
Closed

Correct class definitions in deprecated package org.opensearch.actionsupport.master #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,7 +41,7 @@
*
* @opensearch.internal
*/
public abstract class AcknowledgedRequest<Request extends ClusterManagerNodeRequest<Request>> extends
public abstract class AcknowledgedRequest<Request extends AcknowledgedRequest<Request>> extends
org.opensearch.action.support.clustermanager.AcknowledgedRequest<Request> {

protected AcknowledgedRequest() {
Expand Down
2 changes: 0 additions & 2 deletions server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
3 changes: 1 addition & 2 deletions ...src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -47,7 +46,7 @@
*/
@Deprecated
public abstract class MasterNodeOperationRequestBuilder<
Request extends ClusterManagerNodeRequest<Request>,
Request extends MasterNodeRequest<Request>,
Response extends ActionResponse,
RequestBuilder extends MasterNodeOperationRequestBuilder<Request, Response, RequestBuilder>> extends
ClusterManagerNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
Expand Down
8 changes: 3 additions & 5 deletions ...main/java/org/opensearch/action/support/master/MasterNodeReadOperationRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -47,10 +45,10 @@
*/
@Deprecated
public abstract class MasterNodeReadOperationRequestBuilder<
Request extends ClusterManagerNodeReadRequest<Request>,
Request extends MasterNodeReadRequest<Request>,
Response extends ActionResponse,
RequestBuilder extends ClusterManagerNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>> extends
ClusterManagerNodeOperationRequestBuilder<Request, Response, RequestBuilder> {
RequestBuilder extends MasterNodeReadOperationRequestBuilder<Request, Response, RequestBuilder>> extends
ClusterManagerNodeReadOperationRequestBuilder<Request, Response, RequestBuilder> {

protected MasterNodeReadOperationRequestBuilder(OpenSearchClient client, ActionType<Response> action, Request request) {
super(client, action, request);
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Request extends MasterNodeRequest<Request>, Response extends ActionResponse> extends
Expand Down
3 changes: 1 addition & 2 deletions server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeReadAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Request extends MasterNodeReadRequest<Request>, Response extends ActionResponse> extends
Expand Down
1 change: 0 additions & 1 deletion ...er/src/main/java/org/opensearch/action/support/master/info/ClusterInfoRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down