Migration tool CompleteMpuRequest transform

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java

@@ -15,6 +15,7 @@
 
 package foo.bar;
 
+import java.util.ArrayList;
 import java.util.List;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
@@ -25,6 +26,8 @@
 import software.amazon.awssdk.services.s3.model.BucketLifecycleConfiguration;
 import software.amazon.awssdk.services.s3.model.CORSConfiguration;
 import software.amazon.awssdk.services.s3.model.CORSRule;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
 import software.amazon.awssdk.services.s3.model.CompletedPart;
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.CreateBucketConfiguration;
@@ -143,6 +146,21 @@ private void initiateMpu_to_createMpu(S3Client s3, String bucket, String key) {
         System.out.println(initiateMultipartUploadResult);
     }
 
+    private void completeMpu(S3Client s3, String bucket, String key) {
+        CompletedPart partETag = CompletedPart.builder().partNumber(7).eTag("etag")
+            .build();
+        List<CompletedPart> partETags = new ArrayList<>();
+        partETags.add(partETag);
+
+        CompleteMultipartUploadRequest completeMpuRequest1 =
+            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build())
+            .build();
+
+        CompleteMultipartUploadRequest completeMpuRequest2 =
+            CompleteMultipartUploadRequest.builder().bucket(bucket).key(key).uploadId("uploadId").multipartUpload(CompletedMultipartUpload.builder().parts(partETags).build())
+                .build();
+    }
+
     private void listObjects(S3Client s3, String bucket) {
         ListObjectsRequest listObjectsRequest = ListObjectsRequest.builder().bucket(bucket)
             .build();
@@ -323,8 +341,6 @@ private void pojosWithConstructorArgs(String bucket) {
         PutBucketWebsiteRequest websiteRequest = PutBucketWebsiteRequest.builder().bucket(bucket).websiteConfiguration(WebsiteConfiguration.builder()
             .build())
             .build();
-        CompletedPart partETag = CompletedPart.builder().partNumber(7).eTag("etag")
-            .build();
     }
 
     private void setBucketConfigs(S3Client s3, String bucket) {

test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3.java

@@ -27,6 +27,7 @@
 import com.amazonaws.services.s3.model.BucketTaggingConfiguration;
 import com.amazonaws.services.s3.model.BucketWebsiteConfiguration;
 import com.amazonaws.services.s3.model.CORSRule;
+import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
 import com.amazonaws.services.s3.model.CopyPartRequest;
 import com.amazonaws.services.s3.model.CopyPartResult;
 import com.amazonaws.services.s3.model.CreateBucketRequest;
@@ -55,6 +56,7 @@
 import com.amazonaws.services.s3.model.inventory.InventoryConfiguration;
 import com.amazonaws.services.s3.model.metrics.MetricsConfiguration;
 import com.amazonaws.services.s3.model.ownership.OwnershipControls;
+import java.util.ArrayList;
 import java.util.List;
 
 public class S3 {
@@ -91,6 +93,18 @@ private void initiateMpu_to_createMpu(AmazonS3 s3, String bucket, String key) {
         System.out.println(initiateMultipartUploadResult);
     }
 
+    private void completeMpu(AmazonS3 s3, String bucket, String key) {
+        PartETag partETag = new PartETag(7, "etag");
+        List<PartETag> partETags = new ArrayList<>();
+        partETags.add(partETag);
+
+        CompleteMultipartUploadRequest completeMpuRequest1 =
+            new CompleteMultipartUploadRequest().withBucketName(bucket).withKey(key).withPartETags(partETags);
+
+        CompleteMultipartUploadRequest completeMpuRequest2 =
+            new CompleteMultipartUploadRequest(bucket, key, "uploadId", partETags);
+    }
+
     private void listObjects(AmazonS3 s3, String bucket) {
         ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucket);
         ObjectListing objectListing = s3.listObjects(listObjectsRequest);
@@ -207,7 +221,6 @@ private void pojosWithConstructorArgs(String bucket) {
         SetBucketNotificationConfigurationRequest notificationRequest = new SetBucketNotificationConfigurationRequest(bucket, new BucketNotificationConfiguration());
         SetBucketTaggingConfigurationRequest tagRequest = new SetBucketTaggingConfigurationRequest(bucket, new BucketTaggingConfiguration());
         SetBucketWebsiteConfigurationRequest websiteRequest = new SetBucketWebsiteConfigurationRequest(bucket, new BucketWebsiteConfiguration());
-        PartETag partETag = new PartETag(7, "etag");
     }
 
     private void setBucketConfigs(AmazonS3 s3, String bucket) {

v2-migration/src/main/java/software/amazon/awssdk/v2migration/S3NonStreamingRequestToV2Complex.java

@@ -23,6 +23,8 @@
 import org.openrewrite.java.JavaTemplate;
 import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.tree.J;
+import org.openrewrite.java.tree.JavaType;
+import org.openrewrite.java.tree.TypeUtils;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 
 /**
@@ -69,8 +71,15 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
     }
 
     private static final class Visitor extends JavaIsoVisitor<ExecutionContext> {
+
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
+
+            if (isCompleteMpuRequestMultipartUploadSetter(method)) {
+                method = transformCompleteMpuRequestCompletedPartsArg(method);
+                return super.visitMethodInvocation(method, executionContext);
+            }
+
             if (DISABLE_REQUESTER_PAYS.matches(method, false)) {
                 method = transformSetRequesterPays(method, false);
                 return super.visitMethodInvocation(method, executionContext);
@@ -114,6 +123,22 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
             return super.visitMethodInvocation(method, executionContext);
         }
 
+        private boolean isCompleteMpuRequestMultipartUploadSetter(J.MethodInvocation method) {
+            JavaType.FullyQualified completeMpuRequest = TypeUtils.asFullyQualified(JavaType.buildType(
+                "software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest.Builder"));
+            return "multipartUpload".equals(method.getSimpleName()) &&
+                   TypeUtils.isAssignableTo(completeMpuRequest, method.getSelect().getType());
+        }
+
+        private J.MethodInvocation transformCompleteMpuRequestCompletedPartsArg(J.MethodInvocation method) {
+            addImport("CompletedMultipartUpload");
+            String v2Method = "CompletedMultipartUpload.builder().parts(#{any()}).build()";
+
+            return JavaTemplate.builder(v2Method).build()
+                               .apply(getCursor(), method.getCoordinates().replaceArguments(),
+                                      method.getArguments().get(0));
+        }
+
         private J.MethodInvocation transformCreateBucket(J.MethodInvocation method) {
             String v2Method = "#{any()}.createBucket(CreateBucketRequest.builder().bucket(#{any()})"
                               + ".createBucketConfiguration(CreateBucketConfiguration.builder().locationConstraint(#{any()})"

v2-migration/src/main/resources/META-INF/rewrite/change-s3-methods.yml

@@ -213,4 +213,7 @@ recipeList:
       newMethodName: withBucket
   - org.openrewrite.java.ChangeMethodName:
       methodPattern: com.amazonaws.services.s3.model.CompleteMultipartUploadRequest withBucketName(String)
-      newMethodName: withBucket
+      newMethodName: withBucket
+  - org.openrewrite.java.ChangeMethodName:
+      methodPattern: com.amazonaws.services.s3.model.CompleteMultipartUploadRequest withPartETags(java.util.List)
+      newMethodName: withMultipartUpload

v2-migration/src/main/resources/META-INF/rewrite/s3-methods-constructor-to-fluent.yml

@@ -515,4 +515,16 @@ recipeList:
         - java.lang.String
       fluentNames:
         - withPartNumber
-        - withETag
+        - withETag
+  - software.amazon.awssdk.v2migration.ConstructorToFluent:
+      clzzFqcn: com.amazonaws.services.s3.model.CompleteMultipartUploadRequest
+      parameterTypes:
+        - java.lang.String
+        - java.lang.String
+        - java.lang.String
+        - java.util.List<com.amazonaws.services.s3.model.PartETag>
+      fluentNames:
+        - withBucket
+        - withKey
+        - withUploadId
+        - withMultipartUpload