From c13ff8dfb3bfa91e8c7af528901f12fcd7c67765 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin9702@gmail.com>
Date: Wed, 11 Sep 2024 16:11:30 +0800
Subject: [PATCH] HBASE-28825 Add deprecation cycle for methods in TokenUtil

---
 .../hbase/security/token/TokenUtil.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java
index 9f8a9219bb34..04d5f78f2161 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java
@@ -45,8 +45,8 @@ public class TokenUtil {
 
   /**
    * See {@link ClientTokenUtil#obtainToken(org.apache.hadoop.hbase.client.AsyncConnection)}.
-   * @deprecated External users should not use this method. Please post on the HBase dev mailing
-   *             list if you need this method. Internal HBase code should use
+   * @deprecated External users should not use this method, will be removed in 4.0.0. Please post on
+   *             the HBase dev mailing list if you need this method. Internal HBase code should use
    *             {@link ClientTokenUtil} instead.
    */
   @Deprecated
@@ -58,7 +58,7 @@ public class TokenUtil {
   /**
    * It was removed in HBase-2.0 but added again as spark code relies on this method to obtain
    * delegation token
-   * @deprecated Since 2.0.0.
+   * @deprecated Since 2.0.0 and will be removed in 4.0.0.
    */
   @Deprecated
   public static Token<AuthenticationTokenIdentifier> obtainToken(Configuration conf)
@@ -70,8 +70,8 @@ public static Token<AuthenticationTokenIdentifier> obtainToken(Configuration con
 
   /**
    * See {@link ClientTokenUtil#obtainToken(org.apache.hadoop.hbase.client.Connection)}.
-   * @deprecated External users should not use this method. Please post on the HBase dev mailing
-   *             list if you need this method. Internal HBase code should use
+   * @deprecated External users should not use this method, will be removed in 4.0.0. Please post on
+   *             the HBase dev mailing list if you need this method. Internal HBase code should use
    *             {@link ClientTokenUtil} instead.
    */
   @Deprecated
@@ -82,8 +82,8 @@ public static Token<AuthenticationTokenIdentifier> obtainToken(Connection conn)
 
   /**
    * See {@link ClientTokenUtil#toToken(Token)}.
-   * @deprecated External users should not use this method. Please post on the HBase dev mailing
-   *             list if you need this method. Internal HBase code should use
+   * @deprecated External users should not use this method, will be removed in 4.0.0. Please post on
+   *             the HBase dev mailing list if you need this method. Internal HBase code should use
    *             {@link ClientTokenUtil} instead.
    */
   @Deprecated
@@ -93,8 +93,8 @@ public static AuthenticationProtos.Token toToken(Token<AuthenticationTokenIdenti
 
   /**
    * See {@link ClientTokenUtil#obtainToken(Connection, User)}.
-   * @deprecated External users should not use this method. Please post on the HBase dev mailing
-   *             list if you need this method. Internal HBase code should use
+   * @deprecated External users should not use this method, will be removed in 4.0.0. Please post on
+   *             the HBase dev mailing list if you need this method. Internal HBase code should use
    *             {@link ClientTokenUtil} instead.
    */
   @Deprecated
@@ -114,8 +114,8 @@ public static void obtainAndCacheToken(final Connection conn, User user)
   /**
    * See
    * {@link ClientTokenUtil#toToken(org.apache.hadoop.hbase.shaded.protobuf.generated.AuthenticationProtos.Token)}.
-   * @deprecated External users should not use this method. Please post on the HBase dev mailing
-   *             list if you need this method. Internal HBase code should use
+   * @deprecated External users should not use this method, will be removed in 4.0.0. Please post on
+   *             the HBase dev mailing list if you need this method. Internal HBase code should use
    *             {@link ClientTokenUtil} instead.
    */
   @Deprecated