Migration tool - S3 Pojos

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

@@ -15,6 +15,7 @@
 
 package foo.bar;
 import software.amazon.awssdk.services.s3.model.Event;
+import software.amazon.awssdk.services.s3.model.JSONType;
 import software.amazon.awssdk.services.s3.model.StorageClass;
 import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
@@ -28,19 +29,19 @@ public class Enums {
     public static void main(String... args) {
         QueueAttributeName qan = QueueAttributeName.DELAY_SECONDS;
         QueueAttributeName qan2 = QueueAttributeName.ALL;
-        StorageClass sc1 = StorageClass.STANDARD_IA;
-        StorageClass sc2 = StorageClass.ONEZONE_IA;
-        Event se = Event.S3_OBJECT_CREATED;
-        System.out.println(qan);
-        System.out.println(qan2);
 
         ReceiveMessageRequest v1Request = ReceiveMessageRequest.builder()
             .build();
         List<String> attributes = v1Request.attributeNamesAsStrings();
-        System.out.println(attributes);
 
         SendMessageRequest v2Request = SendMessageRequest.builder().build();
         Map<String, MessageAttributeValue> messageAttributes = v2Request.messageAttributes();
-        System.out.println(messageAttributes);
+    }
+
+    public void s3Enums() {
+        StorageClass sc1 = StorageClass.STANDARD_IA;
+        StorageClass sc2 = StorageClass.ONEZONE_IA;
+        Event se = Event.S3_OBJECT_CREATED;
+        JSONType jsonType = JSONType.DOCUMENT;
     }
 }

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

@@ -82,13 +82,15 @@
 import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
 import software.amazon.awssdk.services.s3.model.IntelligentTieringConfiguration;
 import software.amazon.awssdk.services.s3.model.InventoryConfiguration;
+import software.amazon.awssdk.services.s3.model.ListBucketsRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectVersionsRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
 import software.amazon.awssdk.services.s3.model.MetricsConfiguration;
 import software.amazon.awssdk.services.s3.model.NotificationConfiguration;
+import software.amazon.awssdk.services.s3.model.Owner;
 import software.amazon.awssdk.services.s3.model.OwnershipControls;
 import software.amazon.awssdk.services.s3.model.Payer;
 import software.amazon.awssdk.services.s3.model.PutBucketAccelerateConfigurationRequest;
@@ -433,4 +435,15 @@ private void generatePresignedUrl(S3Client s3, String bucket, String key, Date e
                     .signatureDuration(Duration.between(Instant.now(), expiration.toInstant())))
                 .url();
     }
+
+    private void getS3AccountOwner(S3Client s3) {
+        Owner owner = s3.listBuckets().owner();
+
+        Owner owner2 = s3.listBuckets(ListBucketsRequest.builder()
+            .build()).owner();
+
+        ListBucketsRequest getS3AccountOwnerRequest = ListBucketsRequest.builder()
+            .build();
+        Owner owner3 = s3.listBuckets(getS3AccountOwnerRequest).owner();
+    }
 }

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

@@ -0,0 +1,77 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package foo.bar;
+
+import java.util.Arrays;
+import software.amazon.awssdk.services.s3.model.AccelerateConfiguration;
+import software.amazon.awssdk.services.s3.model.Bucket;
+import software.amazon.awssdk.services.s3.model.CSVInput;
+import software.amazon.awssdk.services.s3.model.CSVOutput;
+import software.amazon.awssdk.services.s3.model.Condition;
+import software.amazon.awssdk.services.s3.model.Destination;
+import software.amazon.awssdk.services.s3.model.GetBucketVersioningResponse;
+import software.amazon.awssdk.services.s3.model.Grantee;
+import software.amazon.awssdk.services.s3.model.JSONInput;
+import software.amazon.awssdk.services.s3.model.JSONOutput;
+import software.amazon.awssdk.services.s3.model.ListMultipartUploadsResponse;
+import software.amazon.awssdk.services.s3.model.ListPartsResponse;
+import software.amazon.awssdk.services.s3.model.MetadataEntry;
+import software.amazon.awssdk.services.s3.model.Part;
+import software.amazon.awssdk.services.s3.model.RedirectAllRequestsTo;
+import software.amazon.awssdk.services.s3.model.S3Object;
+import software.amazon.awssdk.services.s3.model.Tag;
+
+public class S3Pojos {
+
+    public void s3Pojos(String bucket, String key, String id, String value) {
+        AccelerateConfiguration bucketAccelerateConfiguration = AccelerateConfiguration.builder().status("Enabled")
+            .build();
+        MetadataEntry metadataEntry = MetadataEntry.builder().name("name").value(value)
+            .build();
+        Tag tag = Tag.builder().key(key).value(value)
+            .build();
+        Grantee canonicalGrantee = Grantee.builder().id(id)
+            .build();
+        Grantee emailAddressGrantee = Grantee.builder().emailAddress(id)
+            .build();
+        CSVInput csvInput = CSVInput.builder()
+            .build();
+        CSVOutput csvOutput = CSVOutput.builder()
+            .build();
+        JSONInput jsonInput = JSONInput.builder()
+            .build();
+        JSONOutput jsonOutput = JSONOutput.builder()
+            .build();
+        ListMultipartUploadsResponse multipartUploadListing = ListMultipartUploadsResponse.builder()
+            .build();
+        ListPartsResponse partListing = ListPartsResponse.builder()
+            .build();
+        Part partSummary = Part.builder()
+            .build();
+        RedirectAllRequestsTo redirectRule = RedirectAllRequestsTo.builder()
+            .build();
+        Destination replicationDestinationConfig = Destination.builder()
+            .build();
+        Condition routingRuleCondition = Condition.builder()
+            .build();
+        S3Object s3ObjectSummary = S3Object.builder()
+            .build();
+        GetBucketVersioningResponse bucketVersioningConfiguration = GetBucketVersioningResponse.builder()
+            .build();
+        Bucket bucketPojo = Bucket.builder().name("name")
+            .build();
+    }
+}

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

@@ -67,6 +67,7 @@
 import software.amazon.awssdk.services.s3.model.GetBucketPolicyStatusRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketPolicyStatusResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketReplicationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketRequestPaymentRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketVersioningRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketWebsiteRequest;
@@ -97,6 +98,7 @@
 import software.amazon.awssdk.services.s3.model.ListBucketsRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
+import software.amazon.awssdk.services.s3.model.ListPartsRequest;
 import software.amazon.awssdk.services.s3.model.MetricsConfiguration;
 import software.amazon.awssdk.services.s3.model.NotificationConfiguration;
 import software.amazon.awssdk.services.s3.model.OwnershipControls;
@@ -108,6 +110,7 @@
 import software.amazon.awssdk.services.s3.model.PutBucketReplicationRequest;
 import software.amazon.awssdk.services.s3.model.PutBucketTaggingRequest;
 import software.amazon.awssdk.services.s3.model.ReplicationConfiguration;
+import software.amazon.awssdk.services.s3.model.RestoreObjectRequest;
 import software.amazon.awssdk.services.s3.model.Tagging;
 import software.amazon.awssdk.services.s3.model.UploadPartCopyRequest;
 
@@ -416,5 +419,17 @@ public void requestconstructor() {
                 .build())
                 .build());
 
+        DeleteObjectRequest deleteVersionRequest = DeleteObjectRequest.builder().bucket(bucketName).key(objectKey).versionId("id")
+            .build();
+
+        ListPartsRequest listPartsRequest = ListPartsRequest.builder().bucket(bucketName).key(objectKey).uploadId("id")
+            .build();
+
+        RestoreObjectRequest restoreObjectRequest = RestoreObjectRequest.builder().bucket(bucketName).key(objectKey)
+            .build();
+
+        GetBucketRequestPaymentRequest getRequestPaymentConfigurationRequest =
+            GetBucketRequestPaymentRequest.builder().bucket(bucketName)
+                .build();
     }
 }

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

@@ -15,6 +15,7 @@
 
 package foo.bar;
 
+import com.amazonaws.services.s3.model.JSONType;
 import com.amazonaws.services.s3.model.S3Event;
 import com.amazonaws.services.s3.model.StorageClass;
 import com.amazonaws.services.sqs.model.QueueAttributeName;
@@ -29,18 +30,18 @@ public class Enums {
     public static void main(String... args) {
         QueueAttributeName qan = QueueAttributeName.DelaySeconds;
         QueueAttributeName qan2 = QueueAttributeName.All;
-        StorageClass sc1 = StorageClass.StandardInfrequentAccess;
-        StorageClass sc2 = StorageClass.OneZoneInfrequentAccess;
-        S3Event se = S3Event.ObjectCreated;
-        System.out.println(qan);
-        System.out.println(qan2);
 
         ReceiveMessageRequest v1Request = new ReceiveMessageRequest();
         List<String> attributes = v1Request.getAttributeNames();
-        System.out.println(attributes);
 
         SendMessageRequest v2Request = SendMessageRequest.builder().build();
         Map<String, MessageAttributeValue> messageAttributes = v2Request.messageAttributes();
-        System.out.println(messageAttributes);
+    }
+
+    public void s3Enums() {
+        StorageClass sc1 = StorageClass.StandardInfrequentAccess;
+        StorageClass sc2 = StorageClass.OneZoneInfrequentAccess;
+        S3Event se = S3Event.ObjectCreated;
+        JSONType jsonType = JSONType.DOCUMENT;
     }
 }

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

@@ -38,6 +38,7 @@
 import com.amazonaws.services.s3.model.GetBucketCrossOriginConfigurationRequest;
 import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
 import com.amazonaws.services.s3.model.GetObjectRequest;
+import com.amazonaws.services.s3.model.GetS3AccountOwnerRequest;
 import com.amazonaws.services.s3.model.HeadBucketRequest;
 import com.amazonaws.services.s3.model.HeadBucketResult;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
@@ -47,6 +48,7 @@
 import com.amazonaws.services.s3.model.ListObjectsV2Result;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.Owner;
 import com.amazonaws.services.s3.model.PartETag;
 import com.amazonaws.services.s3.model.SetBucketCrossOriginConfigurationRequest;
 import com.amazonaws.services.s3.model.SetBucketLifecycleConfigurationRequest;
@@ -272,4 +274,13 @@ private void generatePresignedUrl(AmazonS3 s3, String bucket, String key, Date e
 
         URL urlDelete = s3.generatePresignedUrl(bucket, key, expiration, HttpMethod.DELETE);
     }
+
+    private void getS3AccountOwner(AmazonS3 s3) {
+        Owner owner = s3.getS3AccountOwner();
+
+        Owner owner2 = s3.getS3AccountOwner(new GetS3AccountOwnerRequest());
+
+        GetS3AccountOwnerRequest getS3AccountOwnerRequest = new GetS3AccountOwnerRequest();
+        Owner owner3 = s3.getS3AccountOwner(getS3AccountOwnerRequest);
+    }
 }

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package foo.bar;
+
+import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.BucketAccelerateConfiguration;
+import com.amazonaws.services.s3.model.BucketVersioningConfiguration;
+import com.amazonaws.services.s3.model.CSVInput;
+import com.amazonaws.services.s3.model.CSVOutput;
+import com.amazonaws.services.s3.model.CanonicalGrantee;
+import com.amazonaws.services.s3.model.EmailAddressGrantee;
+import com.amazonaws.services.s3.model.JSONInput;
+import com.amazonaws.services.s3.model.JSONOutput;
+import com.amazonaws.services.s3.model.MetadataEntry;
+import com.amazonaws.services.s3.model.MultipartUploadListing;
+import com.amazonaws.services.s3.model.PartListing;
+import com.amazonaws.services.s3.model.PartSummary;
+import com.amazonaws.services.s3.model.RedirectRule;
+import com.amazonaws.services.s3.model.ReplicationDestinationConfig;
+import com.amazonaws.services.s3.model.RoutingRuleCondition;
+import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.amazonaws.services.s3.model.Tag;
+import java.util.Arrays;
+
+public class S3Pojos {
+
+    public void s3Pojos(String bucket, String key, String id, String value) {
+        BucketAccelerateConfiguration bucketAccelerateConfiguration = new BucketAccelerateConfiguration("Enabled");
+        MetadataEntry metadataEntry = new MetadataEntry("name", value);
+        Tag tag = new Tag(key, value);
+        CanonicalGrantee canonicalGrantee = new CanonicalGrantee(id);
+        EmailAddressGrantee emailAddressGrantee = new EmailAddressGrantee(id);
+        CSVInput csvInput = new CSVInput();
+        CSVOutput csvOutput = new CSVOutput();
+        JSONInput jsonInput = new JSONInput();
+        JSONOutput jsonOutput = new JSONOutput();
+        MultipartUploadListing multipartUploadListing = new MultipartUploadListing();
+        PartListing partListing = new PartListing();
+        PartSummary partSummary = new PartSummary();
+        RedirectRule redirectRule = new RedirectRule();
+        ReplicationDestinationConfig replicationDestinationConfig = new ReplicationDestinationConfig();
+        RoutingRuleCondition routingRuleCondition = new RoutingRuleCondition();
+        S3ObjectSummary s3ObjectSummary = new S3ObjectSummary();
+        BucketVersioningConfiguration bucketVersioningConfiguration = new BucketVersioningConfiguration();
+        Bucket bucketPojo = new Bucket("name");
+    }
+}

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

@@ -44,6 +44,7 @@
 import com.amazonaws.services.s3.model.DeleteObjectTaggingRequest;
 import com.amazonaws.services.s3.model.DeleteObjectsRequest;
 import com.amazonaws.services.s3.model.DeletePublicAccessBlockRequest;
+import com.amazonaws.services.s3.model.DeleteVersionRequest;
 import com.amazonaws.services.s3.model.GetBucketAccelerateConfigurationRequest;
 import com.amazonaws.services.s3.model.GetBucketAclRequest;
 import com.amazonaws.services.s3.model.GetBucketAnalyticsConfigurationRequest;
@@ -83,6 +84,7 @@
 import com.amazonaws.services.s3.model.GetObjectTaggingResult;
 import com.amazonaws.services.s3.model.GetPublicAccessBlockRequest;
 import com.amazonaws.services.s3.model.GetPublicAccessBlockResult;
+import com.amazonaws.services.s3.model.GetRequestPaymentConfigurationRequest;
 import com.amazonaws.services.s3.model.HeadBucketRequest;
 import com.amazonaws.services.s3.model.ListBucketAnalyticsConfigurationsRequest;
 import com.amazonaws.services.s3.model.ListBucketAnalyticsConfigurationsResult;
@@ -94,8 +96,10 @@
 import com.amazonaws.services.s3.model.ListBucketMetricsConfigurationsResult;
 import com.amazonaws.services.s3.model.ListBucketsRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
+import com.amazonaws.services.s3.model.ListPartsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.ObjectMetadata;
+import com.amazonaws.services.s3.model.RestoreObjectRequest;
 import com.amazonaws.services.s3.model.S3Object;
 import com.amazonaws.services.s3.model.SetBucketAnalyticsConfigurationRequest;
 import com.amazonaws.services.s3.model.SetBucketLifecycleConfigurationRequest;
@@ -332,5 +336,13 @@ public void requestconstructor() {
         s3.setBucketTaggingConfiguration(
             new SetBucketTaggingConfigurationRequest(bucketName,new BucketTaggingConfiguration()));
 
+        DeleteVersionRequest deleteVersionRequest = new DeleteVersionRequest(bucketName, objectKey, "id");
+
+        ListPartsRequest listPartsRequest = new ListPartsRequest(bucketName, objectKey, "id");
+
+        RestoreObjectRequest restoreObjectRequest = new RestoreObjectRequest(bucketName, objectKey);
+
+        GetRequestPaymentConfigurationRequest getRequestPaymentConfigurationRequest =
+            new GetRequestPaymentConfigurationRequest(bucketName);
     }
 }

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

@@ -20,6 +20,7 @@
 import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isSupportedV1Class;
 import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isSupportedV1ClientClass;
 import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.isV1ClientClass;
+import static software.amazon.awssdk.v2migration.internal.utils.SdkTypeUtils.shouldSkip;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -120,6 +121,10 @@ public J visitImport(J.Import anImport, ExecutionContext ctx) {
                 return anImport;
             }
 
+            if (shouldSkip(fullyQualified.getFullyQualifiedName())) {
+                return anImport;
+            }
+
             String currentFqcn = fullyQualified.getFullyQualifiedName();
 
             if (isSupportedV1Class(fullyQualified)) {
@@ -316,7 +321,8 @@ public J visitIdentifier(J.Identifier ident, ExecutionContext ctx) {
         }
 
         private void storeV1ClassMetadata(String currentFqcn) {
-            if (oldTypeToNewType.containsKey(currentFqcn)) {
+            if (oldTypeToNewType.containsKey(currentFqcn)
+                || shouldSkip(currentFqcn)) {
                 return;
             }