Update to use PoolingHttpClientConnectionManager class reference that is implementation of HttpClientConnectionManager

Author: joviegas

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

@@ -152,7 +152,7 @@ private ConnectionManagerAwareHttpClient createClient(Apache5HttpClient.DefaultB
         // Note that it is important we register the original connection manager with the
         // IdleConnectionReaper as it's required for the successful deregistration of managers
         // from the reaper. See https://github.com/aws/aws-sdk-java/issues/722.
-        HttpClientConnectionManager cm = cmFactory.create(configuration, standardOptions);
+        PoolingHttpClientConnectionManager cm = cmFactory.create(configuration, standardOptions);
 
         Registry<AuthSchemeFactory> authSchemeRegistry = configuration.authSchemeRegistry ;
         if (authSchemeRegistry != null) {
@@ -689,7 +689,7 @@ public SdkHttpClient buildWithDefaults(AttributeMap serviceDefaults) {
 
     private static class ApacheConnectionManagerFactory {
 
-        public HttpClientConnectionManager create(Apache5HttpClient.DefaultBuilder configuration,
+        public PoolingHttpClientConnectionManager create(Apache5HttpClient.DefaultBuilder configuration,
                                                   AttributeMap standardOptions) {
             // TODO : Deprecated method needs to be removed with new replacements
             SSLConnectionSocketFactory sslsf = getPreferredSocketFactory(configuration, standardOptions);

http-clients/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/internal/conn/IdleConnectionReaper.java

@@ -22,8 +22,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Supplier;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
-import org.apache.hc.core5.io.CloseMode;
+import org.apache.hc.core5.util.TimeValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.SdkInternalApi;
@@ -38,7 +39,7 @@ public final class IdleConnectionReaper {
 
     private static final IdleConnectionReaper INSTANCE = new IdleConnectionReaper();
 
-    private final Map<HttpClientConnectionManager, Long> connectionManagers;
+    private final Map<PoolingHttpClientConnectionManager, Long> connectionManagers;
 
     private final Supplier<ExecutorService> executorServiceSupplier;
 
@@ -64,7 +65,7 @@ private IdleConnectionReaper() {
     }
 
     @SdkTestInternalApi
-    IdleConnectionReaper(Map<HttpClientConnectionManager, Long> connectionManagers,
+    IdleConnectionReaper(Map<PoolingHttpClientConnectionManager, Long> connectionManagers,
                          Supplier<ExecutorService> executorServiceSupplier,
                          long sleepPeriod) {
 
@@ -81,7 +82,7 @@ private IdleConnectionReaper() {
      * @return {@code true} If the connection manager was not previously registered with this reaper, {@code false}
      * otherwise.
      */
-    public synchronized boolean registerConnectionManager(HttpClientConnectionManager manager, long maxIdleTime) {
+    public synchronized boolean registerConnectionManager(PoolingHttpClientConnectionManager manager, long maxIdleTime) {
         boolean notPreviouslyRegistered = connectionManagers.put(manager, maxIdleTime) == null;
         setupExecutorIfNecessary();
         return notPreviouslyRegistered;
@@ -133,12 +134,12 @@ private void cleanupExecutorIfNecessary() {
     }
 
     private static final class ReaperTask implements Runnable {
-        private final Map<HttpClientConnectionManager, Long> connectionManagers;
+        private final Map<PoolingHttpClientConnectionManager, Long> connectionManagers;
         private final long sleepPeriod;
 
         private volatile boolean stopping = false;
 
-        private ReaperTask(Map<HttpClientConnectionManager, Long> connectionManagers,
+        private ReaperTask(Map<PoolingHttpClientConnectionManager, Long> connectionManagers,
                            long sleepPeriod) {
             this.connectionManagers = connectionManagers;
             this.sleepPeriod = sleepPeriod;
@@ -150,11 +151,9 @@ public void run() {
                 try {
                     Thread.sleep(sleepPeriod);
 
-                    for (Map.Entry<HttpClientConnectionManager, Long> entry : connectionManagers.entrySet()) {
+                    for (Map.Entry<PoolingHttpClientConnectionManager, Long> entry : connectionManagers.entrySet()) {
                         try {
-                            entry.getKey().close(CloseMode.GRACEFUL);
-                            // Set idle connections
-                            // entry.getKey().closeIdleConnections(entry.getValue(), TimeUnit.MILLISECONDS);
+                            entry.getKey().closeIdle(TimeValue.ofMilliseconds(entry.getValue()));
                         } catch (Exception t) {
                             log.warn("Unable to close idle connections", t);
                         }

http-clients/apache5-client/src/test/java/software/amazon/awssdk/http/apache5/internal/conn/IdleConnectionReaperTest.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.http.apache5.internal.conn;
 
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.core5.io.CloseMode;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -28,6 +29,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.apache.hc.client5.http.io.HttpClientConnectionManager;
+import org.apache.hc.core5.util.TimeValue;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,13 +43,13 @@
 public class IdleConnectionReaperTest {
     private static final long SLEEP_PERIOD = 250;
 
-    private final Map<HttpClientConnectionManager, Long> connectionManagers = new HashMap<>();
+    private final Map<PoolingHttpClientConnectionManager, Long> connectionManagers = new HashMap<>();
 
     @Mock
     public ExecutorService executorService;
 
     @Mock
-    public HttpClientConnectionManager connectionManager;
+    public PoolingHttpClientConnectionManager connectionManager;
 
     private IdleConnectionReaper idleConnectionReaper;
 
@@ -88,8 +90,7 @@ public void testReapsConnections() throws InterruptedException {
         reaper.registerConnectionManager(connectionManager, idleTime);
         try {
             Thread.sleep(SLEEP_PERIOD * 2);
-            //  TODO : need to validate this in future PR
-            verify(connectionManager, atLeastOnce()).close(CloseMode.GRACEFUL);
+            verify(connectionManager, atLeastOnce()).closeIdle(any(TimeValue.class));
         } finally {
             reaper.deregisterConnectionManager(connectionManager);
         }