Update setAmazonS3Client

Author: passaro

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

@@ -1323,13 +1323,10 @@ public S3Client getAmazonS3V2ClientForTesting(String reason) {
    * Set the client -used in mocking tests to force in a different client.
    * @param client client.
    */
-  protected void setAmazonS3Client(Pair<AmazonS3, S3Client> client) {
-    Preconditions.checkNotNull(client.getLeft(), "client");
-    Preconditions.checkNotNull(client.getRight(), "clientV2");
-    LOG.debug("Setting S3 client to {}", client.getLeft());
-    LOG.debug("Setting S3V2 client to {}", client.getRight());
-    s3 = client.getLeft();
-    s3V2 = client.getRight();
+  protected void setAmazonS3Client(S3Client client) {
+    Preconditions.checkNotNull(client, "clientV2");
+    LOG.debug("Setting S3V2 client to {}", client);
+    s3V2 = client;
 
     // TODO: still relevant in v2?
     // Need to use a new TransferManager that uses the new client.

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

@@ -21,8 +21,6 @@
 import java.io.IOException;
 import java.net.URI;
 
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.services.s3.AmazonS3;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,6 +49,7 @@
 import org.apache.hadoop.util.Progressable;
 
 import software.amazon.awssdk.core.SdkRequest;
+import software.amazon.awssdk.core.exception.SdkException;
 import software.amazon.awssdk.services.s3.S3Client;
 
 import static org.apache.hadoop.fs.s3a.audit.AuditTestSupport.noopAuditor;
@@ -205,7 +204,7 @@ public boolean isMagicCommitEnabled() {
    * @param client client.
    */
   @Override
-  public void setAmazonS3Client(Pair<AmazonS3, S3Client> client) {
+  public void setAmazonS3Client(S3Client client) {
     LOG.debug("Setting S3 client to {}", client);
     super.setAmazonS3Client(client);
   }
@@ -348,13 +347,13 @@ public long getDefaultBlockSize() {
   void deleteObjectAtPath(Path f,
       String key,
       boolean isFile)
-      throws AmazonClientException, IOException {
+      throws SdkException, IOException {
     deleteObject(key);
   }
 
   @Override
   protected void maybeCreateFakeParentDirectory(Path path)
-      throws IOException, AmazonClientException {
+      throws IOException, SdkException {
     // no-op
   }
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/StagingTestBase.java

@@ -29,9 +29,6 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3Client;
-
 import org.apache.hadoop.util.Lists;
 import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
 import org.junit.AfterClass;
@@ -342,7 +339,7 @@ public abstract static class JobCommitterTest<C extends OutputCommitter>
     // created in Before
     private StagingTestBase.ClientResults results = null;
     private StagingTestBase.ClientErrors errors = null;
-    private Pair<AmazonS3, S3Client> mockClient = null;
+    private S3Client mockClient = null;
 
     @Before
     public void setupJob() throws Exception {
@@ -622,9 +619,8 @@ private static<T> T getArgumentAt(InvocationOnMock invocation, int index,
    * @param errors when (if any) to fail
    * @return the mock client to patch in to a committer/FS instance
    */
-  public static Pair<AmazonS3, S3Client> newMockS3Client(final ClientResults results,
+  public static S3Client newMockS3Client(final ClientResults results,
       final ClientErrors errors) {
-    AmazonS3Client mockClient = mock(AmazonS3Client.class);
     S3Client mockClientV2 = mock(S3Client.class);
     final Object lock = new Object();
 
@@ -741,8 +737,6 @@ public static Pair<AmazonS3, S3Client> newMockS3Client(final ClientResults resul
         .deleteObject(any(DeleteObjectRequest.class));
 
     // to String returns the debug information
-    when(mockClient.toString()).thenAnswer(
-        invocation -> "Mock3AClient " + results + " " + errors);
     when(mockClientV2.toString()).thenAnswer(
         invocation -> "Mock3AClient " + results + " " + errors);
 
@@ -761,7 +755,7 @@ public static Pair<AmazonS3, S3Client> newMockS3Client(final ClientResults resul
           }
         });
 
-    return Pair.of(mockClient, mockClientV2);
+    return mockClientV2;
   }
 
   /**

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/staging/TestStagingCommitter.java

@@ -113,7 +113,7 @@ public class TestStagingCommitter extends StagingTestBase.MiniDFSTest {
   // created in Before
   private StagingTestBase.ClientResults results = null;
   private StagingTestBase.ClientErrors errors = null;
-  private Pair<AmazonS3, S3Client> mockClient = null;
+  private S3Client mockClient = null;
   private File tmpDir;
 
   /**