Move deprecated masterNodeTimeout() into ClusterManagerNodeRequest class

Signed-off-by: Tianli Feng <[email protected]>

Author: Tianli Feng

server/src/main/java/org/opensearch/action/support/clustermanager/ClusterManagerNodeRequest.java

@@ -82,4 +82,14 @@ public final Request clusterManagerNodeTimeout(String timeout) {
     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() {
+        return this.clusterManagerNodeTimeout;
+    }
 }

server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java

@@ -74,9 +74,4 @@ public final Request masterNodeTimeout(TimeValue timeout) {
     public final Request masterNodeTimeout(String timeout) {
         return masterNodeTimeout(TimeValue.parseTimeValue(timeout, null, getClass().getSimpleName() + ".masterNodeTimeout"));
     }
-
-    @Deprecated
-    public final TimeValue masterNodeTimeout() {
-        return this.masterNodeTimeout;
-    }
 }