Skip to content

Commit 8aa665c

Browse files
authored
Fix V1GetterToV2 to not change get method (#5338)
1 parent 84986d1 commit 8aa665c

File tree

5 files changed

+33
-3
lines changed

5 files changed

+33
-3
lines changed

migration-tool/src/main/java/software/amazon/awssdk/migration/internal/utils/NamingUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ public static boolean isSetter(String name) {
5959
}
6060

6161
public static boolean isGetter(String name) {
62-
return !StringUtils.isBlank(name) && name.startsWith("get");
62+
return !StringUtils.isBlank(name) && name.startsWith("get") && !name.equals("get");
6363
}
6464
}

migration-tool/src/test/java/software/amazon/awssdk/migration/internal/utils/NamingUtilsTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,20 @@ public void removeSet_empty_returnsValue() {
9191
public void removeWith_empty_returnsValue() {
9292
assertThat(NamingUtils.removeWith("")).isEqualTo("");
9393
}
94+
95+
@Test
96+
public void isGetter_startsWithGetter_returnsTrue() {
97+
assertThat(NamingUtils.isGetter("getFoo")).isTrue();
98+
}
99+
100+
@Test
101+
public void isGetter_equalsToGet_returnsFalse() {
102+
assertThat(NamingUtils.isGetter("get")).isFalse();
103+
}
104+
105+
@Test
106+
public void isGetter_emptyOrNull_returnsFalse() {
107+
assertThat(NamingUtils.isGetter("")).isFalse();
108+
assertThat(NamingUtils.isGetter(null)).isFalse();
109+
}
94110
}

migration-tool/src/test/java/software/amazon/awssdk/migration/recipe/V1GetterToV2Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ void v1ModelClassGetter_isRewrittenToFluent() {
3737
+ " ReceiveMessageRequest request = new ReceiveMessageRequest().withQueueUrl(\"url\");\n"
3838
+ " ReceiveMessageResult receiveMessage = sqs.receiveMessage(request);\n"
3939
+ " List<Message> messages = receiveMessage.getMessages();\n"
40+
+ " Message message = receiveMessage.getMessages().get(0);\n"
4041
+ " }\n"
4142
+ "}\n",
4243
"import software.amazon.awssdk.services.sqs.SqsClient;\n"
@@ -50,6 +51,7 @@ void v1ModelClassGetter_isRewrittenToFluent() {
5051
+ " ReceiveMessageRequest request = ReceiveMessageRequest.builder().queueUrl(\"url\").build();\n"
5152
+ " ReceiveMessageResponse receiveMessage = sqs.receiveMessage(request);\n"
5253
+ " List<Message> messages = receiveMessage.messages();\n"
54+
+ " Message message = receiveMessage.messages().get(0);\n"
5355
+ " }\n"
5456
+ "}"
5557
)

test/migration-tool-tests/src/test/resources/after/src/main/java/foo/bar/Application.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,21 @@ public static void main(String... args) {
4848
.nextToken("token").build();
4949

5050
try {
51+
5152
ListQueuesResponse listQueuesResult = sqs.listQueues(request);
53+
String queueUrl = listQueuesResult.queueUrls().get(0);
5254
String token = listQueuesResult.nextToken();
53-
System.out.println(listQueuesResult);
55+
System.out.println(queueUrl);
56+
System.out.println(token);
57+
5458
} catch (QueueDoesNotExistException exception) {
59+
5560
String errorCode = exception.awsErrorDetails().errorCode();
5661
String errorMessage = exception.awsErrorDetails().errorMessage();
5762
String requestId = exception.requestId();
5863
byte[] rawResponse = exception.awsErrorDetails().rawResponse().asByteArray();
5964
System.out.println(String.format("Error code: %s, message: %s, requestId: %s", errorCode, errorMessage, requestId));
65+
6066
} catch (SqsException exception) {
6167
System.out.println(String.format("Error code: %s. RequestId: %s. Raw response content: %s",
6268
exception.awsErrorDetails().errorCode(), exception.requestId(),

test/migration-tool-tests/src/test/resources/before/src/main/java/foo/bar/Application.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,21 @@ public static void main(String... args) {
4646
.withNextToken("token");
4747

4848
try {
49+
4950
ListQueuesResult listQueuesResult = sqs.listQueues(request);
51+
String queueUrl = listQueuesResult.getQueueUrls().get(0);
5052
String token = listQueuesResult.getNextToken();
51-
System.out.println(listQueuesResult);
53+
System.out.println(queueUrl);
54+
System.out.println(token);
55+
5256
} catch (QueueDoesNotExistException exception) {
57+
5358
String errorCode = exception.getErrorCode();
5459
String errorMessage = exception.getErrorMessage();
5560
String requestId = exception.getRequestId();
5661
byte[] rawResponse = exception.getRawResponse();
5762
System.out.println(String.format("Error code: %s, message: %s, requestId: %s", errorCode, errorMessage, requestId));
63+
5864
} catch (AmazonSQSException exception) {
5965
System.out.println(String.format("Error code: %s. RequestId: %s. Raw response content: %s",
6066
exception.getErrorCode(), exception.getRequestId(),

0 commit comments

Comments
 (0)