Fix test name

Author: jfarcand

src/main/java/com/ning/http/client/FutureImpl.java

@@ -13,8 +13,8 @@
 package com.ning.http.client.providers.apache;
 
 import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.FutureImpl;
 import com.ning.http.client.Request;
+import com.ning.http.client.listenable.AbstractListenableFuture;
 import org.apache.commons.httpclient.HttpMethodBase;
 
 import java.util.concurrent.Callable;
@@ -28,7 +28,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 
-public class ApacheResponseFuture<V> implements FutureImpl<V> {
+public class ApacheResponseFuture<V> extends AbstractListenableFuture<V> {
 
     private Future<V> innerFuture;
     private final AsyncHandler<V> asyncHandler;

src/main/java/com/ning/http/client/providers/apache/ApacheResponseFuture.java

@@ -18,7 +18,7 @@
 import com.ning.http.client.AsyncHttpProviderConfig;
 import com.ning.http.client.Body;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
-import com.ning.http.client.FutureImpl;
+import com.ning.http.client.ListenableFuture;
 import com.ning.http.client.HttpResponseBodyPart;
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.HttpResponseStatus;
@@ -115,7 +115,7 @@ private void configure(JDKAsyncHttpProviderConfig config) {
     public <T> Future<T> execute(Request request, AsyncHandler<T> handler) throws IOException {
         return execute(request, handler, null);
     }
-    public <T> Future<T> execute(Request request, AsyncHandler<T> handler, FutureImpl<?> future) throws IOException {
+    public <T> Future<T> execute(Request request, AsyncHandler<T> handler, ListenableFuture<?> future) throws IOException {
         if (isClose.get()) {
             throw new IOException("Closed");
         }
@@ -208,14 +208,14 @@ private final class AsyncHttpUrlConnection<T> implements Callable<T> {
         private HttpURLConnection urlConnection;
         private Request request;
         private final AsyncHandler<T> asyncHandler;
-        private final FutureImpl<T> future;
+        private final ListenableFuture<T> future;
         private int currentRedirectCount;
         private AtomicBoolean isAuth = new AtomicBoolean(false);
         private byte[] cachedBytes;
         private int cachedBytesLenght;
         private boolean terminate = true;
 
-        public AsyncHttpUrlConnection(HttpURLConnection urlConnection, Request request, AsyncHandler<T> asyncHandler, FutureImpl<T> future) {
+        public AsyncHttpUrlConnection(HttpURLConnection urlConnection, Request request, AsyncHandler<T> asyncHandler, ListenableFuture<T> future) {
             this.urlConnection = urlConnection;
             this.request = request;
             this.asyncHandler = asyncHandler;

src/main/java/com/ning/http/client/providers/jdk/JDKAsyncHttpProvider.java

@@ -13,7 +13,7 @@
 package com.ning.http.client.providers.jdk;
 
 import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.FutureImpl;
+import com.ning.http.client.ListenableFuture;
 
 import java.net.HttpURLConnection;
 import java.util.concurrent.Callable;
@@ -23,16 +23,16 @@
 
 public class JDKDelegateFuture<V> extends JDKFuture<V> {
 
-    private final FutureImpl<V> delegateFuture;
+    private final ListenableFuture<V> delegateFuture;
 
-    public JDKDelegateFuture(AsyncHandler<V> asyncHandler, int responseTimeoutInMs, FutureImpl<V> delegateFuture, HttpURLConnection urlConnection) {
+    public JDKDelegateFuture(AsyncHandler<V> asyncHandler, int responseTimeoutInMs, ListenableFuture<V> delegateFuture, HttpURLConnection urlConnection) {
         super(asyncHandler, responseTimeoutInMs, urlConnection);
         this.delegateFuture = delegateFuture;
     }
 
     public void done(Callable callable) {
-        isDone.set(true);
         delegateFuture.done(callable);
+        super.done(callable);        
     }
 
     public void abort(Throwable t) {

src/main/java/com/ning/http/client/providers/jdk/JDKDelegateFuture.java

@@ -13,7 +13,8 @@
 package com.ning.http.client.providers.jdk;
 
 import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.FutureImpl;
+import com.ning.http.client.ListenableFuture;
+import com.ning.http.client.listenable.AbstractListenableFuture;
 
 import java.net.HttpURLConnection;
 import java.util.concurrent.Callable;
@@ -27,7 +28,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 
-public class JDKFuture<V> implements FutureImpl<V> {
+public class JDKFuture<V> extends AbstractListenableFuture<V> {
 
     protected Future<V> innerFuture;
     protected final AsyncHandler<V> asyncHandler;
@@ -56,6 +57,7 @@ protected void setInnerFuture(Future<V> innerFuture) {
 
     public void done(Callable callable) {
         isDone.set(true);
+        super.done();
     }
 
     public void abort(Throwable t) {

src/main/java/com/ning/http/client/providers/jdk/JDKFuture.java

@@ -181,7 +181,7 @@ public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
             socketChannelFactory = new OioClientSocketChannelFactory(config.executorService());
         } else {
             socketChannelFactory = new NioClientSocketChannelFactory(
-                    Executors.newCachedThreadPool(),
+                    Executors.newFixedThreadPool(100),
                     config.executorService());
         }
         plainBootstrap = new ClientBootstrap(socketChannelFactory);

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -16,8 +16,9 @@
 package com.ning.http.client.providers.netty;
 
 import com.ning.http.client.AsyncHandler;
-import com.ning.http.client.FutureImpl;
+import com.ning.http.client.ListenableFuture;
 import com.ning.http.client.Request;
+import com.ning.http.client.listenable.AbstractListenableFuture;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.handler.codec.http.HttpRequest;
 import org.jboss.netty.handler.codec.http.HttpResponse;
@@ -43,7 +44,7 @@
  *
  * @param <V>
  */
-public final class NettyResponseFuture<V> implements FutureImpl<V> {
+public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
 
     private final static Logger logger = LoggerFactory.getLogger(NettyResponseFuture.class);
     public final static String MAX_RETRY = "com.ning.http.client.providers.netty.maxRetry";
@@ -98,7 +99,6 @@ public NettyResponseFuture(URI uri,
 
         if (System.getProperty(MAX_RETRY) != null) {
             maxRetry = Integer.valueOf(System.getProperty(MAX_RETRY));
-            ;
         } else {
             maxRetry = asyncHttpProvider.getConfig().getMaxRequestRetry();
         }
@@ -190,7 +190,7 @@ public V get(long l, TimeUnit tu) throws InterruptedException, TimeoutException,
                 latch.await();
             } else {
                 expired = !latch.await(l, tu);
-                if (!contentProcessed.get() && expired && l != -1 && ((System.currentTimeMillis() - touch.get()) <= l)) {
+                if (!contentProcessed.get() && expired && ((System.currentTimeMillis() - touch.get()) <= l)) {
                     return get(l, tu);
                 }
             }
@@ -239,6 +239,7 @@ V getContent() throws ExecutionException {
     }
 
     public final void done(Callable callable) {
+        super.done();        
         try {
             if (exEx.get() != null) {
                 return;

src/main/java/com/ning/http/client/providers/netty/NettyResponseFuture.java

@@ -35,7 +35,7 @@
 public abstract class ListenableFutureTest extends AbstractBasicTest {
 
     @Test(groups = {"standalone", "default_provider"})
-    public void testPutEmptyBody() throws Throwable {
+    public void testListenableFuture() throws Throwable {
         final AtomicBoolean executed = new AtomicBoolean(false);
         AsyncHttpClient ahc = getAsyncHttpClient(null);
         Response response = ((ListenableFuture<Response>)ahc.prepareGet(getTargetUrl()).execute()).addListener(new Runnable(){