From 7393aa1e8e1fb1aad6737e354b63dfeebf028d70 Mon Sep 17 00:00:00 2001
From: WangXin <1458451310@qq.com>
Date: Fri, 13 Sep 2024 10:34:32 +0800
Subject: [PATCH] HBASE-28825 Add deprecation cycle for methods in TokenUtil
 (#6237)

Co-authored-by: wangxin <wangxin9702@gmail.com>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
(cherry picked from commit 4446d297112899dab59c0952489457c4419366d3)
---
 .../hadoop/hbase/security/token/TokenUtil.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 d1691de5c9be..27fd5c99785f 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
@@ -43,7 +43,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)
@@ -55,8 +55,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
@@ -67,8 +67,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
@@ -78,8 +78,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
@@ -99,8 +99,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