Merge Apache 5.x Preview to Master

.brazil.json

@@ -4,6 +4,7 @@
     "modules": {
         "annotations": { "packageName": "AwsJavaSdk-Core-Annotations" },
         "apache-client": { "packageName": "AwsJavaSdk-HttpClient-ApacheClient" },
+        "apache5-client": { "packageName": "AwsJavaSdk-HttpClient-Apache5Client" },
         "arns": { "packageName": "AwsJavaSdk-Core-Arns" },
         "auth": { "packageName": "AwsJavaSdk-Core-Auth" },
         "auth-crt": { "packageName": "AwsJavaSdk-Core-AuthCrt" },
@@ -140,7 +141,9 @@
         "io.netty:netty-transport-classes-epoll": { "packageName": "Netty4", "packageVersion": "4.1" },
         "io.netty:netty-transport-native-unix-common": { "packageName": "Netty4", "packageVersion": "4.1" },
         "org.apache.httpcomponents:httpclient": { "packageName": "Apache-HttpComponents-HttpClient", "packageVersion": "4.5.x" },
+        "org.apache.httpcomponents.client5:httpclient5": { "packageName": "Apache-HttpComponents-HttpClient5", "packageVersion": "5.0.x" },
         "org.apache.httpcomponents:httpcore": { "packageName": "Apache-HttpComponents-HttpCore", "packageVersion": "4.4.x" },
+        "org.apache.httpcomponents.core5:httpcore5": { "packageName": "Apache-HttpComponents-HttpCore5", "packageVersion": "5.0.x" },
         "org.eclipse.jdt:org.eclipse.jdt.core": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.eclipse.text:org.eclipse.text": { "packageName": "AwsJavaSdk-Codegen-EclipseJdtDependencies", "packageVersion": "2.0" },
         "org.reactivestreams:reactive-streams": { "packageName": "Maven-org-reactivestreams_reactive-streams", "packageVersion": "1.x" },

.changes/next-release/feature-AWSSDKforJavav2-65d4de2.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Preview Release of AWS SDK Apache5 HttpClient with Apache HttpClient 5.5.x"
+}

bom-internal/pom.xml

@@ -94,6 +94,16 @@
                 <artifactId>httpcore</artifactId>
                 <version>${httpcomponents.httpcore.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.client5</groupId>
+                <artifactId>httpclient5</artifactId>
+                <version>${httpcomponents.client5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5</artifactId>
+                <version>${httpcomponents.core5.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>

bom/pom.xml

@@ -192,6 +192,11 @@
                 <artifactId>apache-client</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>apache5-client</artifactId>
+                <version>${awsjavasdk.version}-PREVIEW</version>
+            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>netty-nio-client</artifactId>

build-tools/src/main/resources/software/amazon/awssdk/spotbugs-suppressions.xml

@@ -285,6 +285,7 @@
             <Class name="software.amazon.awssdk.core.util.DefaultSdkAutoConstructMap"/>
             <Class name="software.amazon.awssdk.http.nio.netty.internal.http2.FlushOnReadHandler"/>
             <Class name="software.amazon.awssdk.http.apache.internal.conn.IdleConnectionReaper"/>
+            <Class name="software.amazon.awssdk.http.apache5.internal.conn.IdleConnectionReaper"/>
             <Class name="software.amazon.awssdk.eventnotifications.s3.internal.DefaultS3EventNotificationWriter"/>
             <Class name="software.amazon.awssdk.policybuilder.iam.internal.DefaultIamPolicyWriter"/>
         </Or>
@@ -337,6 +338,7 @@
             <Class name="~software\.amazon\.awssdk\.utils\.CompletableFutureUtils" />
             <Class name="~software\.amazon\.awssdk\.metrics\.publishers\.cloudwatch\.CloudWatchMetricPublisher" />
             <Class name="~software\.amazon\.awssdk\.http\.apache\.internal\.conn\.IdleConnectionReaper\$ReaperTask" />
+            <Class name="~software\.amazon\.awssdk\.http\.apache5\.internal\.conn\.IdleConnectionReaper\$ReaperTask" />
             <Class name="~software\.amazon\.awssdk\.core\.internal\.retry\.RateLimitingTokenBucket" />
             <Class name="~software\.amazon\.awssdk\.core\.internal\.waiters\.WaiterExecutor" />
             <Class name="~software\.amazon\.awssdk\.regions\.internal\.util\.EC2MetadataUtils" />

http-clients/apache-client/pom.xml

@@ -92,6 +92,42 @@
             <artifactId>wiremock-jre8</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Added for WIRE logging details while testing-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>test</scope>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheClientTlsAuthTest.java

@@ -83,6 +83,7 @@ public static void setUp() throws IOException {
 
         wireMockServer = new WireMockServer(wireMockConfig()
                 .dynamicHttpsPort()
+                .dynamicPort()
                 .needClientAuth(true)
                 .keystorePath(serverKeyStore.toAbsolutePath().toString())
                 .keystorePassword(STORE_PASSWORD)

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientLocalAddressFunctionalTest.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package software.amazon.awssdk.http.apache;
+
+import java.net.InetAddress;
+import java.time.Duration;
+import org.junit.jupiter.api.DisplayName;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.SdkHttpClientLocalAddressFunctionalTestSuite;
+
+@DisplayName("Apache HTTP Client - Local Address Functional Tests")
+class ApacheHttpClientLocalAddressFunctionalTest extends SdkHttpClientLocalAddressFunctionalTestSuite {
+
+    @Override
+    protected SdkHttpClient createHttpClient(InetAddress localAddress, Duration connectionTimeout) {
+        return ApacheHttpClient.builder()
+                               .localAddress(localAddress)
+                               .connectionTimeout(connectionTimeout)
+                               .build();
+    }
+}

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientUriNormalizationTest.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.apache;
+
+import software.amazon.awssdk.http.HttpClientUriNormalizationTestSuite;
+import software.amazon.awssdk.http.SdkHttpClient;
+
+public class ApacheHttpClientUriNormalizationTest extends HttpClientUriNormalizationTestSuite {
+
+
+    @Override
+    protected SdkHttpClient createSdkHttpClient() {
+        return ApacheHttpClient.create();
+    }
+}
+

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientUriSanitizationTest.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.http.apache;
+
+
+import org.junit.jupiter.api.DisplayName;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.SdkHttpClientUriSanitizationTestSuite;
+
+@DisplayName("Apache HTTP Client - URI Sanitization Tests")
+class ApacheHttpClientUriSanitizationTest extends SdkHttpClientUriSanitizationTestSuite {
+
+    @Override
+    protected SdkHttpClient createHttpClient() {
+        return ApacheHttpClient.create();
+    }
+}

http-clients/apache-client/src/test/java/software/amazon/awssdk/http/apache/ApacheHttpClientWireMockTest.java

@@ -19,6 +19,8 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
@@ -46,13 +48,15 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import software.amazon.awssdk.http.HttpExecuteRequest;
+import software.amazon.awssdk.http.HttpExecuteResponse;
 import software.amazon.awssdk.http.SdkHttpClient;
 import software.amazon.awssdk.http.SdkHttpClientTestSuite;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.apache.internal.ApacheHttpRequestConfig;
 import software.amazon.awssdk.http.apache.internal.impl.ConnectionManagerAwareHttpClient;
 import software.amazon.awssdk.utils.AttributeMap;
+import software.amazon.awssdk.utils.IoUtils;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ApacheHttpClientWireMockTest extends SdkHttpClientTestSuite {
@@ -179,6 +183,45 @@ public void explicitNullDnsResolver_WithLocalhost_successful() throws Exception
         overrideDnsResolver("localhost", true);
     }
 
+    @Test
+    public void handlesVariousContentLengths() throws Exception {
+        SdkHttpClient client = createSdkHttpClient();
+        int[] contentLengths = {0, 1, 100, 1024, 65536};
+
+        for (int length : contentLengths) {
+            String path = "/content-length-" + length;
+            byte[] body = new byte[length];
+            for (int i = 0; i < length; i++) {
+                body[i] = (byte) ('A' + (i % 26));
+            }
+
+            mockServer.stubFor(any(urlPathEqualTo(path))
+                                   .willReturn(aResponse()
+                                                   .withStatus(200)
+                                                   .withHeader("Content-Length", String.valueOf(length))
+                                                   .withBody(body)));
+
+            SdkHttpFullRequest req = mockSdkRequest("http://localhost:" + mockServer.port() + path, SdkHttpMethod.GET);
+            HttpExecuteResponse rsp = client.prepareRequest(HttpExecuteRequest.builder()
+                                                                              .request(req)
+                                                                              .build())
+                                            .call();
+
+            assertThat(rsp.httpResponse().statusCode()).isEqualTo(200);
+
+            if (length == 0) {
+                // Empty body should still have a response body present, but EOF immediately
+                if (rsp.responseBody().isPresent()) {
+                    assertThat(rsp.responseBody().get().read()).isEqualTo(-1);
+                }
+            } else {
+                assertThat(rsp.responseBody()).isPresent();
+                byte[] readBody = IoUtils.toByteArray(rsp.responseBody().get());
+                assertThat(readBody).isEqualTo(body);
+            }
+        }
+    }
+
     private void overrideDnsResolver(String hostName) throws IOException {
         overrideDnsResolver(hostName, false);
     }
@@ -223,4 +266,23 @@ public InetAddress[] resolve(final String host) throws UnknownHostException {
 
         mockProxyServer.verify(1, RequestPatternBuilder.allRequests());
     }
+
+    @Test
+    public void closeReleasesResources() throws Exception {
+        SdkHttpClient client = createSdkHttpClient();
+        // Make a successful request first
+        stubForMockRequest(200);
+        SdkHttpFullRequest request = mockSdkRequest("http://localhost:" + mockServer.port(), SdkHttpMethod.POST);
+        HttpExecuteResponse response = client.prepareRequest(
+            HttpExecuteRequest.builder().request(request).build()).call();
+        response.responseBody().ifPresent(IoUtils::drainInputStream);
+        // Close the client
+        client.close();
+        // Verify subsequent requests fail
+        assertThatThrownBy(() -> {
+            client.prepareRequest(HttpExecuteRequest.builder().request(request).build()).call();
+        }).isInstanceOfAny(
+            IllegalStateException.class
+        ).hasMessageContaining("Connection pool shut down");
+    }
 }