Call the static method of ClusterManagerNodeChangePredicate in Master…

…NodeChangePredicate instead of using inheritance Signed-off-by: Tianli Feng <[email protected]>
opensearch-project · Jul 14, 2022 · d10fec2 · d10fec2
1 parent c186bec
commit d10fec2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterManagerNodeChangePredicate.java b/server/src/main/java/org/opensearch/cluster/ClusterManagerNodeChangePredicate.java
@@ -41,13 +41,9 @@
  *
  * @opensearch.internal
  */
-// TODO: add final keyword to the class and private keyword to the default constructor,
-// after removing the deprecated class MasterNodeChangePredicate.
-// Removed the final keyword temporarily only for making the class MasterNodeChangePredicate as a subclass,
-// so that preserving the both class names by maintaining one class implementation for backwards compatibility.
-public class ClusterManagerNodeChangePredicate {
+public final class ClusterManagerNodeChangePredicate {
 
-    ClusterManagerNodeChangePredicate() {
+    private ClusterManagerNodeChangePredicate() {
 
     }
 

diff --git a/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java b/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java
@@ -32,17 +32,22 @@
 
 package org.opensearch.cluster;
 
+import java.util.function.Predicate;
+
 /**
  * Utility class to build a predicate that accepts cluster state changes
  *
  * @opensearch.internal
  * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link ClusterManagerNodeChangePredicate}
  */
 @Deprecated
-public final class MasterNodeChangePredicate extends ClusterManagerNodeChangePredicate {
+public final class MasterNodeChangePredicate {
 
     private MasterNodeChangePredicate() {
 
     }
 
+    public static Predicate<ClusterState> build(ClusterState currentState) {
+        return ClusterManagerNodeChangePredicate.build(currentState);
+    }
 }