Rename module and package for transfermanager

Author: zoewangg

pom.xml

@@ -535,7 +535,7 @@
                             <excludeModule>s3-benchmarks</excludeModule>
                             <!-- ignore crt because it's in preview TODO: remove this when CRT is GA -->
                             <excludModeule>aws-crt-client</excludModeule>
-                            <excludModeule>s3-transfermanager</excludModeule>
+                            <excludModeule>s3-transfer-manager</excludModeule>
                         </excludeModules>
                         <ignoreMissingOldVersion>true</ignoreMissingOldVersion>
                         <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>

services-custom/pom.xml

@@ -29,7 +29,7 @@
 
     <modules>
         <module>dynamodb-enhanced</module>
-        <module>s3-transfermanager</module>
+        <module>s3-transfer-manager</module>
     </modules>
 
     <dependencyManagement>

services-custom/s3-transfermanager/pom.xml renamed to services-custom/s3-transfer-manager/pom.xml

@@ -24,7 +24,7 @@
         <version>2.16.80-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <artifactId>s3-transfermanager</artifactId>
+    <artifactId>s3-transfer-manager</artifactId>
     <version>${awsjavasdk.version}-PREVIEW</version>
     <name>AWS Java SDK :: S3 :: Transfer Manager</name>
     <description>

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3CrtClientPutObjectIntegrationTest.java renamed to services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3CrtClientPutObjectIntegrationTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 
@@ -38,8 +38,8 @@
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
-import software.amazon.awssdk.custom.s3.transfer.internal.S3CrtAsyncClient;
-import software.amazon.awssdk.custom.s3.transfer.util.ChecksumUtils;
+import software.amazon.awssdk.transfer.s3.internal.S3CrtAsyncClient;
+import software.amazon.awssdk.transfer.s3.util.ChecksumUtils;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.testutils.RandomTempFile;
 

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3CrtGetObjectIntegrationTest.java renamed to services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3CrtGetObjectIntegrationTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
@@ -29,7 +29,7 @@
 import org.junit.Test;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.custom.s3.transfer.internal.S3CrtAsyncClient;
+import software.amazon.awssdk.transfer.s3.internal.S3CrtAsyncClient;
 import software.amazon.awssdk.http.async.SimpleSubscriber;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3IntegrationTestBase.java renamed to services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import org.junit.BeforeClass;
 import software.amazon.awssdk.regions.Region;

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3TransferManagerDownloadIntegrationTest.java renamed to services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerDownloadIntegrationTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -25,7 +25,6 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import software.amazon.awssdk.custom.s3.transfer.internal.S3CrtAsyncClient;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.testutils.RandomTempFile;
 import software.amazon.awssdk.utils.Md5Utils;

services-custom/s3-transfermanager/src/it/java/software/amazon/awssdk/custom/s3/transfer/S3TransferManagerUploadIntegrationTest.java renamed to services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerUploadIntegrationTest.java

@@ -13,20 +13,18 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.security.NoSuchAlgorithmException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import software.amazon.awssdk.core.ResponseInputStream;
 import software.amazon.awssdk.core.sync.ResponseTransformer;
-import software.amazon.awssdk.custom.s3.transfer.util.ChecksumUtils;
-import software.amazon.awssdk.custom.s3.transfer.internal.S3CrtAsyncClient;
+import software.amazon.awssdk.transfer.s3.util.ChecksumUtils;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.testutils.RandomTempFile;
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/CompletedDownload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedDownload.java

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.custom.s3.transfer.internal.S3CrtAsyncClient;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.transfer.s3.internal.S3CrtAsyncClient;
 
 /**
  * A completed download transfer.

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/CompletedDownloadDirectory.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedDownloadDirectory.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/CompletedTransfer.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedTransfer.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/CompletedUpload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedUpload.java

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.custom.s3.transfer.internal.DefaultCompletedUpload;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.transfer.s3.internal.DefaultCompletedUpload;
 
 /**
  * A completed upload transfer.

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/CompletedUploadDirectory.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedUploadDirectory.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/Download.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/Download.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/DownloadDirectory.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/DownloadDirectory.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/DownloadRequest.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/DownloadRequest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.nio.file.Path;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/S3ClientConfiguration.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/S3ClientConfiguration.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkPreviewApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/S3TransferManager.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/S3TransferManager.java

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.function.Consumer;
 import software.amazon.awssdk.annotations.SdkPublicApi;
-import software.amazon.awssdk.custom.s3.transfer.internal.DefaultS3TransferManager;
+import software.amazon.awssdk.transfer.s3.internal.DefaultS3TransferManager;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 
 /**

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/SizeConstant.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/SizeConstant.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/Transfer.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/Transfer.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/TransferRequest.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/TransferRequest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import software.amazon.awssdk.annotations.SdkPublicApi;
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/Upload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/Upload.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/UploadDirectory.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/UploadDirectory.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/UploadRequest.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/UploadRequest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer;
+package software.amazon.awssdk.transfer.s3;
 
 import java.nio.file.Path;
 import software.amazon.awssdk.annotations.SdkPublicApi;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/CrtResponseDataConsumerAdapter.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/CrtResponseDataConsumerAdapter.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import com.amazonaws.s3.ResponseDataConsumer;
 import com.amazonaws.s3.model.GetObjectOutput;

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultCompletedDownload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultCompletedDownload.java

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.custom.s3.transfer.CompletedDownload;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.transfer.s3.CompletedDownload;
 
 @SdkInternalApi
 public final class DefaultCompletedDownload implements CompletedDownload {

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultCompletedUpload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultCompletedUpload.java

@@ -13,11 +13,11 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.custom.s3.transfer.CompletedUpload;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.transfer.s3.CompletedUpload;
 
 @SdkInternalApi
 public final class DefaultCompletedUpload implements CompletedUpload {

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultDownload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultDownload.java

@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.custom.s3.transfer.CompletedDownload;
-import software.amazon.awssdk.custom.s3.transfer.Download;
+import software.amazon.awssdk.transfer.s3.CompletedDownload;
+import software.amazon.awssdk.transfer.s3.Download;
 
 //TODO: should we flatten it?
 @SdkInternalApi

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultS3CrtAsyncClient.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultS3CrtAsyncClient.java

@@ -13,11 +13,9 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 
-import static software.amazon.awssdk.custom.s3.transfer.internal.S3CrtUtils.createCrtCredentialsProvider;
-
 import com.amazonaws.s3.RequestDataSupplier;
 import com.amazonaws.s3.S3NativeClient;
 import com.amazonaws.s3.model.PutObjectOutput;
@@ -47,7 +45,7 @@ public DefaultS3CrtAsyncClient(DefaultS3CrtClientBuilder builder) {
         }
 
         if (builder.credentialsProvider() != null) {
-            configBuilder.credentialsProvider(createCrtCredentialsProvider(builder.credentialsProvider()));
+            configBuilder.credentialsProvider(S3CrtUtils.createCrtCredentialsProvider(builder.credentialsProvider()));
         }
         configuration = configBuilder.build();
 

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultS3TransferManager.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultS3TransferManager.java

@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
-import software.amazon.awssdk.custom.s3.transfer.CompletedUpload;
-import software.amazon.awssdk.custom.s3.transfer.Download;
-import software.amazon.awssdk.custom.s3.transfer.DownloadRequest;
-import software.amazon.awssdk.custom.s3.transfer.S3ClientConfiguration;
-import software.amazon.awssdk.custom.s3.transfer.S3TransferManager;
-import software.amazon.awssdk.custom.s3.transfer.Upload;
-import software.amazon.awssdk.custom.s3.transfer.UploadRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.transfer.s3.CompletedUpload;
+import software.amazon.awssdk.transfer.s3.Download;
+import software.amazon.awssdk.transfer.s3.DownloadRequest;
+import software.amazon.awssdk.transfer.s3.S3ClientConfiguration;
+import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.Upload;
+import software.amazon.awssdk.transfer.s3.UploadRequest;
 
 @SdkInternalApi
 public final class DefaultS3TransferManager implements S3TransferManager {

services-custom/s3-transfermanager/src/main/java/software/amazon/awssdk/custom/s3/transfer/internal/DefaultUpload.java renamed to services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultUpload.java

@@ -13,12 +13,12 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.awssdk.custom.s3.transfer.internal;
+package software.amazon.awssdk.transfer.s3.internal;
 
 import java.util.concurrent.CompletableFuture;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.custom.s3.transfer.CompletedUpload;
-import software.amazon.awssdk.custom.s3.transfer.Upload;
+import software.amazon.awssdk.transfer.s3.CompletedUpload;
+import software.amazon.awssdk.transfer.s3.Upload;
 
 @SdkInternalApi
 public final class DefaultUpload implements Upload {