Skip to content

Change response types for POJOs that map one to many #6024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidh44 merged 6 commits into from
Apr 16, 2025
Merged

Change response types for POJOs that map one to many #6024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe32da4
Change response types for POJOs that map one to many
davidh44 Apr 10, 2025
a95fbe1
Fix copyright header
davidh44 Apr 10, 2025
157dd10
Use regular Amazon license header
davidh44 Apr 10, 2025
8bad2cd
Update source license comment
davidh44 Apr 11, 2025
bb259fd
Update source license comment
davidh44 Apr 14, 2025
cc3a37c
Merge branch 'master' into hdavidh/migration-tool-change-response-types
davidh44 Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...zon/awssdk/v2migrationtests/maven-nocompile/after/src/main/java/foo/bar/S3Transforms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ void s3Pojos() {
}

void setBucketAcl() {
/*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);
/*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);
}

void setObjectAcl() {
/*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);
/*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);
}

void upload_streamWithLiteralLength(S3TransferManager tm) {
Expand Down
2 changes: 1 addition & 1 deletion ...sources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
88 changes: 47 additions & 41 deletions ...mazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3RequestConstructor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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(
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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)
Expand All @@ -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(
Expand Down Expand Up @@ -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()
Expand Down
6 changes: 2 additions & 4 deletions ...oftware/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3Streaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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();
}
Expand Down
Loading
Loading