Missing javadoc + minor rename to avoid confusion

src/main/asciidoc/java/index.adoc

@@ -299,10 +299,10 @@ _succeeded_ when all the futures are and _failed_ otherwise:
 [source,java]
 ----
 Future<HttpServer> httpServerFuture = Future.future();
-httpServer.listen(httpServerFuture.handler());
+httpServer.listen(httpServerFuture.completer());
 
 Future<NetServer> netServerFuture = Future.future();
-netServer.listen(netServerFuture.handler());
+netServer.listen(netServerFuture.completer());
 
 CompositeFuture.all(httpServerFuture, netServerFuture).setHandler(ar -> {
   if (ar.succeeded()) {
@@ -313,7 +313,7 @@ CompositeFuture.all(httpServerFuture, netServerFuture).setHandler(ar -> {
 });
 ----
 
-The handler returned by `link:../../apidocs/io/vertx/core/Future.html#handler--[handler]` completes the future.
+The handler returned by `link:../../apidocs/io/vertx/core/Future.html#completer--[completer]` completes the future.
 
 `link:../../apidocs/io/vertx/core/CompositeFuture.html#any-io.vertx.core.Future-io.vertx.core.Future-[CompositeFuture.any]` takes several futures arguments (up to 6) and returns a future that is
 _failed_ when all the futures are and _succeeded_ otherwise:
@@ -340,12 +340,12 @@ FileSystem fs = vertx.fileSystem();
 Future<Void> fut1 = Future.future();
 Future<Void> fut2 = Future.future();
 
-fs.createFile("/foo", fut1.handler());
+fs.createFile("/foo", fut1.completer());
 fut1.compose(string -> {
-  fs.writeFile("/foo", Buffer.buffer(), fut2.handler());
+  fs.writeFile("/foo", Buffer.buffer(), fut2.completer());
 }, fut2);
 fut2.compose(integer -> {
-  fs.move("/foo", "/bar", startFuture.handler());
+  fs.move("/foo", "/bar", startFuture.completer());
 }, startFuture);
 ----
 

src/main/java/examples/CoreExamples.java

@@ -18,9 +18,7 @@
 
 import io.vertx.core.*;
 import io.vertx.core.buffer.Buffer;
-import io.vertx.core.file.AsyncFile;
 import io.vertx.core.file.FileSystem;
-import io.vertx.core.file.OpenOptions;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
@@ -90,10 +88,10 @@ String blockingMethod(String str) {
 
   public void exampleFuture1(HttpServer httpServer, NetServer netServer) {
     Future<HttpServer> httpServerFuture = Future.future();
-    httpServer.listen(httpServerFuture.handler());
+    httpServer.listen(httpServerFuture.completer());
 
     Future<NetServer> netServerFuture = Future.future();
-    netServer.listen(netServerFuture.handler());
+    netServer.listen(netServerFuture.completer());
 
     CompositeFuture.all(httpServerFuture, netServerFuture).setHandler(ar -> {
       if (ar.succeeded()) {
@@ -123,12 +121,12 @@ public void exampleFuture3(Vertx vertx, Future<Void> startFuture) {
     Future<Void> fut1 = Future.future();
     Future<Void> fut2 = Future.future();
 
-    fs.createFile("/foo", fut1.handler());
+    fs.createFile("/foo", fut1.completer());
     fut1.compose(string -> {
-      fs.writeFile("/foo", Buffer.buffer(), fut2.handler());
+      fs.writeFile("/foo", Buffer.buffer(), fut2.completer());
     }, fut2);
     fut2.compose(integer -> {
-      fs.move("/foo", "/bar", startFuture.handler());
+      fs.move("/foo", "/bar", startFuture.completer());
     }, startFuture);
   }
 

src/main/java/io/vertx/core/CompositeFuture.java

@@ -20,6 +20,9 @@
 import io.vertx.core.impl.CompositeFutureImpl;
 
 /**
+ * The composite future wraps a list of {@link Future futures}, it is useful when several futures
+ * needs to be coordinated.
+ *
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  */
 @VertxGen
@@ -36,18 +39,30 @@ static <T1, T2> CompositeFuture all(Future<T1> f1, Future<T2> f2) {
     return CompositeFutureImpl.all(f1, f2);
   }
 
+  /**
+   * Like {@link #all(Future, Future)} but with 3 futures.
+   */
   static <T1, T2, T3> CompositeFuture all(Future<T1> f1, Future<T2> f2, Future<T3> f3) {
     return CompositeFutureImpl.all(f1, f2, f3);
   }
 
+  /**
+   * Like {@link #all(Future, Future)} but with 4 futures.
+   */
   static <T1, T2, T3, T4> CompositeFuture all(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4) {
     return CompositeFutureImpl.all(f1, f2, f3, f4);
   }
 
+  /**
+   * Like {@link #all(Future, Future)} but with 5 futures.
+   */
   static <T1, T2, T3, T4, T5> CompositeFuture all(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4, Future<T5> f5) {
     return CompositeFutureImpl.all(f1, f2, f3, f4, f5);
   }
 
+  /**
+   * Like {@link #all(Future, Future)} but with 6 futures.
+   */
   static <T1, T2, T3, T4, T5, T6> CompositeFuture all(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4, Future<T5> f5, Future<T6> f6) {
     return CompositeFutureImpl.all(f1, f2, f3, f4, f5, f6);
   }
@@ -63,35 +78,75 @@ static <T1, T2> CompositeFuture any(Future<T1> f1, Future<T2> f2) {
     return CompositeFutureImpl.any(f1, f2);
   }
 
+  /**
+   * Like {@link #any(Future, Future)} but with 3 futures.
+   */
   static <T1, T2, T3> CompositeFuture any(Future<T1> f1, Future<T2> f2, Future<T3> f3) {
     return CompositeFutureImpl.any(f1, f2, f3);
   }
 
+  /**
+   * Like {@link #any(Future, Future)} but with 4 futures.
+   */
   static <T1, T2, T3, T4> CompositeFuture any(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4) {
     return CompositeFutureImpl.any(f1, f2, f3, f4);
   }
 
+  /**
+   * Like {@link #any(Future, Future)} but with 5 futures.
+   */
   static <T1, T2, T3, T4, T5> CompositeFuture any(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4, Future<T5> f5) {
     return CompositeFutureImpl.any(f1, f2, f3, f4, f5);
   }
 
+  /**
+   * Like {@link #any(Future, Future)} but with 6 futures.
+   */
   static <T1, T2, T3, T4, T5, T6> CompositeFuture any(Future<T1> f1, Future<T2> f2, Future<T3> f3, Future<T4> f4, Future<T5> f5, Future<T6> f6) {
     return CompositeFutureImpl.any(f1, f2, f3, f4, f5, f6);
   }
 
   @Override
   CompositeFuture setHandler(Handler<AsyncResult<CompositeFuture>> handler);
 
+  /**
+   * Returns a cause of a wrapped future
+   *
+   * @param index the wrapped future index
+   */
   Throwable cause(int index);
 
+  /**
+   * Returns true if a wrapped future is succeeded
+   *
+   * @param index the wrapped future index
+   */
   boolean succeeded(int index);
 
+  /**
+   * Returns true if a wrapped future is failed
+   *
+   * @param index the wrapped future index
+   */
   boolean failed(int index);
 
+  /**
+   * Returns true if a wrapped future is completed
+   *
+   * @param index the wrapped future index
+   */
   boolean isComplete(int index);
 
+  /**
+   * Returns the result of a wrapped future
+   *
+   * @param index the wrapped future index
+   */
   <T> T result(int index);
 
+  /**
+   * @return the number of wrapped future
+   */
   int size();
 
 }

src/main/java/io/vertx/core/Future.java

@@ -167,7 +167,7 @@ default <U> void compose(Handler<T> handler, Future<U> next) {
   /**
    * @return an handler completing this future
    */
-  Handler<AsyncResult<T>> handler();
+  Handler<AsyncResult<T>> completer();
 
   static FutureFactory factory = ServiceHelper.loadFactory(FutureFactory.class);
 

src/main/java/io/vertx/core/impl/CompositeFutureImpl.java

@@ -215,7 +215,7 @@ private Handler<AsyncResult<CompositeFuture>> setSucceeded() {
   }
 
   @Override
-  public Handler<AsyncResult<CompositeFuture>> handler() {
+  public Handler<AsyncResult<CompositeFuture>> completer() {
     return this;
   }
 

src/main/java/io/vertx/core/impl/FutureImpl.java

@@ -125,7 +125,7 @@ public void handle(Future<T> ar) {
   }
 
   @Override
-  public Handler<AsyncResult<T>> handler() {
+  public Handler<AsyncResult<T>> completer() {
     return this;
   }
 

src/main/java/io/vertx/core/package-info.java

@@ -303,7 +303,7 @@
  * {@link examples.CoreExamples#exampleFuture1}
  * ----
  *
- * The handler returned by {@link io.vertx.core.Future#handler()} completes the future.
+ * The handler returned by {@link io.vertx.core.Future#completer()} completes the future.
  *
  * {@link io.vertx.core.CompositeFuture#any} takes several futures arguments (up to 6) and returns a future that is
  * _failed_ when all the futures are and _succeeded_ otherwise:

src/test/java/io/vertx/test/core/FutureTest.java

@@ -160,7 +160,7 @@ public void testResolveFutureToHandler() {
       handler.handle(Future.succeededFuture("the-result"));
     };
     Future<String> fut = Future.future();
-    consumer.accept(fut.handler());
+    consumer.accept(fut.completer());
     assertTrue(fut.isComplete());
     assertTrue(fut.succeeded());
     assertEquals("the-result", fut.result());
@@ -173,7 +173,7 @@ public void testFailFutureToHandler() {
       handler.handle(Future.failedFuture(cause));
     };
     Future<String> fut = Future.future();
-    consumer.accept(fut.handler());
+    consumer.accept(fut.completer());
     assertTrue(fut.isComplete());
     assertTrue(fut.failed());
     assertEquals(cause, fut.cause());