Reserve all methods with 'master' in the names in the package 'org.op…

…ensearch.action.support.clustermanager' Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Jun 22, 2022 · 4c9f2f1 · 4c9f2f1
1 parent d8d0640
commit 4c9f2f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/...g/opensearch/action/support/clustermanager/ClusterManagerNodeOperationRequestBuilder.java b/...g/opensearch/action/support/clustermanager/ClusterManagerNodeOperationRequestBuilder.java
@@ -65,6 +65,8 @@ public final RequestBuilder setClusterManagerNodeTimeout(TimeValue timeout) {
 
     /**
      * Sets the cluster-manager node timeout in case the cluster-manager has not yet been discovered.
+     *
+     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)}
      */
     @SuppressWarnings("unchecked")
     @Deprecated
@@ -83,6 +85,8 @@ public final RequestBuilder setClusterManagerNodeTimeout(String timeout) {
 
     /**
      * Sets the cluster-manager node timeout in case the cluster-manager has not yet been discovered.
+     *
+     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)}
      */
     @SuppressWarnings("unchecked")
     @Deprecated

diff --git a/...src/main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeRequest.java b/...src/main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeRequest.java
@@ -48,11 +48,13 @@ public abstract class ClusterManagerNodeRequest<Request extends ClusterManagerNo
 
     public static final TimeValue DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30);
 
+    /** @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT} */
     @Deprecated
     public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT = DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT;
 
     protected TimeValue clusterManagerNodeTimeout = DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT;
 
+    /** @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout} */
     @Deprecated
     protected TimeValue masterNodeTimeout = clusterManagerNodeTimeout;
 
@@ -80,6 +82,8 @@ public final Request clusterManagerNodeTimeout(TimeValue timeout) {
 
     /**
      * A timeout value in case the cluster-manager has not been discovered yet or disconnected.
+     *
+     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout(TimeValue)}
      */
     @SuppressWarnings("unchecked")
     @Deprecated
@@ -98,6 +102,8 @@ public final Request clusterManagerNodeTimeout(String timeout) {
 
     /**
      * A timeout value in case the cluster-manager has not been discovered yet or disconnected.
+     *
+     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout(String)}
      */
     @Deprecated
     public final Request masterNodeTimeout(String timeout) {
@@ -108,7 +114,6 @@ public final TimeValue clusterManagerNodeTimeout() {
         return this.clusterManagerNodeTimeout;
     }
 
-    // Preserve the method so that classes implements AcknowledgedRequest don't need to override it for backwards compatibility.
     /** @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout()} */
     @Deprecated
     public final TimeValue masterNodeTimeout() {

diff --git a/...src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java b/...src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java
@@ -54,5 +54,4 @@ public abstract class MasterNodeOperationRequestBuilder<
     protected MasterNodeOperationRequestBuilder(OpenSearchClient client, ActionType<Response> action, Request request) {
         super(client, action, request);
     }
-
 }
diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java
@@ -49,5 +49,4 @@ public abstract class MasterNodeRequest<Request extends MasterNodeRequest<Reques
     protected MasterNodeRequest(StreamInput in) throws IOException {
         super(in);
     }
-
 }