Future<T> extends Handler<AsyncResult<T>> - fixes #1826

eclipse-vertx · Feb 20, 2017 · 9050acc · 9050acc
1 parent cfef3de
commit 9050acc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/src/main/java/io/vertx/core/Future.java b/src/main/java/io/vertx/core/Future.java
@@ -31,7 +31,7 @@
  * @author <a href="http://tfox.org">Tim Fox</a>
  */
 @VertxGen
-public interface Future<T> extends AsyncResult<T> {
+public interface Future<T> extends AsyncResult<T>, Handler<AsyncResult<T>> {
 
   /**
    * Create a future that hasn't completed yet
@@ -291,18 +291,21 @@ default <V> Future<V> map(V value) {
     return ret;
   }
 
+  /**
+   * Succeed or fail this future with the {@link AsyncResult} event.
+   *
+   * @param asyncResult the async result to handle
+   */
+  @GenIgnore
+  @Override
+  void handle(AsyncResult<T> asyncResult);
+
   /**
    * @return an handler completing this future
    */
   @CacheReturn
   default Handler<AsyncResult<T>> completer() {
-    return ar -> {
+    return this;
-      if (ar.succeeded()) {
-        complete(ar.result());
-      } else {
-        fail(ar.cause());
-      }
-    };
   }
 
   /**

diff --git a/src/main/java/io/vertx/core/impl/CompositeFutureImpl.java b/src/main/java/io/vertx/core/impl/CompositeFutureImpl.java
@@ -272,11 +272,11 @@ public Handler<AsyncResult<CompositeFuture>> completer() {
   }
 
   @Override
-  public void handle(AsyncResult<CompositeFuture> ar) {
+  public void handle(AsyncResult<CompositeFuture> asyncResult) {
-    if (ar.succeeded()) {
+    if (asyncResult.succeeded()) {
       complete(this);
     } else {
-      fail(ar.cause());
+      fail(asyncResult.cause());
     }
   }
 }
diff --git a/src/main/java/io/vertx/core/impl/FutureImpl.java b/src/main/java/io/vertx/core/impl/FutureImpl.java
@@ -130,11 +130,11 @@ public Handler<AsyncResult<T>> completer() {
   }
 
   @Override
-  public void handle(AsyncResult<T> ar) {
+  public void handle(AsyncResult<T> asyncResult) {
-    if (ar.succeeded()) {
+    if (asyncResult.succeeded()) {
-      complete(ar.result());
+      complete(asyncResult.result());
     } else {
-      fail(ar.cause());
+      fail(asyncResult.cause());
     }
   }
 

diff --git a/src/test/java/io/vertx/test/core/FutureTest.java b/src/test/java/io/vertx/test/core/FutureTest.java
@@ -731,6 +731,13 @@ class DefaultCompleterTestFuture<T> implements Future<T> {
       public Throwable cause() { throw new UnsupportedOperationException(); }
       public boolean succeeded() { throw new UnsupportedOperationException(); }
       public boolean failed() { throw new UnsupportedOperationException(); }
+      public void handle(AsyncResult<T> asyncResult) {
+        if (asyncResult.succeeded()) {
+          complete(asyncResult.result());
+        } else {
+          fail(asyncResult.cause());
+        }
+      }
     }
 
     DefaultCompleterTestFuture<Object> successFuture = new DefaultCompleterTestFuture<>();