From 07b5e979cc9796d70ef6e0cd63c10e649cc22192 Mon Sep 17 00:00:00 2001 From: yibole Date: Tue, 18 Mar 2025 12:44:45 -0700 Subject: [PATCH] added special case to handle bucketName --- .../maven/after/src/main/java/foo/bar/S3.java | 5 +++++ .../maven/before/src/main/java/foo/bar/S3.java | 5 +++++ .../software/amazon/awssdk/v2migration/V1SetterToV2.java | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java index 799ae6d338e8..ead09d91e6fc 100644 --- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java +++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/after/src/main/java/foo/bar/S3.java @@ -375,4 +375,9 @@ private void setBucketConfigs(S3Client s3, String bucket) { .build()) .build()); } + + private void setBucketNameTest(S3Client s3, String bucket) { + GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucket).key("key").bucket(bucket) + .build(); + } } \ No newline at end of file diff --git a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3.java b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3.java index 42c0ceb6129e..57fa63671eb0 100644 --- a/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3.java +++ b/test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven/before/src/main/java/foo/bar/S3.java @@ -35,6 +35,7 @@ import com.amazonaws.services.s3.model.DeleteBucketRequest; 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.HeadBucketRequest; import com.amazonaws.services.s3.model.HeadBucketResult; import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest; @@ -235,4 +236,8 @@ private void setBucketConfigs(AmazonS3 s3, String bucket) { s3.setBucketTaggingConfiguration(bucket, new BucketTaggingConfiguration()); s3.setBucketWebsiteConfiguration(bucket, new BucketWebsiteConfiguration()); } + + private void setBucketNameTest(AmazonS3 s3, String bucket) { + GetObjectRequest getObjectRequest = new GetObjectRequest(bucket, "key").withBucketName(bucket); + } } \ No newline at end of file diff --git a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1SetterToV2.java b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1SetterToV2.java index 4f608bb7713d..e5cbfeb8c9b3 100644 --- a/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1SetterToV2.java +++ b/v2-migration/src/main/java/software/amazon/awssdk/v2migration/V1SetterToV2.java @@ -102,6 +102,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation previousMetho methodName = NamingUtils.removeSet(methodName); } + if ("bucketName".equals(methodName)) { + methodName = "bucket"; + } + if (isClientBuilderClass(methodType)) { methodName = CLIENT_CONFIG_NAMING_MAPPING.getOrDefault(methodName, methodName); }