Skip to content

Commit b005f25

Browse files
authored
added special case to handle bucketName (#5971)
1 parent a8893a4 commit b005f25

File tree

3 files changed

+14
-0
lines changed
  • test/v2-migration-tests/src/test/resources/software/amazon/awssdk/v2migrationtests/maven
  • v2-migration/src/main/java/software/amazon/awssdk/v2migration

3 files changed

+14
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,4 +375,9 @@ private void setBucketConfigs(S3Client s3, String bucket) {
375375
.build())
376376
.build());
377377
}
378+
379+
private void setBucketNameTest(S3Client s3, String bucket) {
380+
GetObjectRequest getObjectRequest = GetObjectRequest.builder().bucket(bucket).key("key").bucket(bucket)
381+
.build();
382+
}
378383
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import com.amazonaws.services.s3.model.DeleteBucketRequest;
3636
import com.amazonaws.services.s3.model.GetBucketCrossOriginConfigurationRequest;
3737
import com.amazonaws.services.s3.model.GetObjectMetadataRequest;
38+
import com.amazonaws.services.s3.model.GetObjectRequest;
3839
import com.amazonaws.services.s3.model.HeadBucketRequest;
3940
import com.amazonaws.services.s3.model.HeadBucketResult;
4041
import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
@@ -235,4 +236,8 @@ private void setBucketConfigs(AmazonS3 s3, String bucket) {
235236
s3.setBucketTaggingConfiguration(bucket, new BucketTaggingConfiguration());
236237
s3.setBucketWebsiteConfiguration(bucket, new BucketWebsiteConfiguration());
237238
}
239+
240+
private void setBucketNameTest(AmazonS3 s3, String bucket) {
241+
GetObjectRequest getObjectRequest = new GetObjectRequest(bucket, "key").withBucketName(bucket);
242+
}
238243
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation previousMetho
102102
methodName = NamingUtils.removeSet(methodName);
103103
}
104104

105+
if ("bucketName".equals(methodName)) {
106+
methodName = "bucket";
107+
}
108+
105109
if (isClientBuilderClass(methodType)) {
106110
methodName = CLIENT_CONFIG_NAMING_MAPPING.getOrDefault(methodName, methodName);
107111
}

0 commit comments

Comments
 (0)