Revert "Restore method getMasterService() to return MasterService"

This reverts commit 694d876.

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

server/src/main/java/org/opensearch/cluster/service/ClusterService.java

@@ -55,7 +55,6 @@
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Main Cluster Service
@@ -64,8 +63,6 @@
  */
 public class ClusterService extends AbstractLifecycleComponent {
     private final ClusterManagerService clusterManagerService;
-    @Deprecated
-    private MasterService masterService = null;
 
     private final ClusterApplierService clusterApplierService;
 
@@ -117,20 +114,6 @@ public ClusterService(
         this.clusterApplierService = clusterApplierService;
     }
 
-    /**
-     * @deprecated As of 2.2, because supporting inclusive language.
-     */
-    @Deprecated
-    public ClusterService(
-        Settings settings,
-        ClusterSettings clusterSettings,
-        MasterService masterService,
-        ClusterApplierService clusterApplierService
-    ) {
-        this(settings, clusterSettings, (ClusterManagerService) masterService, clusterApplierService);
-        this.masterService = masterService;
-    }
-
     public synchronized void setNodeConnectionsService(NodeConnectionsService nodeConnectionsService) {
         clusterApplierService.setNodeConnectionsService(nodeConnectionsService);
     }
@@ -235,21 +218,10 @@ public void addLocalNodeMasterListener(LocalNodeClusterManagerListener listener)
         clusterApplierService.addLocalNodeMasterListener(listener);
     }
 
-    public ClusterManagerService getClusterManagerService() {
+    public ClusterManagerService getMasterService() {
         return clusterManagerService;
     }
 
-    /**
-     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #getClusterManagerService()}
-     */
-    @Deprecated
-    public MasterService getMasterService() {
-        return Objects.requireNonNullElseGet(
-            masterService,
-            () -> new MasterService(settings, clusterSettings, clusterManagerService.threadPool)
-        );
-    }
-
     /**
      * Getter and Setter for IndexingPressureService, This method exposes IndexingPressureService stats to other plugins for usage.
      * Although Indexing Pressure instances can be accessed via Node and NodeService class but none of them are