This is an automated email from the ASF dual-hosted git repository. kezhuw pushed a commit to branch branch-3.9 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 54fde80265da86eaf01d1013d9a252b6df26efa5 Author: Kezhu Wang <[email protected]> AuthorDate: Thu Aug 21 03:16:31 2025 +0800 ZOOKEEPER-4965: Drop unnecessary deprecation warning suppressions Reviewers: tisonkun Author: kezhuw Closes #2304 from kezhuw/ZOOKEEPER-4965-drop-unnecessary-deprecation-suppress (cherry picked from 8b1361514e6c3ea853780de2f00a74654e8ea8dc) --- .../src/main/java/org/apache/zookeeper/ZooKeeper.java | 5 ++--- .../java/org/apache/zookeeper/client/ZKClientConfig.java | 16 +++++----------- .../org/apache/zookeeper/client/ZooKeeperSaslClient.java | 6 +++--- .../org/apache/zookeeper/server/quorum/QuorumPeer.java | 1 - .../java/org/apache/zookeeper/test/ReadOnlyModeTest.java | 1 - 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java index 07a4a12fa..1108833a2 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/ZooKeeper.java @@ -149,15 +149,14 @@ public class ZooKeeper implements AutoCloseable { * instead. */ @Deprecated - public static final String ZOOKEEPER_CLIENT_CNXN_SOCKET = "zookeeper.clientCnxnSocket"; - // Setting this to "true" will enable encrypted client-server communication. + public static final String ZOOKEEPER_CLIENT_CNXN_SOCKET = ZKClientConfig.ZOOKEEPER_CLIENT_CNXN_SOCKET; /** * @deprecated Use {@link ZKClientConfig#SECURE_CLIENT} * instead. */ @Deprecated - public static final String SECURE_CLIENT = "zookeeper.client.secure"; + public static final String SECURE_CLIENT = ZKClientConfig.SECURE_CLIENT; protected final ClientCnxn cnxn; private static final Logger LOG; diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java index 10c61375d..7aa9c7408 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZKClientConfig.java @@ -20,7 +20,6 @@ import java.io.File; import org.apache.yetus.audience.InterfaceAudience; -import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.common.ZKConfig; import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException; @@ -35,13 +34,10 @@ public class ZKClientConfig extends ZKConfig { public static final String ZK_SASL_CLIENT_USERNAME_DEFAULT = "zookeeper"; public static final String ZK_SASL_CLIENT_CANONICALIZE_HOSTNAME = "zookeeper.sasl.client.canonicalize.hostname"; public static final String ZK_SASL_CLIENT_CANONICALIZE_HOSTNAME_DEFAULT = "true"; - @SuppressWarnings("deprecation") - public static final String LOGIN_CONTEXT_NAME_KEY = ZooKeeperSaslClient.LOGIN_CONTEXT_NAME_KEY; + public static final String LOGIN_CONTEXT_NAME_KEY = "zookeeper.sasl.clientconfig"; public static final String LOGIN_CONTEXT_NAME_KEY_DEFAULT = "Client"; - @SuppressWarnings("deprecation") - public static final String ENABLE_CLIENT_SASL_KEY = ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY; - @SuppressWarnings("deprecation") - public static final String ENABLE_CLIENT_SASL_DEFAULT = ZooKeeperSaslClient.ENABLE_CLIENT_SASL_DEFAULT; + public static final String ENABLE_CLIENT_SASL_KEY = "zookeeper.sasl.client"; + public static final String ENABLE_CLIENT_SASL_DEFAULT = "true"; public static final String ZOOKEEPER_SERVER_REALM = "zookeeper.server.realm"; /** * This controls whether automatic watch resetting is enabled. Clients @@ -50,13 +46,11 @@ public class ZKClientConfig extends ZKConfig { * "zookeeper.disableAutoWatchReset" to "true" */ public static final String DISABLE_AUTO_WATCH_RESET = "zookeeper.disableAutoWatchReset"; - @SuppressWarnings("deprecation") - public static final String ZOOKEEPER_CLIENT_CNXN_SOCKET = ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET; + public static final String ZOOKEEPER_CLIENT_CNXN_SOCKET = "zookeeper.clientCnxnSocket"; /** * Setting this to "true" will enable encrypted client-server communication. */ - @SuppressWarnings("deprecation") - public static final String SECURE_CLIENT = ZooKeeper.SECURE_CLIENT; + public static final String SECURE_CLIENT = "zookeeper.client.secure"; public static final int CLIENT_MAX_PACKET_LENGTH_DEFAULT = 0xfffff; /* 1 MB */ public static final String ZOOKEEPER_REQUEST_TIMEOUT = "zookeeper.request.timeout"; public static final String ZOOKEEPER_SERVER_PRINCIPAL = "zookeeper.server.principal"; diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java index 4ec85625d..7bccbe80e 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/client/ZooKeeperSaslClient.java @@ -54,19 +54,19 @@ public class ZooKeeperSaslClient { * instead. */ @Deprecated - public static final String LOGIN_CONTEXT_NAME_KEY = "zookeeper.sasl.clientconfig"; + public static final String LOGIN_CONTEXT_NAME_KEY = ZKClientConfig.LOGIN_CONTEXT_NAME_KEY; /** * @deprecated Use {@link ZKClientConfig#ENABLE_CLIENT_SASL_KEY} * instead. */ @Deprecated - public static final String ENABLE_CLIENT_SASL_KEY = "zookeeper.sasl.client"; + public static final String ENABLE_CLIENT_SASL_KEY = ZKClientConfig.ENABLE_CLIENT_SASL_KEY; /** * @deprecated Use {@link ZKClientConfig#ENABLE_CLIENT_SASL_DEFAULT} * instead. */ @Deprecated - public static final String ENABLE_CLIENT_SASL_DEFAULT = "true"; + public static final String ENABLE_CLIENT_SASL_DEFAULT = ZKClientConfig.ENABLE_CLIENT_SASL_DEFAULT; /** * Returns true if the SASL client is enabled. By default, the client diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java index 6fc3ee200..bd444eae1 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java @@ -1380,7 +1380,6 @@ protected Election createElectionAlgorithm(int electionAlgorithm) { return le; } - @SuppressWarnings("deprecation") protected Election makeLEStrategy() { LOG.debug("Initializing leader election protocol..."); return electionAlg; diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java index 521a1247d..1a95372c4 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ReadOnlyModeTest.java @@ -285,7 +285,6 @@ public void testGlobalSessionInRO() throws Exception { * Ensures that client seeks for r/w servers while it's connected to r/o * server. */ - @SuppressWarnings("deprecation") @Test @Timeout(value = 90) public void testSeekForRwServer() throws Exception {
