From d10fec200033ee2260443f01ff9d7df5d9b06aff Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Wed, 13 Jul 2022 17:44:26 -0700 Subject: [PATCH] Call the static method of ClusterManagerNodeChangePredicate in MasterNodeChangePredicate instead of using inheritance Signed-off-by: Tianli Feng --- .../cluster/ClusterManagerNodeChangePredicate.java | 8 ++------ .../org/opensearch/cluster/MasterNodeChangePredicate.java | 7 ++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/opensearch/cluster/ClusterManagerNodeChangePredicate.java b/server/src/main/java/org/opensearch/cluster/ClusterManagerNodeChangePredicate.java index a28b1690dabac..ecb99e06f3ef0 100644 --- 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 index 3c86d9bbedc03..d06aa219e3ca6 100644 --- a/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java +++ b/server/src/main/java/org/opensearch/cluster/MasterNodeChangePredicate.java @@ -32,6 +32,8 @@ package org.opensearch.cluster; +import java.util.function.Predicate; + /** * Utility class to build a predicate that accepts cluster state changes * @@ -39,10 +41,13 @@ * @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 build(ClusterState currentState) { + return ClusterManagerNodeChangePredicate.build(currentState); + } }