fixes more deprecation warnings

ahmarsuhail · ahmarsuhail · commit 5f81bceaaf0b · 2022-08-10T10:50:38.000+01:00
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/Constants.java
@@ -140,6 +140,7 @@ private Constants() {
   public static final String ASSUMED_ROLE_POLICY =
       "fs.s3a.assumed.role.policy";
 
+  @SuppressWarnings("deprecation")
   public static final String ASSUMED_ROLE_CREDENTIALS_DEFAULT =
       SimpleAWSCredentialsProvider.NAME;
 
@@ -732,6 +733,7 @@ private Constants() {
 
   @InterfaceAudience.Private
   @InterfaceStability.Unstable
+  @SuppressWarnings("deprecation")
   public static final Class<? extends S3ClientFactory>
       DEFAULT_S3_CLIENT_FACTORY_IMPL =
           DefaultS3ClientFactory.class;
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AUtils.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/S3AUtils.java
@@ -45,7 +45,6 @@
 import org.apache.hadoop.fs.RemoteIterator;
 import org.apache.hadoop.util.functional.RemoteIterators;
 import org.apache.hadoop.fs.s3a.auth.delegation.EncryptionSecrets;
-import org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider;
 import org.apache.hadoop.fs.s3a.impl.NetworkBinding;
 import org.apache.hadoop.fs.s3native.S3xLoginHelper;
 import org.apache.hadoop.net.ConnectTimeoutException;
@@ -565,7 +564,7 @@ public static long dateToLong(final Date date) {
           TemporaryAWSCredentialsProvider.class,
           SimpleAWSCredentialsProvider.class,
           EnvironmentVariableCredentialsProvider.class,
-          IAMInstanceCredentialsProvider.class));
+          org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider.class));
 
   /**
    * Create the AWS credentials from the providers, the URI and
@@ -624,6 +623,7 @@ public static List<Class<?>> loadAWSProviderClasses(Configuration conf,
    * @return the list of classes, possibly empty
    * @throws IOException on a failure to load the list.
    */
+  @SuppressWarnings("deprecation")
   public static AWSCredentialProviderList buildAWSProviderList(
       @Nullable final URI binding,
       final Configuration conf,
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/SharedInstanceCredentialProvider.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/SharedInstanceCredentialProvider.java
@@ -20,13 +20,12 @@
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider;
 import org.apache.hadoop.fs.s3a.auth.NoAwsCredentialsException;
 
 /**
  * This credential provider has jittered between existing and non-existing,
  * but it turns up in documentation enough that it has been restored.
- * It extends {@link IAMInstanceCredentialsProvider} to pick up its
+ * It extends {@link org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider} to pick up its
  * bindings, which are currently to use the
  * {@code EC2ContainerCredentialsProviderWrapper} class for IAM and container
  * authentication.
@@ -41,5 +40,5 @@
 @InterfaceStability.Evolving
 @SuppressWarnings("deprecation")
 public final class SharedInstanceCredentialProvider extends
-    IAMInstanceCredentialsProvider {
+    org.apache.hadoop.fs.s3a.auth.IAMInstanceCredentialsProvider {
 }
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/TemporaryAWSCredentialsProvider.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/TemporaryAWSCredentialsProvider.java
@@ -43,9 +43,13 @@
  *
  * This credential provider must not fail in creation because that will
  * break a chain of credential providers.
+ *
+ * @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.Public
 @InterfaceStability.Stable
+@Deprecated
 public class TemporaryAWSCredentialsProvider extends
     AbstractSessionCredentialsProvider {
 
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/AbstractSessionCredentialsProvider.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/AbstractSessionCredentialsProvider.java
@@ -35,9 +35,12 @@
 
 /**
  * Base class for session credential support.
+ *
+ * @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
-@SuppressWarnings("deprecation")
+@Deprecated
 public abstract class AbstractSessionCredentialsProvider
     extends AbstractAWSCredentialProvider {
 
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/AssumedRoleCredentialProvider.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/AssumedRoleCredentialProvider.java
@@ -41,13 +41,11 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.CredentialInitializationException;
 import org.apache.hadoop.fs.s3a.Retries;
 import org.apache.hadoop.fs.s3a.S3AUtils;
 import org.apache.hadoop.fs.s3a.Invoker;
 import org.apache.hadoop.fs.s3a.S3ARetryPolicy;
-import org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider;
 import org.apache.hadoop.security.UserGroupInformation;
 
 import static org.apache.hadoop.fs.s3a.Constants.*;
@@ -86,7 +84,7 @@ public class AssumedRoleCredentialProvider implements AWSCredentialsProvider,
 
   private final String arn;
 
-  private final AWSCredentialProviderList credentialsToSTS;
+  private final org.apache.hadoop.fs.s3a.AWSCredentialProviderList credentialsToSTS;
 
   private final Invoker invoker;
 
@@ -112,7 +110,7 @@ public AssumedRoleCredentialProvider(@Nullable URI fsUri, Configuration conf)
     credentialsToSTS = buildAWSProviderList(fsUri, conf,
         ASSUMED_ROLE_CREDENTIALS_PROVIDER,
         Arrays.asList(
-            SimpleAWSCredentialsProvider.class,
+            org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider.class,
             EnvironmentVariableCredentialsProvider.class),
         Sets.newHashSet(this.getClass()));
     LOG.debug("Credentials to obtain role credentials: {}", credentialsToSTS);
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/MarshalledCredentialProvider.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/MarshalledCredentialProvider.java
@@ -37,9 +37,13 @@
  * 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 {
 
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/AbstractDelegationTokenBinding.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/AbstractDelegationTokenBinding.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 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.io.Text;
 import org.apache.hadoop.security.token.SecretManager;
@@ -206,7 +205,7 @@ protected <T extends AbstractS3ATokenIdentifier> T convertTokenIdentifier(
    * @throws IOException any failure.
    */
   @SuppressWarnings("deprecation")
-  public abstract AWSCredentialProviderList deployUnbonded()
+  public abstract org.apache.hadoop.fs.s3a.AWSCredentialProviderList deployUnbonded()
       throws IOException;
 
   /**
@@ -218,7 +217,7 @@ public abstract AWSCredentialProviderList deployUnbonded()
    * @throws IOException any failure.
    */
   @SuppressWarnings("deprecation")
-  public abstract AWSCredentialProviderList bindToTokenIdentifier(
+  public abstract org.apache.hadoop.fs.s3a.AWSCredentialProviderList bindToTokenIdentifier(
       AbstractS3ATokenIdentifier retrievedIdentifier)
       throws IOException;
 
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/FullCredentialsTokenBinding.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/FullCredentialsTokenBinding.java
@@ -25,7 +25,6 @@
 import org.apache.hadoop.util.Preconditions;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.S3AUtils;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentialBinding;
 import org.apache.hadoop.fs.s3a.auth.MarshalledCredentialProvider;
@@ -116,10 +115,10 @@ private void loadAWSCredentials() throws IOException {
    */
   @Override
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList deployUnbonded() throws IOException {
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList deployUnbonded() throws IOException {
     requireServiceStarted();
     loadAWSCredentials();
-    return new AWSCredentialProviderList(
+    return new org.apache.hadoop.fs.s3a.AWSCredentialProviderList(
         "Full Credentials Token Binding",
         new MarshalledCredentialProvider(
             FULL_TOKEN,
@@ -157,13 +156,13 @@ public AbstractS3ATokenIdentifier createTokenIdentifier(
 
   @Override
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList bindToTokenIdentifier(
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList bindToTokenIdentifier(
       final AbstractS3ATokenIdentifier retrievedIdentifier)
       throws IOException {
     FullCredentialsTokenIdentifier tokenIdentifier =
         convertTokenIdentifier(retrievedIdentifier,
             FullCredentialsTokenIdentifier.class);
-    return new AWSCredentialProviderList(
+    return new org.apache.hadoop.fs.s3a.AWSCredentialProviderList(
         "Full Credentials Token Binding",
         new MarshalledCredentialProvider(
             FULL_TOKEN,
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/S3ADelegationTokens.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/S3ADelegationTokens.java
@@ -124,7 +124,7 @@ public class S3ADelegationTokens extends AbstractDTService {
    * List of cred providers; unset until {@link #bindToDelegationToken(Token)}.
    */
   @SuppressWarnings("deprecation")
-  private Optional<AWSCredentialProviderList> credentialProviders
+  private Optional<org.apache.hadoop.fs.s3a.AWSCredentialProviderList> credentialProviders
       = Optional.empty();
 
   /**
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/SessionTokenBinding.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/auth/delegation/SessionTokenBinding.java
@@ -35,7 +35,6 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.Constants;
 import org.apache.hadoop.fs.s3a.Invoker;
 import org.apache.hadoop.fs.s3a.Retries;
@@ -108,7 +107,7 @@ public class SessionTokenBinding extends AbstractDelegationTokenBinding {
    * The auth chain for the parent options.
    */
   @SuppressWarnings("deprecation")
-  private AWSCredentialProviderList parentAuthChain;
+  private org.apache.hadoop.fs.s3a.AWSCredentialProviderList parentAuthChain;
 
   /**
    * Has a log message about forwarding credentials been printed yet?
@@ -191,7 +190,7 @@ protected void serviceStop() throws Exception {
    */
   @Override
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList deployUnbonded()
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList deployUnbonded()
       throws IOException {
     requireServiceStarted();
     return parentAuthChain;
@@ -215,7 +214,7 @@ protected Invoker getInvoker() {
    */
   @Override
   @SuppressWarnings("deprecation")
-  public AWSCredentialProviderList bindToTokenIdentifier(
+  public org.apache.hadoop.fs.s3a.AWSCredentialProviderList bindToTokenIdentifier(
       final AbstractS3ATokenIdentifier retrievedIdentifier)
       throws IOException {
     final SessionTokenIdentifier identifier = convertTokenIdentifier(
@@ -225,7 +224,7 @@ public AWSCredentialProviderList bindToTokenIdentifier(
     MarshalledCredentials marshalledCredentials
         = identifier.getMarshalledCredentials();
     setExpirationDateTime(marshalledCredentials.getExpirationDateTime());
-    return new AWSCredentialProviderList(
+    return new org.apache.hadoop.fs.s3a.AWSCredentialProviderList(
         "Session Token Binding",
         new MarshalledCredentialProvider(
             SESSION_TOKEN,
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractS3AMockTest.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/AbstractS3AMockTest.java
@@ -62,6 +62,7 @@ public void setup() throws Exception {
     s3 = fs.getAmazonS3ClientForTesting("mocking");
   }
 
+  @SuppressWarnings("deprecation")
   public Configuration createConfiguration() {
     Configuration conf = new Configuration();
     conf.setClass(S3_CLIENT_FACTORY_IMPL, MockS3ClientFactory.class,
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/MockS3ClientFactory.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/MockS3ClientFactory.java
@@ -31,6 +31,7 @@
  * An {@link S3ClientFactory} that returns Mockito mocks of the {@link AmazonS3}
  * interface suitable for unit testing.
  */
+@SuppressWarnings("deprecation")
 public class MockS3ClientFactory implements S3ClientFactory {
 
   @Override
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AAWSCredentialsProvider.java
@@ -37,7 +37,6 @@
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.s3a.auth.AssumedRoleCredentialProvider;
 import org.apache.hadoop.fs.s3a.auth.NoAuthWithAWSException;
 import org.apache.hadoop.io.retry.RetryPolicy;
 
@@ -377,12 +376,13 @@ private static void assertCredentialProviders(
   @SuppressWarnings("deprecation")
   public void testAuthenticationContainsProbes() {
     Configuration conf = new Configuration(false);
-    assertFalse("found AssumedRoleCredentialProvider",
-        authenticationContains(conf, AssumedRoleCredentialProvider.NAME));
+    assertFalse("found AssumedRoleCredentialProvider", authenticationContains(conf,
+        org.apache.hadoop.fs.s3a.auth.AssumedRoleCredentialProvider.NAME));
 
-    conf.set(AWS_CREDENTIALS_PROVIDER, AssumedRoleCredentialProvider.NAME);
-    assertTrue("didn't find AssumedRoleCredentialProvider",
-        authenticationContains(conf, AssumedRoleCredentialProvider.NAME));
+    conf.set(AWS_CREDENTIALS_PROVIDER,
+        org.apache.hadoop.fs.s3a.auth.AssumedRoleCredentialProvider.NAME);
+    assertTrue("didn't find AssumedRoleCredentialProvider", authenticationContains(conf,
+        org.apache.hadoop.fs.s3a.auth.AssumedRoleCredentialProvider.NAME));
   }
 
   @Test
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/ITestAssumeRole.java
@@ -45,7 +45,6 @@
 import org.apache.hadoop.fs.s3a.MultipartUtils;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.fs.s3a.S3ATestConstants;
-import org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider;
 import org.apache.hadoop.fs.s3a.commit.CommitConstants;
 import org.apache.hadoop.fs.s3a.commit.files.PendingSet;
 import org.apache.hadoop.fs.s3a.commit.files.SinglePendingCommit;
@@ -258,7 +257,7 @@ public void testAssumeRoleBadInnerAuth() throws Exception {
     Configuration conf = createAssumedRoleConfig();
     unsetHadoopCredentialProviders(conf);
     conf.set(ASSUMED_ROLE_CREDENTIALS_PROVIDER,
-        SimpleAWSCredentialsProvider.NAME);
+        org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider.NAME);
     conf.set(ACCESS_KEY, "not valid");
     conf.set(SECRET_KEY, "not secret");
     expectFileSystemCreateFailure(conf,
@@ -275,7 +274,7 @@ public void testAssumeRoleBadInnerAuth2() throws Exception {
     Configuration conf = createAssumedRoleConfig();
     unsetHadoopCredentialProviders(conf);
     conf.set(ASSUMED_ROLE_CREDENTIALS_PROVIDER,
-        SimpleAWSCredentialsProvider.NAME);
+        org.apache.hadoop.fs.s3a.SimpleAWSCredentialsProvider.NAME);
     conf.set(ACCESS_KEY, "notvalid");
     conf.set(SECRET_KEY, "notsecret");
     expectFileSystemCreateFailure(conf,
@@ -539,6 +538,7 @@ public Path methodPath() throws IOException {
    * don't break.
    */
   @Test
+  @SuppressWarnings("deprecation")
   public void testAssumedRoleRetryHandler() throws Throwable {
     try(AssumedRoleCredentialProvider provider
             = new AssumedRoleCredentialProvider(getFileSystem().getUri(),
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/auth/delegation/ITestSessionDelegationInFileystem.java
@@ -38,13 +38,11 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.contract.ContractTestUtils;
-import org.apache.hadoop.fs.s3a.AWSCredentialProviderList;
 import org.apache.hadoop.fs.s3a.Constants;
 import org.apache.hadoop.fs.s3a.DefaultS3ClientFactory;
 import org.apache.hadoop.fs.s3a.Invoker;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
 import org.apache.hadoop.fs.s3a.S3ATestUtils;
-import org.apache.hadoop.fs.s3a.S3ClientFactory;
 import org.apache.hadoop.fs.s3a.Statistic;
 import org.apache.hadoop.fs.s3a.statistics.impl.EmptyS3AStatisticsContext;
 import org.apache.hadoop.hdfs.tools.DelegationTokenFetcher;
@@ -273,7 +271,7 @@ public void testAddTokensFromFileSystem() throws Throwable {
         (Token<AbstractS3ATokenIdentifier>) retrieved);
     assertTrue("bind to existing DT failed",
         delegationTokens.isBoundToDT());
-    AWSCredentialProviderList providerList = requireNonNull(
+    org.apache.hadoop.fs.s3a.AWSCredentialProviderList providerList = requireNonNull(
         delegationTokens.getCredentialProviders(), "providers");
 
     providerList.getCredentials();
@@ -580,16 +578,16 @@ public void testDelegationBindingMismatch2() throws Throwable {
   @SuppressWarnings("deprecation")
   protected ObjectMetadata readLandsatMetadata(final S3AFileSystem delegatedFS)
       throws Exception {
-    AWSCredentialProviderList testingCreds
+    org.apache.hadoop.fs.s3a.AWSCredentialProviderList testingCreds
         = delegatedFS.shareCredentials("testing");
 
     URI landsat = new URI(DEFAULT_CSVTEST_FILE);
     DefaultS3ClientFactory factory
         = new DefaultS3ClientFactory();
     factory.setConf(new Configuration(delegatedFS.getConf()));
     String host = landsat.getHost();
-    S3ClientFactory.S3ClientCreationParameters parameters = null;
-    parameters = new S3ClientFactory.S3ClientCreationParameters()
+    org.apache.hadoop.fs.s3a.S3ClientFactory.S3ClientCreationParameters parameters = null;
+    parameters = new org.apache.hadoop.fs.s3a.S3ClientFactory.S3ClientCreationParameters()
         .withCredentialSet(testingCreds)
         .withPathUri(new URI("s3a://localhost/"))
         .withEndpoint(DEFAULT_ENDPOINT)
