Refactor HttpSettingsToHttpClient to handler client builder without build invoked (#5406)

Author: zoewangg

test/v2-migration-tests/pom.xml

@@ -43,6 +43,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-sqs</artifactId>

test/v2-migration-tests/src/test/resources/gradle/after/src/main/java/gradletest/foo/bar/Library.java

@@ -21,7 +21,8 @@
 public class Library {
     public void someMethod() {
         DynamoDbClient dynamoDB = DynamoDbClient.builder().build();
-        CreateTableResponse createTableResult = dynamoDB.createTable(CreateTableRequest.builder().tableName("test").build());
+        CreateTableResponse createTableResult = dynamoDB.createTable(CreateTableRequest.builder().tableName("test")
+                .build());
         System.out.println(createTableResult);
     }
 }

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

@@ -45,7 +45,8 @@ public static void main(String... args) {
         ListQueuesRequest request = ListQueuesRequest.builder()
             .maxResults(5)
             .queueNamePrefix("MyQueue-")
-            .nextToken("token").build();
+            .nextToken("token")
+            .build();
 
         try {
 
@@ -65,8 +66,8 @@ public static void main(String... args) {
 
         } catch (SqsException exception) {
             System.out.println(String.format("Error code: %s. RequestId: %s. Raw response content: %s",
-                                             exception.awsErrorDetails().errorCode(), exception.requestId(),
-                                             exception.awsErrorDetails().rawResponse().asUtf8String()));
+                exception.awsErrorDetails().errorCode(), exception.requestId(),
+                exception.awsErrorDetails().rawResponse().asUtf8String()));
         } catch (AwsServiceException exception) {
             System.out.println(String.format("Error message: %s. Service Name: %s",
                                              exception.awsErrorDetails().errorMessage(), exception.awsErrorDetails().serviceName()));
@@ -76,7 +77,8 @@ public static void main(String... args) {
     }
 
     private static Path downloadFile(S3Client s3, String bucket, String key, Path dst) throws IOException {
-        GetObjectRequest getObject = GetObjectRequest.builder().bucket(bucket).key(key).build();
+        GetObjectRequest getObject = GetObjectRequest.builder().bucket(bucket).key(key)
+            .build();
 
         ResponseInputStream<GetObjectResponse> s3Object = s3.getObject(getObject);
 

test/v2-migration-tests/src/test/resources/maven/after/src/main/java/foo/bar/CredentialsDependencyFactory.java

@@ -31,7 +31,8 @@ private CredentialsDependencyFactory() {
     }
 
     public static AwsCredentialsProvider defaultCredentialsProviderChain() {
-        return DefaultCredentialsProvider.builder().build();
+        return DefaultCredentialsProvider.builder()
+            .build();
     }
 
     public static AwsCredentialsProvider environmentCredentialsProvider() {
@@ -43,7 +44,8 @@ public static AwsCredentialsProvider instanceProfileCredentialsProvider() {
     }
 
     public static AwsCredentialsProvider profileCredentialsProvider() {
-        return ProfileCredentialsProvider.builder().build();
+        return ProfileCredentialsProvider.builder()
+            .build();
     }
 
     public static AwsCredentialsProvider staticCredentialsProvider() {

test/v2-migration-tests/src/test/resources/maven/after/src/main/java/foo/bar/SdkClientsDependencyFactory.java

@@ -22,6 +22,8 @@
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.sqs.SqsClient;
+import software.amazon.awssdk.services.sqs.SqsClientBuilder;
+import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.SqsClient;
 
@@ -31,36 +33,48 @@ private SdkClientsDependencyFactory() {
     }
 
     public static SqsClient defaultSqsClient() {
-        return SqsClient.builder().build();
+        return SqsClient.builder()
+            .build();
     }
 
     public static ClientOverrideConfiguration customClientConfiguration() {
         ClientOverrideConfiguration clientConfiguration = ClientOverrideConfiguration.builder()
             .retryPolicy(RetryMode.STANDARD)
             .apiCallTimeout(Duration.ofMillis(1000))
             .apiCallAttemptTimeout(Duration.ofMillis(1001))
-            .putHeader("foo", "bar").build();
+            .putHeader("foo", "bar")
+            .build();
 
         return clientConfiguration;
     }
 
     public static SqsClient sqsClientWithAllSettings() {
         return SqsClient.builder()
-            .region(Region.of("us-west-2"))
-            .overrideConfiguration(customClientConfiguration())
+                .region(Region.of("us-west-2"))
+                .httpClientBuilder(ApacheHttpClient.builder()
+                    .connectionMaxIdleTime(Duration.ofMillis(1006))
+                    .tcpKeepAlive(true)
+                    .socketTimeout(Duration.ofMillis(1004))
+                    .connectionTimeToLive(Duration.ofMillis(1005))
+                    .connectionTimeout(Duration.ofMillis(1003))
+                    .maxConnections(1002))
+                .overrideConfiguration(customClientConfiguration())
             .credentialsProvider(CredentialsDependencyFactory.defaultCredentialsProviderChain())
-            .httpClientBuilder(ApacheHttpClient.builder()
-                .connectionMaxIdleTime(Duration.ofMillis(1006))
-                .tcpKeepAlive(true)
-                .socketTimeout(Duration.ofMillis(1004))
-                .connectionTimeToLive(Duration.ofMillis(1005))
-                .connectionTimeout(Duration.ofMillis(1003))
-                .maxConnections(1002))
             .build();
     }
 
+    public static SqsClientBuilder sqsClientBuilder() {
+        ClientOverrideConfiguration configuration = ClientOverrideConfiguration.builder()
+            .build();
+        return SqsClient.builder()
+            .httpClientBuilder(ApacheHttpClient.builder()
+                .maxConnections(500))
+            .overrideConfiguration(configuration);
+    }
+
     public static SqsAsyncClient defaultSqsAsyncClient() {
-        return SqsAsyncClient.builder().build();
+        return SqsAsyncClient.builder()
+            .build();
     }
 
     public static SqsAsyncClient sqsAsyncClientWithAllSettings() {
@@ -69,14 +83,15 @@ public static SqsAsyncClient sqsAsyncClientWithAllSettings() {
             .retryPolicy(RetryMode.STANDARD)
             .apiCallTimeout(Duration.ofMillis(2001))
             .apiCallAttemptTimeout(Duration.ofMillis(2002))
-            .putHeader("hello", "world").build();
+            .putHeader("hello", "world")
+            .build();
 
         return SqsAsyncClient.builder()
             .region(Region.US_WEST_2)
             .credentialsProvider(CredentialsDependencyFactory.defaultCredentialsProviderChain())
-            .overrideConfiguration(clientConfiguration)
             .httpClientBuilder(NettyNioAsyncHttpClient.builder()
                 .connectionTimeout(Duration.ofMillis(2004)))
+            .overrideConfiguration(clientConfiguration)
             .build();
     }
 }

test/v2-migration-tests/src/test/resources/maven/before/src/main/java/foo/bar/SdkClientsDependencyFactory.java

@@ -22,6 +22,7 @@
 import com.amazonaws.services.sqs.AmazonSQSAsync;
 import com.amazonaws.services.sqs.AmazonSQSAsyncClient;
 import com.amazonaws.services.sqs.AmazonSQSClient;
+import com.amazonaws.services.sqs.AmazonSQSClientBuilder;
 
 public final class SdkClientsDependencyFactory {
 
@@ -56,6 +57,12 @@ public static AmazonSQS sqsClientWithAllSettings() {
                               .build();
     }
 
+    public static AmazonSQSClientBuilder sqsClientBuilder() {
+        ClientConfiguration configuration = new ClientConfiguration().withMaxConnections(500);
+        return AmazonSQSClient.builder()
+                              .withClientConfiguration(configuration);
+    }
+
     public static AmazonSQSAsync defaultSqsAsyncClient() {
         return new AmazonSQSAsyncClient();
     }