Merge pull request #5 from davidgev/master

Updated async-http-client and netty versions to fix Connection leak issue.

Author: jfarcand

.gitignore

@@ -1,18 +1,49 @@
+######################
+# Logs
+######################
+*.log
+/logs
+
+######################
+# Build output directies
+######################
+/target
+*/target
+/build
+*/build
+test-output
 *.class
 *~
 .*.swp
 .*.swo
 .loadpath
 .buildpath
+
+######################
+# Eclipse specific files/directories
+######################
 .classpath
 .project
 .settings
+.metadata
+
+######################
+# IntelliJ specific files/directories
+######################
+out
 .idea
 *.iml
 *.ipr
 *.iws
+*.iml
+atlassian-ide-plugin.xml
 nbproject
-.DS_Store
-target
-test-output
 /META-INF/MANIFEST.MF
+
+######################
+# OS generated files
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db

pom.xml

@@ -62,6 +62,8 @@
     </licenses>
     <properties>
         <jersey.version>1.14</jersey.version>
+        <async-http-client-version>1.8.5</async-http-client-version>
+        <netty-version>3.9.0.Final</netty-version>
     </properties>
     <dependencies>
         <dependency>
@@ -83,7 +85,7 @@
         <dependency>
             <groupId>com.ning</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>1.7.6</version>
+            <version>${async-http-client-version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
@@ -121,6 +123,11 @@
             <version>${jersey.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>${netty-version}</version>
+        </dependency>
     </dependencies>
     <build>
         <defaultGoal>install</defaultGoal>
@@ -149,6 +156,7 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
+                <version>2.4.0</version>
                 <configuration>
                     <manifestLocation>META-INF</manifestLocation>
                     <instructions>
@@ -197,7 +205,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
                 <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                    <compilerVersion>1.6</compilerVersion>
                     <maxmem>1024m</maxmem>
                 </configuration>
             </plugin>

src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java

@@ -11,21 +11,27 @@
  *******************************************************************************/
 package org.sonatype.spice.jersey.client.ahc;
 
-import com.ning.http.client.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.Context;
+
+import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
+import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
+
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.FluentCaseInsensitiveStringsMap;
+import com.ning.http.client.RequestBuilder;
+import com.ning.http.client.Response;
+import com.ning.http.client.cookie.Cookie;
 import com.sun.jersey.api.client.ClientHandler;
 import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientRequest;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.core.header.InBoundHeaders;
 import com.sun.jersey.spi.MessageBodyWorkers;
-import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
-import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
-
-import javax.ws.rs.core.Context;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 /**
  * A root handler with Sonatype AsyncHttpClient acting as a backend.
@@ -55,7 +61,7 @@ public final class AhcClientHandler implements ClientHandler {
 
     private final AhcRequestWriter requestWriter = new AhcRequestWriter();
 
-    private List<Cookie> cookies = new ArrayList<Cookie>();
+    private final List<Cookie> cookies = new ArrayList<Cookie>();
 
     @Context
     private MessageBodyWorkers workers;
@@ -65,7 +71,7 @@ public final class AhcClientHandler implements ClientHandler {
      *
      * @param client the {@link AsyncHttpClient}.
      */
-    public AhcClientHandler(AsyncHttpClient client) {
+    public AhcClientHandler(final AsyncHttpClient client) {
         this(client, new DefaultAhcConfig());
     }
 
@@ -75,7 +81,7 @@ public AhcClientHandler(AsyncHttpClient client) {
      * @param client the {@link AsyncHttpClient}.
      * @param config the client configuration.
      */
-    public AhcClientHandler(AsyncHttpClient client, AhcConfig config) {
+    public AhcClientHandler(final AsyncHttpClient client, final AhcConfig config) {
         this.client = client;
         this.config = config;
     }
@@ -105,6 +111,7 @@ public AsyncHttpClient getHttpClient() {
      * @return the {@link ClientResponse}
      * @throws ClientHandlerException
      */
+    @Override
     public ClientResponse handle(final ClientRequest cr)
             throws ClientHandlerException {
 
@@ -117,7 +124,7 @@ public ClientResponse handle(final ClientRequest cr)
 
             applyResponseCookies(response.getCookies());
 
-            ClientResponse r = new ClientResponse(response.getStatusCode(),
+            final ClientResponse r = new ClientResponse(response.getStatusCode(),
                     getInBoundHeaders(response),
                     response.getResponseBodyAsStream(),
                     workers);
@@ -126,7 +133,7 @@ public ClientResponse handle(final ClientRequest cr)
                 r.close();
             }
             return r;
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw new ClientHandlerException(e);
         }
     }
@@ -136,13 +143,13 @@ public ClientResponse handle(final ClientRequest cr)
      *
      * @param responseCookies list of cookies from response
      */
-    private void applyResponseCookies(List<Cookie> responseCookies) {
+    private void applyResponseCookies(final List<Cookie> responseCookies) {
         if (responseCookies != null) {
-            for (Cookie rc : responseCookies) {
+            for (final Cookie rc : responseCookies) {
                 // remove existing cookie
-                Iterator<Cookie> it = cookies.iterator();
+                final Iterator<Cookie> it = cookies.iterator();
                 while (it.hasNext()) {
-                    Cookie c = it.next();
+                    final Cookie c = it.next();
                     if (isSame(rc, c)) {
                         it.remove();
                         break;
@@ -154,13 +161,13 @@ private void applyResponseCookies(List<Cookie> responseCookies) {
         }
     }
 
-    private boolean isSame(Cookie c, Cookie o) {
+    private boolean isSame(final Cookie c, final Cookie o) {
         return isEquals(c.getDomain(), o.getDomain()) &&
                 isEquals(c.getPath(), o.getPath()) &&
                 isEquals(c.getName(), o.getName());
     }
 
-    private boolean isEquals(Object o, Object o2) {
+    private boolean isEquals(final Object o, final Object o2) {
         return (o == null && o2 == null) || o != null && o.equals(o2);
     }
 
@@ -170,7 +177,7 @@ private boolean isEquals(Object o, Object o2) {
      * @param method An HTTP method
      * @return true if s body can be allowed.
      */
-    private boolean allowBody(String method) {
+    private boolean allowBody(final String method) {
         if (method.equalsIgnoreCase("GET") || method.equalsIgnoreCase("OPTIONS")
                 && method.equalsIgnoreCase("TRACE")
                 && method.equalsIgnoreCase("HEAD")) {
@@ -186,7 +193,7 @@ private boolean allowBody(String method) {
      * @param cr the HTTP request.
      * @return {@link RequestBuilder}
      */
-    private RequestBuilder getRequestBuilder(ClientRequest cr) {
+    private RequestBuilder getRequestBuilder(final ClientRequest cr) {
         final String strMethod = cr.getMethod();
         final String uri = cr.getURI().toString();
 
@@ -207,10 +214,10 @@ private RequestBuilder getRequestBuilder(ClientRequest cr) {
         }
     }
 
-    private InBoundHeaders getInBoundHeaders(Response response) {
-        InBoundHeaders headers = new InBoundHeaders();
-        FluentCaseInsensitiveStringsMap respHeaders = response.getHeaders();
-        for (Map.Entry<String, List<String>> header : respHeaders) {
+    private InBoundHeaders getInBoundHeaders(final Response response) {
+        final InBoundHeaders headers = new InBoundHeaders();
+        final FluentCaseInsensitiveStringsMap respHeaders = response.getHeaders();
+        for (final Map.Entry<String, List<String>> header : respHeaders) {
             headers.put(header.getKey(), header.getValue());
         }
         return headers;
@@ -226,8 +233,8 @@ public AhcRequestWriter getAhcRequestWriter() {
         return requestWriter;
     }
 
-    private void handleCookie(RequestBuilder requestBuilder) {
-        for (Cookie c : cookies) {
+    private void handleCookie(final RequestBuilder requestBuilder) {
+        for (final Cookie c : cookies) {
             requestBuilder.addCookie(c);
         }
     }

src/main/java/org/sonatype/spice/jersey/client/ahc/AhcHttpClient.java

@@ -11,11 +11,12 @@
  *******************************************************************************/
 package org.sonatype.spice.jersey.client.ahc;
 
+import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
+import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
+
 import com.ning.http.client.AsyncHttpClient;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.config.ClientConfig;
-import org.sonatype.spice.jersey.client.ahc.config.AhcConfig;
-import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
 import com.sun.jersey.core.spi.component.ioc.IoCComponentProviderFactory;
 
 /**
@@ -41,8 +42,8 @@
  */
 public class AhcHttpClient extends Client {
 
-    private AhcClientHandler clientHandler;
-    
+    private final AhcClientHandler clientHandler;
+
     /**
      * Create a new client instance.
      *
@@ -57,7 +58,7 @@ public AhcHttpClient() {
      * @param root the root client handler for dispatching a request and
      *        returning a response.
      */
-    public AhcHttpClient(AhcClientHandler root) {
+    public AhcHttpClient(final AhcClientHandler root) {
         this(root, null);
     }
 
@@ -74,8 +75,8 @@ public AhcHttpClient(AhcClientHandler root) {
      *             is utilized instead.
      */
     @Deprecated
-    public AhcHttpClient(AhcClientHandler root, ClientConfig config,
-            IoCComponentProviderFactory provider) {
+    public AhcHttpClient(final AhcClientHandler root, final ClientConfig config,
+            final IoCComponentProviderFactory provider) {
         this(root, provider);
     }
 
@@ -87,8 +88,8 @@ public AhcHttpClient(AhcClientHandler root, ClientConfig config,
      *        returning a response.
      * @param provider the IoC component provider factory.
      */
-    public AhcHttpClient(AhcClientHandler root,
-            IoCComponentProviderFactory provider) {
+    public AhcHttpClient(final AhcClientHandler root,
+            final IoCComponentProviderFactory provider) {
         super(root, root.getConfig(), provider);
 
         this.clientHandler = root;
@@ -119,7 +120,7 @@ public static AhcHttpClient create() {
      * @param cc the client configuration.
      * @return a default client.
      */
-    public static AhcHttpClient create(ClientConfig cc) {
+    public static AhcHttpClient create(final ClientConfig cc) {
         return create(cc, null);
     }
 
@@ -130,7 +131,7 @@ public static AhcHttpClient create(ClientConfig cc) {
      * @param provider the IoC component provider factory.
      * @return a default client.
      */
-    public static AhcHttpClient create(ClientConfig cc, IoCComponentProviderFactory provider) {
+    public static AhcHttpClient create(final ClientConfig cc, final IoCComponentProviderFactory provider) {
         return new AhcHttpClient(createDefaultClientHander(cc), provider);
     }
 
@@ -151,7 +152,7 @@ protected void finalize(){
         } finally {
             try {
                 super.finalize();
-            } catch (Throwable e) {
+            } catch (final Throwable e) {
                 // TODO swallow?
             }
         }
@@ -162,28 +163,28 @@ protected void finalize(){
      *
      * @return a default AsyncHttpClient client handler.
      */
-    private static AhcClientHandler createDefaultClientHander(ClientConfig cc) {
+    private static AhcClientHandler createDefaultClientHander(final ClientConfig cc) {
 
         if (AhcConfig.class.isAssignableFrom(cc.getClass()) || DefaultAhcConfig.class.isAssignableFrom(cc.getClass())) {
-            AhcConfig c = AhcConfig.class.cast(cc);
+            final AhcConfig c = AhcConfig.class.cast(cc);
             return new AhcClientHandler(new AsyncHttpClient(c.getAsyncHttpClientConfigBuilder().build()), c);
         } else {
             throw new IllegalStateException("Client Config Type not supported");
         }
     }
 
     @Override
-    public void setFollowRedirects(Boolean redirect) {
+    public void setFollowRedirects(final Boolean redirect) {
         clientHandler.getConfig().getAsyncHttpClientConfigBuilder().setFollowRedirects(redirect);
     }
 
     @Override
-    public void setReadTimeout(Integer interval) {
+    public void setReadTimeout(final Integer interval) {
         clientHandler.getConfig().getAsyncHttpClientConfigBuilder().setRequestTimeoutInMs(interval);
     }
 
     @Override
-    public void setConnectTimeout(Integer interval) {
+    public void setConnectTimeout(final Integer interval) {
         clientHandler.getConfig().getAsyncHttpClientConfigBuilder().setConnectionTimeoutInMs(interval);
     }
 }