Skip to content

Fix missing space issue for ClientOverrideConfiguration #5323

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 1 commit into from
Jun 24, 2024
Merged

Fix missing space issue for ClientOverrideConfiguration #5323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions .../main/java/software/amazon/awssdk/migration/internal/recipe/HttpSettingsToHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex

@Override
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext executionContext) {
method = super.visitMethodInvocation(method, executionContext).cast();
method = super.visitMethodInvocation(method, executionContext);
if (isClientOverrideConfigurationBuilder(method)) {
return handleClientOverrideConfiguration(method, executionContext);
}
Expand Down Expand Up @@ -452,11 +452,14 @@ private JContainer<Expression> httpClientBuilderInvoke(Map<String, Expression> h

// select.getSelect: ClientOverrideConfiguration.builder()
J.MethodInvocation selectInvokeSelect = (J.MethodInvocation) selectInvoke.getSelect();
Space selectPrefix = selectInvoke.getPrefix();

// new method: ClientOverrideConfiguration.builder().aNonHttpSetting(xx)
method = method.withSelect(selectInvokeSelect).withPrefix(selectPrefix);
method = method.withSelect(selectInvokeSelect);
method = autoFormat(method, executionContext);

if (method.getSimpleName().equals("build")) {
method = method.withPrefix(Space.SINGLE_SPACE);
}
return method;
}

Expand Down
10 changes: 5 additions & 5 deletions ...ion-tool/src/test/java/software/amazon/awssdk/migration/recipe/ChangeConfigTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ void configurationWithHttpSettings_localVariable_shouldRemoveAndSetOnSdkClient()
+ "public class Example {\n"
+ "\n"
+ " public void test() {\n"
+ " ClientOverrideConfiguration clientConfiguration =ClientOverrideConfiguration.builder()\n"
+ " ClientOverrideConfiguration clientConfiguration = ClientOverrideConfiguration.builder()\n"
+ " .apiCallAttemptTimeout(Duration.ofMillis(1000)).build();\n"
+ "\n"
+ " SqsClient sqs = SqsClient.builder()\n"
Expand Down Expand Up @@ -202,7 +202,7 @@ void configurationWithHttpSettings_memberVariable_shouldRemoveAndSetOnSdkClient(
+ "import java.time.Duration;\n"
+ "\n"
+ "public class Example {\n"
+ " private ClientOverrideConfiguration clientConfiguration =ClientOverrideConfiguration.builder()\n"
+ " private ClientOverrideConfiguration clientConfiguration = ClientOverrideConfiguration.builder()\n"
+ " .apiCallAttemptTimeout(Duration.ofMillis(1000)).build();\n"
+ "\n"
+ " public void test() {\n"
Expand Down Expand Up @@ -259,7 +259,7 @@ void configurationWithHttpSettings_usedByMultipleSdkClients_shouldRemoveAndSetOn
+ "import java.time.Duration;\n"
+ "\n"
+ "public class Example {\n"
+ " private static final ClientOverrideConfiguration CONFIGURATION =ClientOverrideConfiguration.builder()\n"
+ " private static final ClientOverrideConfiguration CONFIGURATION = ClientOverrideConfiguration.builder()\n"
+ " .apiCallAttemptTimeout(Duration.ofMillis(1000)).build();\n"
+ " private final SqsClient sqsMemberVariable = SqsClient.builder()\n"
+ " .overrideConfiguration(CONFIGURATION)\n"
Expand Down Expand Up @@ -322,7 +322,7 @@ void configurationWithHttpSettings_methodReference_shouldRemoveAndSetOnSdkClient
+ "\n"
+ "public class Example {\n"
+ " public ClientOverrideConfiguration configuration() {\n"
+ " returnClientOverrideConfiguration.builder()\n"
+ " return ClientOverrideConfiguration.builder()\n"
+ " .apiCallAttemptTimeout(Duration.ofMillis(1000)).build();\n"
+ " }\n"
+ "\n"
Expand Down Expand Up @@ -433,7 +433,7 @@ void multipleSdkClients_shouldSetHttpClientCorrectly() {
+ "public class Example {\n"
+ "\n"
+ " public void test() {\n"
+ " ClientOverrideConfiguration clientConfiguration1 =ClientOverrideConfiguration.builder().build();\n"
+ " ClientOverrideConfiguration clientConfiguration1 = ClientOverrideConfiguration.builder().build();\n"
+ "\n"
+ " ClientOverrideConfiguration clientConfiguration2 = ClientOverrideConfiguration.builder().build();\n"
+ "\n"
Expand Down
4 changes: 2 additions & 2 deletions ...ool-tests/src/test/resources/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public static SqsClient defaultSqsClient() {
}

public static ClientOverrideConfiguration customClientConfiguration() {
ClientOverrideConfiguration clientConfiguration =ClientOverrideConfiguration.builder()
ClientOverrideConfiguration clientConfiguration = ClientOverrideConfiguration.builder()
.retryPolicy(RetryMode.STANDARD)
.apiCallTimeout(Duration.ofMillis(1000))
.apiCallAttemptTimeout(Duration.ofMillis(1001))
Expand Down Expand Up @@ -65,7 +65,7 @@ public static SqsAsyncClient defaultSqsAsyncClient() {

public static SqsAsyncClient sqsAsyncClientWithAllSettings() {

ClientOverrideConfiguration clientConfiguration =ClientOverrideConfiguration.builder()
ClientOverrideConfiguration clientConfiguration = ClientOverrideConfiguration.builder()
.retryPolicy(RetryMode.STANDARD)
.apiCallTimeout(Duration.ofMillis(2001))
.apiCallAttemptTimeout(Duration.ofMillis(2002))
Expand Down
Loading