From c43c763151369f3c7d98c706c405e7c55fea61cf Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Wed, 24 Jul 2013 22:31:31 +0000
Subject: [PATCH] MAPREDUCE-5213. Re-assess TokenCache methods marked @Private.
 (kkambatl via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1506758 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt               |  3 +++
 .../hadoop/mapreduce/security/TokenCache.java      | 14 +++++++++++---
 .../hadoop/mapreduce/security/TestTokenCache.java  |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1ede6cf4a2d..7e4d7adc82f 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -654,6 +654,9 @@ Release 2.1.0-beta - 2013-07-02
     MAPREDUCE-5310. MRAM should not normalize allocation request capabilities.
     (tucu)
 
+    MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. 
+    (kkambatl via tucu)
+
 Release 2.0.5-alpha - 06/06/2013
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
index 47421f246fe..cadd04b5634 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/TokenCache.java
@@ -159,11 +159,14 @@ public class TokenCache {
   
   /**
    * load job token from a file
+   * @deprecated Use {@link Credentials#readTokenStorageFile} instead,
+   * this method is included for compatibility against Hadoop-1.
    * @param conf
    * @throws IOException
    */
   @InterfaceAudience.Private
-  public static Credentials loadTokens(String jobTokenFile, JobConf conf) 
+  @Deprecated
+  public static Credentials loadTokens(String jobTokenFile, JobConf conf)
   throws IOException {
     Path localJobTokenFile = new Path ("file:///" + jobTokenFile);
 
@@ -180,11 +183,13 @@ public class TokenCache {
   
   /**
    * load job token from a file
-   * 
+   * @deprecated Use {@link Credentials#readTokenStorageFile} instead,
+   * this method is included for compatibility against Hadoop-1.
    * @param conf
    * @throws IOException
    */
   @InterfaceAudience.Private
+  @Deprecated
   public static Credentials loadTokens(String jobTokenFile, Configuration conf)
       throws IOException {
     return loadTokens(jobTokenFile, new JobConf(conf));
@@ -220,10 +225,13 @@ public class TokenCache {
   }
 
   /**
-   * 
+   * @deprecated Use {@link Credentials#getToken(org.apache.hadoop.io.Text)}
+   * instead, this method is included for compatibility against Hadoop-1
    * @param namenode
    * @return delegation token
    */
+  @InterfaceAudience.Private
+  @Deprecated
   public static
       Token<?> getDelegationToken(
           Credentials credentials, String namenode) {
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
index 14af7aa214d..de594d405e3 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/security/TestTokenCache.java
@@ -170,6 +170,7 @@ public class TestTokenCache {
     assertNull(conf.get(MRJobConfig.MAPREDUCE_JOB_CREDENTIALS_BINARY));
   }
   
+  @SuppressWarnings("deprecation")
   @Test
   public void testGetTokensForNamenodes() throws IOException,
       URISyntaxException {