Remove getAmazonS3ClientForTesting

Author: passaro

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

@@ -1306,21 +1306,6 @@ private AmazonS3 getAmazonS3Client() {
     return s3;
   }
 
-  /**
-   * Returns the S3 client used by this filesystem.
-   * <i>Warning: this must only be used for testing, as it bypasses core
-   * S3A operations. </i>
-   * @param reason a justification for requesting access.
-   * @return AmazonS3Client
-   */
-  // TODO: Remove when we remove S3V1 client
-  @VisibleForTesting
-  public AmazonS3 getAmazonS3ClientForTesting(String reason) {
-    LOG.warn("Access to S3A client requested, reason {}", reason);
-    V2Migration.v1S3ClientRequested();
-    return s3;
-  }
-
   /**
    * Returns the S3 client used by this filesystem.
    * <i>Warning: this must only be used for testing, as it bypasses core

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

@@ -20,8 +20,6 @@
 
 import static org.apache.hadoop.fs.s3a.Constants.*;
 
-import com.amazonaws.services.s3.AmazonS3;
-
 import java.net.URI;
 
 import org.apache.hadoop.conf.Configuration;
@@ -55,7 +53,6 @@ public abstract class AbstractS3AMockTest {
   public ExpectedException exception = ExpectedException.none();
 
   protected S3AFileSystem fs;
-  protected AmazonS3 s3;
   protected S3Client s3V2;
 
   @Before
@@ -66,7 +63,6 @@ public void setup() throws Exception {
     // unset S3CSE property from config to avoid pathIOE.
     conf.unset(Constants.S3_ENCRYPTION_ALGORITHM);
     fs.initialize(uri, conf);
-    s3 = fs.getAmazonS3ClientForTesting("mocking");
     s3V2 = fs.getAmazonS3V2ClientForTesting("mocking");
   }