Change response types for POJOs that map one to many

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

@@ -253,7 +253,7 @@ private void singleBucketArgMethods(S3Client s3, String bucket) {
         s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucket)
             .build());
         s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucket)
-            .build());
+            .build()).locationConstraint().toString();
         s3.deleteBucketLifecycle(DeleteBucketLifecycleRequest.builder().bucket(bucket)
             .build());
         s3.deleteBucketReplication(DeleteBucketReplicationRequest.builder().bucket(bucket)

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

@@ -21,6 +21,7 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.model.AnalyticsConfiguration;
+import software.amazon.awssdk.services.s3.model.Bucket;
 import software.amazon.awssdk.services.s3.model.BucketLifecycleConfiguration;
 import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
 import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
@@ -45,33 +46,45 @@
 import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
 import software.amazon.awssdk.services.s3.model.DeletePublicAccessBlockRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketAclRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketAclResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketAnalyticsConfigurationRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketAnalyticsConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketCorsRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketCorsResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketEncryptionRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketEncryptionResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketIntelligentTieringConfigurationRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketIntelligentTieringConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketInventoryConfigurationRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketInventoryConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketLoggingRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketLoggingResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketMetricsConfigurationRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketMetricsConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketOwnershipControlsRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketOwnershipControlsResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketPolicyRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse;
 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.GetBucketReplicationResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketRequestPaymentRequest;
 import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketVersioningRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketVersioningResponse;
 import software.amazon.awssdk.services.s3.model.GetBucketWebsiteRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketWebsiteResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectAclRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectAclResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectLegalHoldRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectLegalHoldResponse;
 import software.amazon.awssdk.services.s3.model.GetObjectLockConfigurationRequest;
@@ -205,12 +218,11 @@ public void requestconstructor() {
         s3.deletePublicAccessBlock(DeletePublicAccessBlockRequest.builder()
             .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketAccelerateConfiguration(GetBucketAccelerateConfigurationRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketAccelerateConfigurationResponse bucketAccelerateConfiguration =
+            s3.getBucketAccelerateConfiguration(GetBucketAccelerateConfigurationRequest.builder().bucket(bucketName)
+                .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketAcl(GetBucketAclRequest.builder().bucket(bucketName)
+        GetBucketAclResponse bucketAcl = s3.getBucketAcl(GetBucketAclRequest.builder().bucket(bucketName)
             .build());
 
         GetBucketAnalyticsConfigurationResponse analyticsConfig = s3.getBucketAnalyticsConfiguration(
@@ -221,9 +233,9 @@ public void requestconstructor() {
             GetBucketAnalyticsConfigurationRequest.builder().bucket("1").id("2")
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketCors(GetBucketCorsRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketCorsResponse bucketCors =
+            s3.getBucketCors(GetBucketCorsRequest.builder().bucket(bucketName)
+                .build());
 
         GetBucketEncryptionResponse encryptionResult = s3.getBucketEncryption(
             GetBucketEncryptionRequest.builder()
@@ -245,17 +257,16 @@ public void requestconstructor() {
             GetBucketInventoryConfigurationRequest.builder().bucket("1").id("2")
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLifecycleConfiguration(GetBucketLifecycleConfigurationRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketLifecycleConfigurationResponse bucketLifecycleConfiguration =
+            s3.getBucketLifecycleConfiguration(GetBucketLifecycleConfigurationRequest.builder().bucket(bucketName)
+                .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucketName)
-            .build());
+        String region = s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucketName)
+            .build()).locationConstraint().toString();
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLogging(GetBucketLoggingRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketLoggingResponse bucketLoggingConfiguration =
+            s3.getBucketLogging(GetBucketLoggingRequest.builder().bucket(bucketName)
+                .build());
 
         GetBucketMetricsConfigurationResponse metricsConfig = s3.getBucketMetricsConfiguration(
             GetBucketMetricsConfigurationRequest.builder()
@@ -265,37 +276,36 @@ public void requestconstructor() {
             GetBucketMetricsConfigurationRequest.builder().bucket("1").id("2")
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketNotificationConfiguration(GetBucketNotificationConfigurationRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketNotificationConfigurationResponse bucketNotificationConfiguration =
+            s3.getBucketNotificationConfiguration(GetBucketNotificationConfigurationRequest.builder().bucket(bucketName)
+                .build());
 
         GetBucketOwnershipControlsResponse ownershipControls = s3.getBucketOwnershipControls(
             GetBucketOwnershipControlsRequest.builder()
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucketName)
+        GetBucketPolicyResponse bucketPolicy = s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucketName)
             .build());
 
         GetBucketPolicyStatusResponse policyStatus = s3.getBucketPolicyStatus(
             GetBucketPolicyStatusRequest.builder()
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketReplication(GetBucketReplicationRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketReplicationResponse bucketReplicationConfiguration =
+            s3.getBucketReplication(GetBucketReplicationRequest.builder().bucket(bucketName)
+                .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketTagging(GetBucketTaggingRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketTaggingResponse bucketTaggingConfiguration =
+            s3.getBucketTagging(GetBucketTaggingRequest.builder().bucket(bucketName)
+                .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketVersioning(GetBucketVersioningRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketVersioningResponse bucketVersioningConfiguration =
+            s3.getBucketVersioning(GetBucketVersioningRequest.builder().bucket(bucketName)
+                .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketWebsite(GetBucketWebsiteRequest.builder().bucket(bucketName)
-            .build());
+        GetBucketWebsiteResponse bucketWebsiteConfiguration =
+            s3.getBucketWebsite(GetBucketWebsiteRequest.builder().bucket(bucketName)
+                .build());
 
         ResponseInputStream<GetObjectResponse> s3Object1 = s3.getObject(
             GetObjectRequest.builder().bucket(bucketName).key(objectKey)
@@ -311,12 +321,10 @@ public void requestconstructor() {
         GetObjectRequest getObjectRequestRequesterPaysFalse = GetObjectRequest.builder().bucket(bucketName).key(objectKey)
             .build();
 
-        //INCOMPATIBLE RESPONSE
-        s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey)
+        GetObjectAclResponse objectAcl = s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey)
             .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey).versionId("3")
+        GetObjectAclResponse objectAcl2 = s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey).versionId("3")
             .build());
 
         GetObjectLegalHoldResponse legalHoldResult = s3.getObjectLegalHold(
@@ -371,9 +379,7 @@ public void requestconstructor() {
             ListBucketMetricsConfigurationsRequest.builder()
                 .build());
 
-        //INCOMPATIBLE RESPONSE
-        s3.listBuckets(ListBucketsRequest.builder()
-            .build());
+        List<Bucket> buckets = s3.listBuckets().buckets();
 
         ListObjectsResponse objectListing = s3.listObjects(
             ListObjectsRequest.builder()

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

@@ -29,7 +29,6 @@
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
-import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.RequestPayer;
 import software.amazon.awssdk.services.s3.model.Tag;
@@ -44,8 +43,8 @@ void getObject(String bucket, String key, File file) throws Exception {
             .build());
         s3Object.close();
 
-        s3.getObject(GetObjectRequest.builder().bucket(bucket).key(key)
-            .build(), file.toPath());
+        GetObjectResponse objectMetadata = s3.getObject(GetObjectRequest.builder().bucket(bucket).key(key)
+                .build(), file.toPath());
     }
 
     void putObject_bucketKeyContent(String bucket, String key, String content) {
@@ -125,7 +124,6 @@ void putObjectSetters() {
             PutObjectRequest.builder().bucket("bucket").key("key").websiteRedirectLocation("location")
                 .bucket("bucketName")
                 .websiteRedirectLocation("redirectLocation")
-                .acl(ObjectCannedACL.AWS_EXEC_READ)
                 .tagging(objectTagging)
             .build();
     }

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

@@ -18,11 +18,18 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
+import com.amazonaws.services.s3.model.AccessControlList;
+import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.BucketAccelerateConfiguration;
+import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration;
 import com.amazonaws.services.s3.model.BucketLifecycleConfiguration;
+import com.amazonaws.services.s3.model.BucketLoggingConfiguration;
 import com.amazonaws.services.s3.model.BucketNotificationConfiguration;
+import com.amazonaws.services.s3.model.BucketPolicy;
 import com.amazonaws.services.s3.model.BucketReplicationConfiguration;
 import com.amazonaws.services.s3.model.BucketTaggingConfiguration;
 import com.amazonaws.services.s3.model.BucketVersioningConfiguration;
+import com.amazonaws.services.s3.model.BucketWebsiteConfiguration;
 import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
 import com.amazonaws.services.s3.model.CopyObjectRequest;
 import com.amazonaws.services.s3.model.CopyPartRequest;
@@ -178,20 +185,19 @@ public void requestconstructor() {
 
         s3.deletePublicAccessBlock(new DeletePublicAccessBlockRequest());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketAccelerateConfiguration(new GetBucketAccelerateConfigurationRequest(bucketName));
+        BucketAccelerateConfiguration bucketAccelerateConfiguration =
+            s3.getBucketAccelerateConfiguration(new GetBucketAccelerateConfigurationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketAcl(new GetBucketAclRequest(bucketName));
+        AccessControlList bucketAcl = s3.getBucketAcl(new GetBucketAclRequest(bucketName));
 
         GetBucketAnalyticsConfigurationResult analyticsConfig = s3.getBucketAnalyticsConfiguration(
             new GetBucketAnalyticsConfigurationRequest());
 
         GetBucketAnalyticsConfigurationResult analyticsConfig2 = s3.getBucketAnalyticsConfiguration(
             new GetBucketAnalyticsConfigurationRequest("1","2"));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketCrossOriginConfiguration(new GetBucketCrossOriginConfigurationRequest(bucketName));
+        BucketCrossOriginConfiguration bucketCors =
+            s3.getBucketCrossOriginConfiguration(new GetBucketCrossOriginConfigurationRequest(bucketName));
 
         GetBucketEncryptionResult encryptionResult = s3.getBucketEncryption(
             new GetBucketEncryptionRequest());
@@ -208,44 +214,42 @@ public void requestconstructor() {
         GetBucketInventoryConfigurationResult inventoryConfig2 = s3.getBucketInventoryConfiguration(
             new GetBucketInventoryConfigurationRequest("1","2"));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLifecycleConfiguration(new GetBucketLifecycleConfigurationRequest(bucketName));
+        BucketLifecycleConfiguration bucketLifecycleConfiguration =
+            s3.getBucketLifecycleConfiguration(new GetBucketLifecycleConfigurationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLocation(new GetBucketLocationRequest(bucketName));
+        String region = s3.getBucketLocation(new GetBucketLocationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketLoggingConfiguration(new GetBucketLoggingConfigurationRequest(bucketName));
+        BucketLoggingConfiguration bucketLoggingConfiguration =
+            s3.getBucketLoggingConfiguration(new GetBucketLoggingConfigurationRequest(bucketName));
 
         GetBucketMetricsConfigurationResult metricsConfig = s3.getBucketMetricsConfiguration(
             new GetBucketMetricsConfigurationRequest());
 
         GetBucketMetricsConfigurationResult metricsConfig2 = s3.getBucketMetricsConfiguration(
             new GetBucketMetricsConfigurationRequest("1","2"));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketNotificationConfiguration(new GetBucketNotificationConfigurationRequest(bucketName));
+        BucketNotificationConfiguration bucketNotificationConfiguration =
+            s3.getBucketNotificationConfiguration(new GetBucketNotificationConfigurationRequest(bucketName));
 
         GetBucketOwnershipControlsResult ownershipControls = s3.getBucketOwnershipControls(
             new GetBucketOwnershipControlsRequest());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketPolicy(new GetBucketPolicyRequest(bucketName));
+        BucketPolicy bucketPolicy = s3.getBucketPolicy(new GetBucketPolicyRequest(bucketName));
 
         GetBucketPolicyStatusResult policyStatus = s3.getBucketPolicyStatus(
             new GetBucketPolicyStatusRequest());
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketReplicationConfiguration(new GetBucketReplicationConfigurationRequest(bucketName));
+        BucketReplicationConfiguration bucketReplicationConfiguration =
+            s3.getBucketReplicationConfiguration(new GetBucketReplicationConfigurationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketTaggingConfiguration(new GetBucketTaggingConfigurationRequest(bucketName));
+        BucketTaggingConfiguration bucketTaggingConfiguration =
+            s3.getBucketTaggingConfiguration(new GetBucketTaggingConfigurationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketVersioningConfiguration(new GetBucketVersioningConfigurationRequest(bucketName));
+        BucketVersioningConfiguration bucketVersioningConfiguration =
+            s3.getBucketVersioningConfiguration(new GetBucketVersioningConfigurationRequest(bucketName));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getBucketWebsiteConfiguration(new GetBucketWebsiteConfigurationRequest(bucketName));
+        BucketWebsiteConfiguration bucketWebsiteConfiguration =
+            s3.getBucketWebsiteConfiguration(new GetBucketWebsiteConfigurationRequest(bucketName));
 
         S3Object s3Object1 = s3.getObject(
             new GetObjectRequest(bucketName, objectKey));
@@ -257,11 +261,9 @@ public void requestconstructor() {
 
         GetObjectRequest getObjectRequestRequesterPaysFalse = new GetObjectRequest(bucketName, objectKey, false);
 
-        //INCOMPATIBLE RESPONSE
-        s3.getObjectAcl(new GetObjectAclRequest(bucketName, objectKey));
+        AccessControlList objectAcl = s3.getObjectAcl(new GetObjectAclRequest(bucketName, objectKey));
 
-        //INCOMPATIBLE RESPONSE
-        s3.getObjectAcl(new GetObjectAclRequest(bucketName, objectKey, "3"));
+        AccessControlList objectAcl2 = s3.getObjectAcl(new GetObjectAclRequest(bucketName, objectKey, "3"));
 
         GetObjectLegalHoldResult legalHoldResult = s3.getObjectLegalHold(
             new GetObjectLegalHoldRequest());
@@ -302,8 +304,7 @@ public void requestconstructor() {
         ListBucketMetricsConfigurationsResult metricsConfigs = s3.listBucketMetricsConfigurations(
             new ListBucketMetricsConfigurationsRequest());
 
-        //INCOMPATIBLE RESPONSE
-        s3.listBuckets(new ListBucketsRequest());
+        List<Bucket> buckets = s3.listBuckets(new ListBucketsRequest());
 
         ObjectListing objectListing = s3.listObjects(
             new ListObjectsRequest());