Skip to content

Transform defaultClient to create #5374

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
merged 2 commits into from
Jul 9, 2024
Merged

Transform defaultClient to create #5374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90dbd1d
Transform defaultClient to create
davidh44 Jul 8, 2024
8f8367c
Fix return type and spacing
davidh44 Jul 8, 2024
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
29 changes: 20 additions & 9 deletions ...src/main/java/software/amazon/awssdk/migration/recipe/V1BuilderVariationsToV2Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
}

if (isV2ClientBuilder(selectType)) {
return renameStandardToBuilder(method, selectType);
return renameStandardToBuilderOrDefaultClientToCreate(method, selectType);
}

return method;
Expand All @@ -90,18 +90,29 @@ private static boolean shouldChangeMethod(JavaType selectType) {
return isV2ClientBuilder(selectType) || isV2AsyncClientClass(selectType);
}

private J.MethodInvocation renameStandardToBuilder(J.MethodInvocation method, JavaType selectType) {
private J.MethodInvocation renameStandardToBuilderOrDefaultClientToCreate(J.MethodInvocation method,
JavaType selectType) {
String methodName = method.getSimpleName();
JavaType.Method mt = method.getMethodType();
JavaType.FullyQualified fullyQualified = TypeUtils.asFullyQualified(selectType);

if (mt == null || !"standard".equals(methodName) || fullyQualified == null) {
if (mt == null || fullyQualified == null) {
return method;
}

methodName = "builder";

JavaType.FullyQualified v2Client = SdkTypeUtils.v2ClientFromClientBuilder(fullyQualified);
JavaType.FullyQualified returnType;

if ("standard".equals(methodName)) {
methodName = "builder";
returnType = fullyQualified;
} else if ("defaultClient".equals(methodName)) {
methodName = "create";
returnType = v2Client;
} else {
return method;
}

J.Identifier id = new J.Identifier(
Tree.randomId(),
Space.EMPTY,
Expand All @@ -112,7 +123,7 @@ private J.MethodInvocation renameStandardToBuilder(J.MethodInvocation method, Ja
null
);

J.Identifier builderMethod = new J.Identifier(
J.Identifier builderOrCreateMethod = new J.Identifier(
Tree.randomId(),
Space.EMPTY,
Markers.EMPTY,
Expand All @@ -127,7 +138,7 @@ private J.MethodInvocation renameStandardToBuilder(J.MethodInvocation method, Ja
0L,
v2Client,
methodName,
v2Client,
returnType,
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList(),
Expand All @@ -136,11 +147,11 @@ private J.MethodInvocation renameStandardToBuilder(J.MethodInvocation method, Ja

J.MethodInvocation builderInvoke = new J.MethodInvocation(
Tree.randomId(),
Space.EMPTY,
method.getPrefix(),
Markers.EMPTY,
JRightPadded.build(id),
null,
builderMethod,
builderOrCreateMethod,
JContainer.empty(),
methodType
);
Expand Down
107 changes: 105 additions & 2 deletions ...test/java/software/amazon/awssdk/migration/recipe/V1BuilderVariationsToV2BuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void asyncClient_useAsyncBuilder_shouldRewrite() {

@Test
@EnabledOnJre({JRE.JAVA_8})
public void syncClientBuilder_useStandardBuilder_shouldRewrite() {
public void syncClientBuilder_useStandardBuilderWithBuild_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
Expand All @@ -86,7 +86,7 @@ public void syncClientBuilder_useStandardBuilder_shouldRewrite() {

@Test
@EnabledOnJre({JRE.JAVA_8})
public void asyncClientBuilder_useStandardBuilder_shouldRewrite() {
public void asyncClientBuilder_useStandardBuilderWithBuild_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
Expand All @@ -108,4 +108,107 @@ public void asyncClientBuilder_useStandardBuilder_shouldRewrite() {
)
);
}

@Test
@EnabledOnJre({JRE.JAVA_8})
public void syncClientBuilder_useStandardBuilderWithoutBuild_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
"import com.amazonaws.services.sqs.AmazonSQS;\n"
+ "import com.amazonaws.services.sqs.AmazonSQSClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AmazonSQSClientBuilder sqs = AmazonSQSClientBuilder.standard();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.services.sqs.SqsClient;\n"
+ "import software.amazon.awssdk.services.sqs.SqsClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " SqsClientBuilder sqs = SqsClient.builder();\n"
+ " }\n"
+ "}"
)
);
}

@Test
@EnabledOnJre({JRE.JAVA_8})
public void asyncClientBuilder_useStandardBuilderWithoutBuild_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
"import com.amazonaws.services.sqs.AmazonSQSAsync;\n"
+ "import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AmazonSQSAsyncClientBuilder sqs = AmazonSQSAsyncClientBuilder.standard();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.services.sqs.SqsAsyncClient;\n"
+ "import software.amazon.awssdk.services.sqs.SqsAsyncClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " SqsAsyncClientBuilder sqs = SqsAsyncClient.builder();\n"
+ " }\n"
+ "}"
)
);
}


@Test
@EnabledOnJre({JRE.JAVA_8})
public void syncClientBuilder_useCreate_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
"import com.amazonaws.services.sqs.AmazonSQS;\n"
+ "import com.amazonaws.services.sqs.AmazonSQSClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AmazonSQS sqs = AmazonSQSClientBuilder.defaultClient();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.services.sqs.SqsClient;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " SqsClient sqs = SqsClient.create();\n"
+ " }\n"
+ "}"
)
);
}

@Test
@EnabledOnJre({JRE.JAVA_8})
public void asyncClientBuilder_useCreate_shouldRewrite() {
rewriteRun(
recipeSpec -> recipeSpec.expectedCyclesThatMakeChanges(2),
java(
"import com.amazonaws.services.sqs.AmazonSQSAsync;\n"
+ "import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " AmazonSQSAsync sqs = AmazonSQSAsyncClientBuilder.defaultClient();\n"
+ " }\n"
+ "}\n",
"import software.amazon.awssdk.services.sqs.SqsAsyncClient;\n"
+ "\n"
+ "public class Example {\n"
+ " public static void main(String[] args) {\n"
+ " SqsAsyncClient sqs = SqsAsyncClient.create();\n"
+ " }\n"
+ "}"
)
);
}
}
Loading