More removal of deprecated 'master' code (#17218)

Signed-off-by: Andrew Ross <[email protected]>

Author: andrross

client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java

@@ -946,14 +946,6 @@ Params withFields(String[] fields) {
             return this;
         }
 
-        /**
-         * @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #withClusterManagerTimeout(TimeValue)}
-         */
-        @Deprecated
-        Params withMasterTimeout(TimeValue clusterManagerTimeout) {
-            return putParam("master_timeout", clusterManagerTimeout);
-        }
-
         Params withClusterManagerTimeout(TimeValue clusterManagerTimeout) {
             return putParam("cluster_manager_timeout", clusterManagerTimeout);
         }

client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java

@@ -45,9 +45,6 @@ public abstract class TimedRequest implements Validatable {
 
     public static final TimeValue DEFAULT_ACK_TIMEOUT = timeValueSeconds(30);
     public static final TimeValue DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT = TimeValue.timeValueSeconds(30);
-    /** @deprecated As of 2.2, 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;
 
     private TimeValue timeout = DEFAULT_ACK_TIMEOUT;
     private TimeValue clusterManagerTimeout = DEFAULT_CLUSTER_MANAGER_NODE_TIMEOUT;
@@ -68,16 +65,6 @@ public void setClusterManagerTimeout(TimeValue clusterManagerTimeout) {
         this.clusterManagerTimeout = clusterManagerTimeout;
     }
 
-    /**
-     * Sets the timeout to connect to the cluster-manager node
-     * @param clusterManagerTimeout timeout as a {@link TimeValue}
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerTimeout(TimeValue)}
-     */
-    @Deprecated
-    public void setMasterTimeout(TimeValue clusterManagerTimeout) {
-        setClusterManagerTimeout(clusterManagerTimeout);
-    }
-
     /**
      * Returns the request timeout
      */
@@ -91,13 +78,4 @@ public TimeValue timeout() {
     public TimeValue clusterManagerNodeTimeout() {
         return clusterManagerTimeout;
     }
-
-    /**
-     * Returns the timeout for the request to be completed on the cluster-manager node
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout()}
-     */
-    @Deprecated
-    public TimeValue masterNodeTimeout() {
-        return clusterManagerNodeTimeout();
-    }
 }

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java

@@ -71,25 +71,10 @@ public TimeValue getClusterManagerNodeTimeout() {
         return clusterManagerNodeTimeout;
     }
 
-    /**
-     * @return the timeout for waiting for the cluster-manager node to respond
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()}
-     */
-    @Deprecated
-    public TimeValue getMasterNodeTimeout() {
-        return getClusterManagerNodeTimeout();
-    }
-
     public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
         this.clusterManagerNodeTimeout = clusterManagerNodeTimeout;
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */
-    @Deprecated
-    public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         final TimeValue timeValue = TimeValue.parseTimeValue(
             clusterManagerNodeTimeout,
@@ -98,12 +83,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         setClusterManagerNodeTimeout(timeValue);
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */
-    @Deprecated
-    public void setMasterNodeTimeout(String clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     /**
      * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise
      */

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java

@@ -71,25 +71,10 @@ public TimeValue getClusterManagerNodeTimeout() {
         return clusterManagerNodeTimeout;
     }
 
-    /**
-     * @return the timeout for waiting for the cluster-manager node to respond
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()}
-     */
-    @Deprecated
-    public TimeValue getMasterNodeTimeout() {
-        return getClusterManagerNodeTimeout();
-    }
-
     public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
         this.clusterManagerNodeTimeout = clusterManagerNodeTimeout;
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */
-    @Deprecated
-    public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         final TimeValue timeValue = TimeValue.parseTimeValue(
             clusterManagerNodeTimeout,
@@ -98,12 +83,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         setClusterManagerNodeTimeout(timeValue);
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */
-    @Deprecated
-    public void setMasterNodeTimeout(String clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     /**
      * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise
      */

client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java

@@ -90,25 +90,10 @@ public TimeValue getClusterManagerNodeTimeout() {
         return clusterManagerNodeTimeout;
     }
 
-    /**
-     * @return the timeout for waiting for the cluster-manager node to respond
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getMasterNodeTimeout()}
-     */
-    @Deprecated
-    public TimeValue getMasterNodeTimeout() {
-        return getClusterManagerNodeTimeout();
-    }
-
     public void setClusterManagerNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
         this.clusterManagerNodeTimeout = clusterManagerNodeTimeout;
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(TimeValue)} */
-    @Deprecated
-    public void setMasterNodeTimeout(@Nullable TimeValue clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         final TimeValue timeValue = TimeValue.parseTimeValue(
             clusterManagerNodeTimeout,
@@ -117,12 +102,6 @@ public void setClusterManagerNodeTimeout(String clusterManagerNodeTimeout) {
         setClusterManagerNodeTimeout(timeValue);
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #setClusterManagerNodeTimeout(String)} */
-    @Deprecated
-    public void setMasterNodeTimeout(String clusterManagerNodeTimeout) {
-        setClusterManagerNodeTimeout(clusterManagerNodeTimeout);
-    }
-
     /**
      * @return true if this request is to read from the local cluster state, rather than the cluster-manager node - false otherwise
      */

client/rest/src/main/java/org/opensearch/client/Node.java

@@ -226,15 +226,6 @@ public boolean isClusterManagerEligible() {
             return roles.contains("master") || roles.contains("cluster_manager");
         }
 
-        /**
-         * Returns whether or not the node <strong>could</strong> be elected cluster-manager.
-         * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #isClusterManagerEligible()}
-         */
-        @Deprecated
-        public boolean isMasterEligible() {
-            return isClusterManagerEligible();
-        }
-
         /**
          * Returns whether or not the node stores data.
          */

server/src/internalClusterTest/java/org/opensearch/snapshots/RepositoriesIT.java

@@ -433,7 +433,7 @@ public void testSnapshotShardBlobDeletionRepositoryThrowingError() throws Except
         createFullSnapshot(repositoryName, secondSnapshot);
 
         // Make repository to throw exception when trying to delete stale snapshot shard blobs
-        String clusterManagerNode = internalCluster().getMasterName();
+        String clusterManagerNode = internalCluster().getClusterManagerName();
         ((MockRepository) internalCluster().getInstance(RepositoriesService.class, clusterManagerNode).repository("test-repo"))
             .setThrowExceptionWhileDelete(true);
 

server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java

@@ -367,12 +367,6 @@ public boolean hasDiscoveredClusterManager() {
         return clusterStateHealth.hasDiscoveredClusterManager();
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #hasDiscoveredClusterManager()} */
-    @Deprecated
-    public boolean hasDiscoveredMaster() {
-        return hasDiscoveredClusterManager();
-    }
-
     public int getNumberOfPendingTasks() {
         return this.numberOfPendingTasks;
     }

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

@@ -161,35 +161,16 @@ protected TransportClusterManagerNodeAction(
 
     protected abstract Response read(StreamInput in) throws IOException;
 
-    /**
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(ClusterManagerNodeRequest, ClusterState, ActionListener)}
-     */
-    @Deprecated
-    protected void masterOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
-        throw new UnsupportedOperationException("Must be overridden");
-    }
-
     // TODO: Add abstract keyword after removing the deprecated masterOperation()
-    protected void clusterManagerOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
-        masterOperation(request, state, listener);
-    }
+    protected abstract void clusterManagerOperation(Request request, ClusterState state, ActionListener<Response> listener)
+        throws Exception;
 
     /**
      * Override this operation if access to the task parameter is needed
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(Task, ClusterManagerNodeRequest, ClusterState, ActionListener)}
      */
-    @Deprecated
-    protected void masterOperation(Task task, Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
-        clusterManagerOperation(request, state, listener);
-    }
-
-    /**
-     * Override this operation if access to the task parameter is needed
-     */
-    // TODO: Change the implementation to call 'clusterManagerOperation(request...)' after removing the deprecated masterOperation()
     protected void clusterManagerOperation(Task task, Request request, ClusterState state, ActionListener<Response> listener)
         throws Exception {
-        masterOperation(task, request, state, listener);
+        clusterManagerOperation(request, state, listener);
     }
 
     protected boolean localExecute(Request request) {
@@ -265,7 +246,7 @@ public boolean shouldRetry(Exception e) {
          */
         @Override
         public Exception getTimeoutException(Exception e) {
-            return new ProcessClusterEventTimeoutException(request.masterNodeTimeout, actionName);
+            return new ProcessClusterEventTimeoutException(request.clusterManagerNodeTimeout, actionName);
         }
 
         protected void doStart(ClusterState clusterState) {
@@ -551,17 +532,6 @@ protected String getClusterManagerActionName(DiscoveryNode node) {
         return actionName;
     }
 
-    /**
-     * Allows to conditionally return a different cluster-manager node action name in the case an action gets renamed.
-     * This mainly for backwards compatibility should be used rarely
-     *
-     * @deprecated As of 2.1, because supporting inclusive language, replaced by {@link #getClusterManagerActionName(DiscoveryNode)}
-     */
-    @Deprecated
-    protected String getMasterActionName(DiscoveryNode node) {
-        return getClusterManagerActionName(node);
-    }
-
     /**
      * Override to true if the transport action can be executed locally and need NOT be executed always on cluster-manager (Read actions).
      * The action is executed locally if this method returns true AND

server/src/main/java/org/opensearch/action/support/clustermanager/info/TransportClusterInfoAction.java

@@ -77,34 +77,16 @@ protected ClusterBlockException checkBlock(Request request, ClusterState state)
             .indicesBlockedException(ClusterBlockLevel.METADATA_READ, indexNameExpressionResolver.concreteIndexNames(state, request));
     }
 
-    /** @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerOperation(ClusterInfoRequest, ClusterState, ActionListener)} */
-    @Deprecated
-    protected final void masterOperation(final Request request, final ClusterState state, final ActionListener<Response> listener) {
-        clusterManagerOperation(request, state, listener);
-    }
-
     @Override
     protected final void clusterManagerOperation(final Request request, final ClusterState state, final ActionListener<Response> listener) {
         String[] concreteIndices = indexNameExpressionResolver.concreteIndexNames(state, request);
         doClusterManagerOperation(request, concreteIndices, state, listener);
     }
 
-    // TODO: Add abstract keyword after removing the deprecated doMasterOperation()
-    protected void doClusterManagerOperation(
+    protected abstract void doClusterManagerOperation(
         Request request,
         String[] concreteIndices,
         ClusterState state,
         ActionListener<Response> listener
-    ) {
-        doMasterOperation(request, concreteIndices, state, listener);
-    }
-
-    /**
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #doClusterManagerOperation(ClusterInfoRequest, String[], ClusterState, ActionListener)}
-     */
-    @Deprecated
-    protected void doMasterOperation(Request request, String[] concreteIndices, ClusterState state, ActionListener<Response> listener) {
-        throw new UnsupportedOperationException("Must be overridden");
-    }
-
+    );
 }