Return a ListenableFuture. That shouldn't break any compatibility

Author: jfarcand

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

@@ -223,11 +223,11 @@ private BoundRequestBuilder(Request prototype) {
             super(BoundRequestBuilder.class, prototype);
         }
 
-        public <T> Future<T> execute(AsyncHandler<T> handler) throws IOException {
+        public <T> ListenableFuture<T> execute(AsyncHandler<T> handler) throws IOException {
             return AsyncHttpClient.this.executeRequest(build(), handler);
         }
 
-        public Future<Response> execute() throws IOException {
+        public ListenableFuture<Response> execute() throws IOException {
             return AsyncHttpClient.this.executeRequest(build(), new AsyncCompletionHandlerBase());
         }
 
@@ -468,7 +468,7 @@ public BoundRequestBuilder prepareRequest(Request request) {
      * @return a {@link Future} of type T
      * @throws IOException
      */
-    public <T> Future<T> executeRequest(Request request, AsyncHandler<T> handler) throws IOException {
+    public <T> ListenableFuture<T> executeRequest(Request request, AsyncHandler<T> handler) throws IOException {
 
         FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(handler).request(request).build();
         fc  = preProcessRequest(fc);
@@ -482,7 +482,7 @@ public <T> Future<T> executeRequest(Request request, AsyncHandler<T> handler) th
      * @return a {@link Future} of type Response
      * @throws IOException
      */
-    public Future<Response> executeRequest(Request request) throws IOException {
+    public ListenableFuture<Response> executeRequest(Request request) throws IOException {
         FilterContext fc = new FilterContext.FilterContextBuilder().asyncHandler(new AsyncCompletionHandlerBase()).request(request).build();
         fc  = preProcessRequest(fc);
         return httpProvider.execute(fc.getRequest(), fc.getAsyncHandler());

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

@@ -29,10 +29,10 @@ public interface AsyncHttpProvider<A> {
      * Execute the request and invoke the {@link AsyncHandler} when the response arrive.
      *
      * @param handler an instance of {@link AsyncHandler}
-     * @return a {@link java.util.concurrent.Future} of Type T.
+     * @return a {@link ListenableFuture} of Type T.
      * @throws IOException
      */
-    public <T> Future<T> execute(Request request, AsyncHandler<T> handler) throws IOException;
+    public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler) throws IOException;
 
     /**
      * Close the current underlying TCP/HTTP connection.

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

@@ -23,6 +23,7 @@
 import com.ning.http.client.HttpResponseBodyPart;
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.HttpResponseStatus;
+import com.ning.http.client.ListenableFuture;
 import com.ning.http.client.MaxRedirectException;
 import com.ning.http.client.Part;
 import com.ning.http.client.PerRequestConfig;
@@ -160,7 +161,7 @@ public ApacheAsyncHttpProvider(AsyncHttpClientConfig config) {
     private void configure(ApacheAsyncHttpProviderConfig config) {
     }
 
-    public <T> Future<T> execute(Request request, AsyncHandler<T> handler) throws IOException {
+    public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler) throws IOException {
         if (isClose.get()) {
             throw new IOException("Closed");
         }

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

@@ -112,10 +112,10 @@ private void configure(JDKAsyncHttpProviderConfig config) {
             System.setProperty(e.getKey(), e.getValue());
         }
     }
-    public <T> Future<T> execute(Request request, AsyncHandler<T> handler) throws IOException {
+    public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler) throws IOException {
         return execute(request, handler, null);
     }
-    public <T> Future<T> execute(Request request, AsyncHandler<T> handler, ListenableFuture<?> future) throws IOException {
+    public <T> ListenableFuture<T> execute(Request request, AsyncHandler<T> handler, ListenableFuture<?> future) throws IOException {
         if (isClose.get()) {
             throw new IOException("Closed");
         }

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

@@ -26,6 +26,7 @@
 import com.ning.http.client.HttpResponseBodyPart;
 import com.ning.http.client.HttpResponseHeaders;
 import com.ning.http.client.HttpResponseStatus;
+import com.ning.http.client.ListenableFuture;
 import com.ning.http.client.MaxRedirectException;
 import com.ning.http.client.PerRequestConfig;
 import com.ning.http.client.ProgressAsyncHandler;
@@ -704,15 +705,15 @@ public Response prepareResponse(final HttpResponseStatus status,
 
     /* @Override */
 
-    public <T> Future<T> execute(Request request, final AsyncHandler<T> asyncHandler) throws IOException {
+    public <T> ListenableFuture<T> execute(Request request, final AsyncHandler<T> asyncHandler) throws IOException {
         return doConnect(request, asyncHandler, null, true);
     }
 
     private <T> void execute(final Request request, final NettyResponseFuture<T> f, boolean useCache) throws IOException {
         doConnect(request, f.getAsyncHandler(), f, useCache);
     }
 
-    private <T> Future<T> doConnect(final Request request, final AsyncHandler<T> asyncHandler, NettyResponseFuture<T> f, boolean useCache) throws IOException {
+    private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHandler<T> asyncHandler, NettyResponseFuture<T> f, boolean useCache) throws IOException {
 
         if (isClose.get()) {
             throw new IOException("Closed");

src/test/java/com/ning/http/client/async/ListenableFutureTest.java

@@ -33,8 +33,8 @@ public void testListenableFuture() throws Throwable {
         final AtomicInteger statusCode = new AtomicInteger(500);
         AsyncHttpClient ahc = getAsyncHttpClient(null);
         final CountDownLatch latch = new CountDownLatch(1);
-        final Future<Response> future = ahc.prepareGet(getTargetUrl()).execute();
-        ((ListenableFuture)future).addListener(new Runnable(){
+        final ListenableFuture<Response> future = ahc.prepareGet(getTargetUrl()).execute();
+        future.addListener(new Runnable(){
 
             public void run() {
                 try {