Skip to content

Commit 449da7e

Browse files
davidh44davidh44
authored
Change response types for POJOs that map one to many (#6024)
* Change response types for POJOs that map one to many * Fix copyright header * Use regular Amazon license header * Update source license comment * Update source license comment
1 parent 801121c commit 449da7e

File tree

16 files changed

+357
-99
lines changed

16 files changed

+357
-99
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ void s3Pojos() {
4949
}
5050

5151
void setBucketAcl() {
52-
/*AWS SDK for Java v2 migration: Transform for AccessControlList and CannedAccessControlList not supported. In v2, CannedAccessControlList is replaced by BucketCannedACL for buckets and ObjectCannedACL for objects.*/s3.setBucketAcl(bucket, ObjectCannedACL.AUTHENTICATED_READ);
52+
/*AWS SDK for Java v2 migration: Transform for AccessControlList and CannedAccessControlList not supported. In v2, CannedAccessControlList is replaced by BucketCannedACL for buckets and ObjectCannedACL for objects.*/s3.setBucketAcl(bucket, CannedAccessControlList.AuthenticatedRead);
5353
}
5454

5555
void setObjectAcl() {
56-
/*AWS SDK for Java v2 migration: Transform for AccessControlList and CannedAccessControlList not supported. In v2, CannedAccessControlList is replaced by BucketCannedACL for buckets and ObjectCannedACL for objects.*/s3.setObjectAcl(bucket, key, ObjectCannedACL.PUBLIC_READ);
56+
/*AWS SDK for Java v2 migration: Transform for AccessControlList and CannedAccessControlList not supported. In v2, CannedAccessControlList is replaced by BucketCannedACL for buckets and ObjectCannedACL for objects.*/s3.setObjectAcl(bucket, key, CannedAccessControlList.PublicRead);
5757
}
5858

5959
void upload_streamWithLiteralLength(S3TransferManager tm) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ private void singleBucketArgMethods(S3Client s3, String bucket) {
253253
s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucket)
254254
.build());
255255
s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucket)
256-
.build());
256+
.build()).locationConstraint().toString();
257257
s3.deleteBucketLifecycle(DeleteBucketLifecycleRequest.builder().bucket(bucket)
258258
.build());
259259
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

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import software.amazon.awssdk.services.s3.S3Client;
2222
import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
2323
import software.amazon.awssdk.services.s3.model.AnalyticsConfiguration;
24+
import software.amazon.awssdk.services.s3.model.Bucket;
2425
import software.amazon.awssdk.services.s3.model.BucketLifecycleConfiguration;
2526
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
2627
import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
@@ -45,33 +46,45 @@
4546
import software.amazon.awssdk.services.s3.model.DeleteObjectsRequest;
4647
import software.amazon.awssdk.services.s3.model.DeletePublicAccessBlockRequest;
4748
import software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationRequest;
49+
import software.amazon.awssdk.services.s3.model.GetBucketAccelerateConfigurationResponse;
4850
import software.amazon.awssdk.services.s3.model.GetBucketAclRequest;
51+
import software.amazon.awssdk.services.s3.model.GetBucketAclResponse;
4952
import software.amazon.awssdk.services.s3.model.GetBucketAnalyticsConfigurationRequest;
5053
import software.amazon.awssdk.services.s3.model.GetBucketAnalyticsConfigurationResponse;
5154
import software.amazon.awssdk.services.s3.model.GetBucketCorsRequest;
55+
import software.amazon.awssdk.services.s3.model.GetBucketCorsResponse;
5256
import software.amazon.awssdk.services.s3.model.GetBucketEncryptionRequest;
5357
import software.amazon.awssdk.services.s3.model.GetBucketEncryptionResponse;
5458
import software.amazon.awssdk.services.s3.model.GetBucketIntelligentTieringConfigurationRequest;
5559
import software.amazon.awssdk.services.s3.model.GetBucketIntelligentTieringConfigurationResponse;
5660
import software.amazon.awssdk.services.s3.model.GetBucketInventoryConfigurationRequest;
5761
import software.amazon.awssdk.services.s3.model.GetBucketInventoryConfigurationResponse;
5862
import software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationRequest;
63+
import software.amazon.awssdk.services.s3.model.GetBucketLifecycleConfigurationResponse;
5964
import software.amazon.awssdk.services.s3.model.GetBucketLocationRequest;
6065
import software.amazon.awssdk.services.s3.model.GetBucketLoggingRequest;
66+
import software.amazon.awssdk.services.s3.model.GetBucketLoggingResponse;
6167
import software.amazon.awssdk.services.s3.model.GetBucketMetricsConfigurationRequest;
6268
import software.amazon.awssdk.services.s3.model.GetBucketMetricsConfigurationResponse;
6369
import software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationRequest;
70+
import software.amazon.awssdk.services.s3.model.GetBucketNotificationConfigurationResponse;
6471
import software.amazon.awssdk.services.s3.model.GetBucketOwnershipControlsRequest;
6572
import software.amazon.awssdk.services.s3.model.GetBucketOwnershipControlsResponse;
6673
import software.amazon.awssdk.services.s3.model.GetBucketPolicyRequest;
74+
import software.amazon.awssdk.services.s3.model.GetBucketPolicyResponse;
6775
import software.amazon.awssdk.services.s3.model.GetBucketPolicyStatusRequest;
6876
import software.amazon.awssdk.services.s3.model.GetBucketPolicyStatusResponse;
6977
import software.amazon.awssdk.services.s3.model.GetBucketReplicationRequest;
78+
import software.amazon.awssdk.services.s3.model.GetBucketReplicationResponse;
7079
import software.amazon.awssdk.services.s3.model.GetBucketRequestPaymentRequest;
7180
import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;
81+
import software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse;
7282
import software.amazon.awssdk.services.s3.model.GetBucketVersioningRequest;
83+
import software.amazon.awssdk.services.s3.model.GetBucketVersioningResponse;
7384
import software.amazon.awssdk.services.s3.model.GetBucketWebsiteRequest;
85+
import software.amazon.awssdk.services.s3.model.GetBucketWebsiteResponse;
7486
import software.amazon.awssdk.services.s3.model.GetObjectAclRequest;
87+
import software.amazon.awssdk.services.s3.model.GetObjectAclResponse;
7588
import software.amazon.awssdk.services.s3.model.GetObjectLegalHoldRequest;
7689
import software.amazon.awssdk.services.s3.model.GetObjectLegalHoldResponse;
7790
import software.amazon.awssdk.services.s3.model.GetObjectLockConfigurationRequest;
@@ -205,12 +218,11 @@ public void requestconstructor() {
205218
s3.deletePublicAccessBlock(DeletePublicAccessBlockRequest.builder()
206219
.build());
207220

208-
//INCOMPATIBLE RESPONSE
209-
s3.getBucketAccelerateConfiguration(GetBucketAccelerateConfigurationRequest.builder().bucket(bucketName)
210-
.build());
221+
GetBucketAccelerateConfigurationResponse bucketAccelerateConfiguration =
222+
s3.getBucketAccelerateConfiguration(GetBucketAccelerateConfigurationRequest.builder().bucket(bucketName)
223+
.build());
211224

212-
//INCOMPATIBLE RESPONSE
213-
s3.getBucketAcl(GetBucketAclRequest.builder().bucket(bucketName)
225+
GetBucketAclResponse bucketAcl = s3.getBucketAcl(GetBucketAclRequest.builder().bucket(bucketName)
214226
.build());
215227

216228
GetBucketAnalyticsConfigurationResponse analyticsConfig = s3.getBucketAnalyticsConfiguration(
@@ -221,9 +233,9 @@ public void requestconstructor() {
221233
GetBucketAnalyticsConfigurationRequest.builder().bucket("1").id("2")
222234
.build());
223235

224-
//INCOMPATIBLE RESPONSE
225-
s3.getBucketCors(GetBucketCorsRequest.builder().bucket(bucketName)
226-
.build());
236+
GetBucketCorsResponse bucketCors =
237+
s3.getBucketCors(GetBucketCorsRequest.builder().bucket(bucketName)
238+
.build());
227239

228240
GetBucketEncryptionResponse encryptionResult = s3.getBucketEncryption(
229241
GetBucketEncryptionRequest.builder()
@@ -245,17 +257,16 @@ public void requestconstructor() {
245257
GetBucketInventoryConfigurationRequest.builder().bucket("1").id("2")
246258
.build());
247259

248-
//INCOMPATIBLE RESPONSE
249-
s3.getBucketLifecycleConfiguration(GetBucketLifecycleConfigurationRequest.builder().bucket(bucketName)
250-
.build());
260+
GetBucketLifecycleConfigurationResponse bucketLifecycleConfiguration =
261+
s3.getBucketLifecycleConfiguration(GetBucketLifecycleConfigurationRequest.builder().bucket(bucketName)
262+
.build());
251263

252-
//INCOMPATIBLE RESPONSE
253-
s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucketName)
254-
.build());
264+
String region = s3.getBucketLocation(GetBucketLocationRequest.builder().bucket(bucketName)
265+
.build()).locationConstraint().toString();
255266

256-
//INCOMPATIBLE RESPONSE
257-
s3.getBucketLogging(GetBucketLoggingRequest.builder().bucket(bucketName)
258-
.build());
267+
GetBucketLoggingResponse bucketLoggingConfiguration =
268+
s3.getBucketLogging(GetBucketLoggingRequest.builder().bucket(bucketName)
269+
.build());
259270

260271
GetBucketMetricsConfigurationResponse metricsConfig = s3.getBucketMetricsConfiguration(
261272
GetBucketMetricsConfigurationRequest.builder()
@@ -265,37 +276,36 @@ public void requestconstructor() {
265276
GetBucketMetricsConfigurationRequest.builder().bucket("1").id("2")
266277
.build());
267278

268-
//INCOMPATIBLE RESPONSE
269-
s3.getBucketNotificationConfiguration(GetBucketNotificationConfigurationRequest.builder().bucket(bucketName)
270-
.build());
279+
GetBucketNotificationConfigurationResponse bucketNotificationConfiguration =
280+
s3.getBucketNotificationConfiguration(GetBucketNotificationConfigurationRequest.builder().bucket(bucketName)
281+
.build());
271282

272283
GetBucketOwnershipControlsResponse ownershipControls = s3.getBucketOwnershipControls(
273284
GetBucketOwnershipControlsRequest.builder()
274285
.build());
275286

276-
//INCOMPATIBLE RESPONSE
277-
s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucketName)
287+
GetBucketPolicyResponse bucketPolicy = s3.getBucketPolicy(GetBucketPolicyRequest.builder().bucket(bucketName)
278288
.build());
279289

280290
GetBucketPolicyStatusResponse policyStatus = s3.getBucketPolicyStatus(
281291
GetBucketPolicyStatusRequest.builder()
282292
.build());
283293

284-
//INCOMPATIBLE RESPONSE
285-
s3.getBucketReplication(GetBucketReplicationRequest.builder().bucket(bucketName)
286-
.build());
294+
GetBucketReplicationResponse bucketReplicationConfiguration =
295+
s3.getBucketReplication(GetBucketReplicationRequest.builder().bucket(bucketName)
296+
.build());
287297

288-
//INCOMPATIBLE RESPONSE
289-
s3.getBucketTagging(GetBucketTaggingRequest.builder().bucket(bucketName)
290-
.build());
298+
GetBucketTaggingResponse bucketTaggingConfiguration =
299+
s3.getBucketTagging(GetBucketTaggingRequest.builder().bucket(bucketName)
300+
.build());
291301

292-
//INCOMPATIBLE RESPONSE
293-
s3.getBucketVersioning(GetBucketVersioningRequest.builder().bucket(bucketName)
294-
.build());
302+
GetBucketVersioningResponse bucketVersioningConfiguration =
303+
s3.getBucketVersioning(GetBucketVersioningRequest.builder().bucket(bucketName)
304+
.build());
295305

296-
//INCOMPATIBLE RESPONSE
297-
s3.getBucketWebsite(GetBucketWebsiteRequest.builder().bucket(bucketName)
298-
.build());
306+
GetBucketWebsiteResponse bucketWebsiteConfiguration =
307+
s3.getBucketWebsite(GetBucketWebsiteRequest.builder().bucket(bucketName)
308+
.build());
299309

300310
ResponseInputStream<GetObjectResponse> s3Object1 = s3.getObject(
301311
GetObjectRequest.builder().bucket(bucketName).key(objectKey)
@@ -311,12 +321,10 @@ public void requestconstructor() {
311321
GetObjectRequest getObjectRequestRequesterPaysFalse = GetObjectRequest.builder().bucket(bucketName).key(objectKey)
312322
.build();
313323

314-
//INCOMPATIBLE RESPONSE
315-
s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey)
324+
GetObjectAclResponse objectAcl = s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey)
316325
.build());
317326

318-
//INCOMPATIBLE RESPONSE
319-
s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey).versionId("3")
327+
GetObjectAclResponse objectAcl2 = s3.getObjectAcl(GetObjectAclRequest.builder().bucket(bucketName).key(objectKey).versionId("3")
320328
.build());
321329

322330
GetObjectLegalHoldResponse legalHoldResult = s3.getObjectLegalHold(
@@ -371,9 +379,7 @@ public void requestconstructor() {
371379
ListBucketMetricsConfigurationsRequest.builder()
372380
.build());
373381

374-
//INCOMPATIBLE RESPONSE
375-
s3.listBuckets(ListBucketsRequest.builder()
376-
.build());
382+
List<Bucket> buckets = s3.listBuckets().buckets();
377383

378384
ListObjectsResponse objectListing = s3.listObjects(
379385
ListObjectsRequest.builder()

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
3030
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
3131
import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
32-
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
3332
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
3433
import software.amazon.awssdk.services.s3.model.RequestPayer;
3534
import software.amazon.awssdk.services.s3.model.Tag;
@@ -44,8 +43,8 @@ void getObject(String bucket, String key, File file) throws Exception {
4443
.build());
4544
s3Object.close();
4645

47-
s3.getObject(GetObjectRequest.builder().bucket(bucket).key(key)
48-
.build(), file.toPath());
46+
GetObjectResponse objectMetadata = s3.getObject(GetObjectRequest.builder().bucket(bucket).key(key)
47+
.build(), file.toPath());
4948
}
5049

5150
void putObject_bucketKeyContent(String bucket, String key, String content) {
@@ -125,7 +124,6 @@ void putObjectSetters() {
125124
PutObjectRequest.builder().bucket("bucket").key("key").websiteRedirectLocation("location")
126125
.bucket("bucketName")
127126
.websiteRedirectLocation("redirectLocation")
128-
.acl(ObjectCannedACL.AWS_EXEC_READ)
129127
.tagging(objectTagging)
130128
.build();
131129
}

0 commit comments

Comments
 (0)