Merge pull request apache#18 from passaro/HADOOP-18073-v2/cleanup

Hadoop 18073: Cleanup

Author: passaro

hadoop-project/pom.xml

@@ -186,7 +186,7 @@
     <surefire.fork.timeout>900</surefire.fork.timeout>
     <aws-java-sdk.version>1.12.262</aws-java-sdk.version>
     <hsqldb.version>2.5.2</hsqldb.version>
-    <aws-java-sdk-v2.version>2.17.196</aws-java-sdk-v2.version>
+    <aws-java-sdk-v2.version>2.18.19</aws-java-sdk-v2.version>
     <frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>
     <jasmine-maven-plugin.version>2.1</jasmine-maven-plugin.version>
     <phantomjs-maven-plugin.version>0.7</phantomjs-maven-plugin.version>
@@ -1131,7 +1131,13 @@
       <dependency>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>s3-transfer-manager</artifactId>
-        <version>2.17.196-PREVIEW</version>
+        <version>${aws-java-sdk-v2.version}-PREVIEW</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.mina</groupId>

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

@@ -20,7 +20,7 @@
 
 import javax.annotation.Nonnull;
 
-import com.amazonaws.arn.Arn;
+import software.amazon.awssdk.arns.Arn;
 
 /**
  * Represents an Arn Resource, this can be an accesspoint or bucket.
@@ -120,14 +120,14 @@ public String getEndpoint() {
   public static ArnResource accessPointFromArn(String arn) throws IllegalArgumentException {
     Arn parsed = Arn.fromString(arn);
 
-    if (parsed.getRegion().isEmpty() || parsed.getAccountId().isEmpty() ||
-        parsed.getResourceAsString().isEmpty()) {
+    if (!parsed.region().isPresent() || !parsed.accountId().isPresent() ||
+        parsed.resourceAsString().isEmpty()) {
       throw new IllegalArgumentException(
           String.format("Access Point Arn %s has an invalid format or missing properties", arn));
     }
 
-    String resourceName = parsed.getResource().getResource();
-    return new ArnResource(resourceName, parsed.getAccountId(), parsed.getRegion(),
-        parsed.getPartition(), arn);
+    String resourceName = parsed.resource().resource();
+    return new ArnResource(resourceName, parsed.accountId().get(), parsed.region().get(),
+        parsed.partition(), arn);
   }
 }

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

@@ -231,7 +231,7 @@ public S3AsyncClient createS3AsyncClient(
    * @param <BuilderT> S3 client builder type
    * @param <ClientT> S3 client type
    */
-  private static <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT>
+  private <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT>
   BuilderT configureClientBuilder(
       BuilderT builder,
       S3ClientCreationParameters parameters,
@@ -265,7 +265,7 @@ BuilderT configureClientBuilder(
    * @param conf configuration object
    * @return the override configuration
    */
-  private static ClientOverrideConfiguration createClientOverrideConfiguration(
+  protected ClientOverrideConfiguration createClientOverrideConfiguration(
       S3ClientCreationParameters parameters, Configuration conf) {
     final ClientOverrideConfiguration.Builder clientOverrideConfigBuilder =
         AWSClientConfig.createClientConfigBuilder(conf);

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

@@ -36,7 +36,7 @@ public class FailureInjectionPolicy {
   public static final String DEFAULT_DELAY_KEY_SUBSTRING = "DELAY_LISTING_ME";
 
   private static final Logger LOG =
-      LoggerFactory.getLogger(InconsistentAmazonS3Client.class);
+      LoggerFactory.getLogger(FailureInjectionPolicy.class);
 
   /**
    * Probability of throttling a request.