suppress deprecation warnings

Author: ahmarsuhail

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/TemporaryAWSCredentialsProvider.java

@@ -28,7 +28,6 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.auth.AbstractSessionCredentialsProvider;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentialBinding;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentials;
 import org.apache.hadoop.fs.s3a.auth.NoAuthWithAWSException;
@@ -51,7 +50,7 @@
 @InterfaceStability.Stable
 @Deprecated
 public class TemporaryAWSCredentialsProvider extends
-    AbstractSessionCredentialsProvider {
+    org.apache.hadoop.fs.s3a.auth.AbstractSessionCredentialsProvider {
 
   public static final String NAME
       = "org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider";

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/MarshalledCredentialProvider.java

@@ -37,13 +37,9 @@
  * This is <i>not</i> intended for explicit use in job/app configurations,
  * instead it is returned by Delegation Token Bindings, as needed.
  * The constructor implicitly prevents explicit use.
- *
- * @deprecated This class will be replaced by one that implements AWS SDK V2's AwsCredentialProvider
- * as part of upgrading S3A to SDK V2. See HADOOP-18073.
  */
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
-@Deprecated
 public class MarshalledCredentialProvider extends
     AbstractSessionCredentialsProvider {
 

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/RoleTokenBinding.java

@@ -30,7 +30,6 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.Retries;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentialProvider;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentials;
@@ -98,7 +97,7 @@ protected void serviceInit(final Configuration conf) throws Exception {
    */
   @Override
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList bindToTokenIdentifier(
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList bindToTokenIdentifier(
       final AbstractS3ATokenIdentifier retrievedIdentifier)
       throws IOException {
     RoleTokenIdentifier tokenIdentifier =
@@ -108,7 +107,7 @@ public AWSCredentialProviderList bindToTokenIdentifier(
     MarshalledCredentials marshalledCredentials
         = tokenIdentifier.getMarshalledCredentials();
     setExpirationDateTime(marshalledCredentials.getExpirationDateTime());
-    return new AWSCredentialProviderList(
+    return new org.apache.hadoop.fs.s3a.AWSCredentialProviderList(
         "Role Token Binding",
         new MarshalledCredentialProvider(
             COMPONENT,

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/S3ADelegationTokens.java

@@ -33,7 +33,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.auth.RoleModel;
 import org.apache.hadoop.fs.s3a.impl.StoreContext;
 import org.apache.hadoop.fs.s3a.statistics.DelegationTokenStatistics;
@@ -470,7 +469,7 @@ public DelegationTokenIssuer[] getAdditionalTokenIssuers()
    * @throws IllegalStateException if this instance is not bound to a DT
    */
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList getCredentialProviders()
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList getCredentialProviders()
       throws IOException {
     return credentialProviders.orElseThrow(
         () -> new DelegationTokenIOException("Not yet bonded"));

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/ITestS3ATemporaryCredentials.java

@@ -71,6 +71,7 @@ public class ITestS3ATemporaryCredentials extends AbstractS3ATestBase {
   private static final Logger LOG =
       LoggerFactory.getLogger(ITestS3ATemporaryCredentials.class);
 
+  @SuppressWarnings("deprecation")
   private static final String TEMPORARY_AWS_CREDENTIALS
       = TemporaryAWSCredentialsProvider.NAME;
 
@@ -175,6 +176,7 @@ protected String getStsRegion(final Configuration conf) {
   }
 
   @Test
+  @SuppressWarnings("deprecation")
   public void testTemporaryCredentialValidation() throws Throwable {
     Configuration conf = new Configuration();
     conf.set(ACCESS_KEY, "accesskey");

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/S3ATestUtils.java

@@ -607,6 +607,7 @@ public static void unsetHadoopCredentialProviders(final Configuration conf) {
    * @return a set of credentials
    * @throws IOException on a failure
    */
+  @SuppressWarnings("deprecation")
   public static AWSCredentialsProvider buildAwsCredentialsProvider(
       final Configuration conf)
       throws IOException {

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationTokens.java

@@ -32,7 +32,6 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.s3a.S3AEncryptionMethods;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
-import org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentials;
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.Text;
@@ -249,7 +248,7 @@ public void testCreateWithRenewer() throws Throwable {
    * @return the retrieved DT. This is only for error reporting.
    * @throws IOException failure.
    */
-  @SuppressWarnings("OptionalGetWithoutIsPresent")
+  @SuppressWarnings({"OptionalGetWithoutIsPresent", "deprecation"})
   protected AbstractS3ATokenIdentifier verifyCredentialPropagation(
       final S3AFileSystem fs,
       final MarshalledCredentials session,
@@ -260,7 +259,7 @@ protected AbstractS3ATokenIdentifier verifyCredentialPropagation(
     // for authentication.
     unsetHadoopCredentialProviders(conf);
     conf.set(DELEGATION_TOKEN_CREDENTIALS_PROVIDER,
-        TemporaryAWSCredentialsProvider.NAME);
+        org.apache.hadoop.fs.s3a.TemporaryAWSCredentialsProvider.NAME);
     session.setSecretsInConfiguration(conf);
     try(S3ADelegationTokens delegationTokens2 = new S3ADelegationTokens()) {
       delegationTokens2.bindToFileSystem(