replace httpclient.execute call with httpclient.executeOpen as mentioned in deprecation notes of httpclient.execute

Author: joviegas

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java

@@ -39,6 +39,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
+import org.apache.hc.client5.http.ClientProtocolException;
 import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
 import org.apache.hc.client5.http.DnsResolver;
 import org.apache.hc.client5.http.auth.AuthSchemeFactory;
@@ -54,9 +55,11 @@
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.routing.HttpRoutePlanner;
+import org.apache.hc.client5.http.routing.RoutingSupport;
 import org.apache.hc.client5.http.ssl.DefaultHostnameVerifier;
 import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
+import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -275,14 +278,23 @@ private HttpExecuteResponse execute(HttpUriRequestBase apacheRequest, MetricColl
         HttpClientContext localRequestContext = Apache5Utils.newClientContext(requestConfig.proxyConfiguration());
         THREAD_LOCAL_REQUEST_METRIC_COLLECTOR.set(metricCollector);
         try {
-            HttpResponse httpResponse = httpClient.execute(apacheRequest, localRequestContext);
-            // Create a connection-aware input stream that closes the response when closed
+            HttpHost target = determineTarget(apacheRequest);
+            ClassicHttpResponse httpResponse = httpClient.executeOpen(target, apacheRequest, localRequestContext);
             return createResponse(httpResponse, apacheRequest);
         } finally {
             THREAD_LOCAL_REQUEST_METRIC_COLLECTOR.remove();
         }
     }
 
+    private static HttpHost determineTarget(final ClassicHttpRequest request) throws IOException {
+        try {
+            return RoutingSupport.determineHost(request);
+        } catch (final HttpException ex) {
+            throw new ClientProtocolException(ex);
+        }
+    }
+
+
     private HttpUriRequestBase toApacheRequest(HttpExecuteRequest request) {
         return apacheHttpRequestFactory.create(request, requestConfig);
     }

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/internal/impl/Apache5SdkHttpClient.java

@@ -65,6 +65,11 @@ public ClassicHttpResponse execute(HttpHost target, ClassicHttpRequest request)
         return delegate.execute(target, request);
     }
 
+    @Override
+    public ClassicHttpResponse executeOpen(HttpHost target, ClassicHttpRequest request, HttpContext context) throws IOException {
+        return delegate.executeOpen(target, request, context);
+    }
+
     @Override
     public HttpResponse execute(HttpHost target, ClassicHttpRequest request, HttpContext context) throws IOException {
         return delegate.execute(target, request, context);

http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/MetricReportingTest.java

@@ -30,11 +30,7 @@
 import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.core5.http.ClassicHttpResponse;
-import org.apache.hc.core5.http.HttpVersion;
-import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
-import org.apache.hc.core5.http.message.BasicHttpResponse;
 import org.apache.hc.core5.http.protocol.HttpContext;
 import org.apache.hc.core5.pool.PoolStats;
 import org.junit.Before;
@@ -43,7 +39,6 @@
 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.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpMethod;
 import software.amazon.awssdk.http.apache5.internal.Apache5HttpRequestConfig;
@@ -63,16 +58,20 @@ public class MetricReportingTest {
 
     @Before
     public void methodSetup() throws IOException {
+        // Create a response that can be reused
+        BasicClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
 
-        when(mockHttpClient.execute(any(HttpUriRequest.class), any(HttpContext.class)))
-            .thenReturn(new BasicClassicHttpResponse(200, "OK"));
+        // Mock executeOpen which is now being used
+        when(mockHttpClient.executeOpen(any(), any(HttpUriRequest.class), any(HttpContext.class)))
+            .thenReturn(response);
 
         when(mockHttpClient.getHttpClientConnectionManager()).thenReturn(cm);
 
         PoolStats stats = new PoolStats(1, 2, 3, 4);
         when(cm.getTotalStats()).thenReturn(stats);
     }
 
+
     @Test
     public void prepareRequest_callableCalled_metricsReported() throws IOException {
         Apache5HttpClient client = newClient();
@@ -117,11 +116,11 @@ private Apache5HttpClient newClient() {
     }
 
     private HttpExecuteRequest newRequest(MetricCollector collector) {
-        final SdkHttpFullRequest sdkRequest = SdkHttpFullRequest.builder()
-                .method(SdkHttpMethod.HEAD)
-                .host("amazonaws.com")
-                .protocol("https")
-                .build();
+        SdkHttpFullRequest sdkRequest = SdkHttpFullRequest.builder()
+                                                                .method(SdkHttpMethod.HEAD)
+                                                                .host("amazonaws.com")
+                                                                .protocol("https")
+                                                                .build();
         return HttpExecuteRequest.builder()
                                  .request(sdkRequest)
                                  .metricCollector(collector)