[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnect...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Oct 16 20:24:44 2013
New Revision: 461

URL: http://svn.shibboleth.net/view/utilities?rev=461&view=rev
Log:
Rework IdleConnectionSweeper to take an HttpClientConnectionManager as an input, rather than HttpClient.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java?rev=461&r1=460&r2=461&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java Wed Oct 16 20:24:44 2013
@@ -27,9 +27,9 @@
 import net.shibboleth.utilities.java.support.component.DestructableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.apache.http.client.HttpClient;
+import org.apache.http.conn.HttpClientConnectionManager;
 
-/** A utility that periodically closes idle connections held by a {@link HttpClient}. */
+/** A utility that periodically closes idle connections held by an {@link HttpClientConnectionManager}. */
 public class IdleConnectionSweeper implements DestructableComponent {
 
     /** Whether this sweeper has been destroyed. */
@@ -41,8 +41,8 @@
      */
     private boolean createdTimer;
 
-    /** Client whose connections will be swept. */
-    private final HttpClient client;
+    /** HttpClientConnectionManager whose connections will be swept. */
+    private final HttpClientConnectionManager connectionManager;
 
     /** Timer used to schedule and execute the sweeping task. */
     private final Timer taskTimer;
@@ -53,32 +53,32 @@
     /**
      * Constructor. This method will create a daemon {@link Timer} and use it to periodically sweep connections.
      * 
-     * @param httpClient client whose connections will be swept
+     * @param manager HTTP client connection manager whose connections will be swept
      * @param idleTimeout length of time, in milliseconds, connection may be idle before being closed down
      * @param sweepInterval length of time, in milliseconds, between sweeps
      */
-    public IdleConnectionSweeper(@Nonnull final HttpClient httpClient, final long idleTimeout,
+    public IdleConnectionSweeper(@Nonnull final HttpClientConnectionManager manager, final long idleTimeout,
             final long sweepInterval) {
-        this(httpClient, idleTimeout, sweepInterval, new Timer(true));
+        this(manager, idleTimeout, sweepInterval, new Timer(true));
         createdTimer = true;
     }
 
     /**
      * Constructor.
      * 
-     * @param httpClient client whose connections will be swept
+     * @param manager HTTP client connection manager whose connections will be swept
      * @param idleTimeout length of time, in milliseconds, connection may be idle before being closed down
      * @param sweepInterval length of time, in milliseconds, between sweeps
      * @param backgroundTimer timer used to schedule the background sweeping task
      */
-    public IdleConnectionSweeper(@Nonnull final HttpClient httpClient, final long idleTimeout,
+    public IdleConnectionSweeper(@Nonnull final HttpClientConnectionManager manager, final long idleTimeout,
             final long sweepInterval, @Nonnull final Timer backgroundTimer) {
-        client = Constraint.isNotNull(httpClient, "HttpClient can not be null");
+        connectionManager = Constraint.isNotNull(manager, "HttpClientConnectionManager can not be null");
         taskTimer = Constraint.isNotNull(backgroundTimer, "Sweeper task timer can not be null");
 
         sweeper = new TimerTask() {
             public void run() {
-                client.getConnectionManager().closeIdleConnections(idleTimeout, TimeUnit.MILLISECONDS);
+                connectionManager.closeIdleConnections(idleTimeout, TimeUnit.MILLISECONDS);
             }
         };
 

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java?rev=461&r1=460&r2=461&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java Wed Oct 16 20:24:44 2013
@@ -21,7 +21,7 @@
 

[... 29 lines stripped ...]