Adapt to CompositeFuture changes

Author: vietj

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java

@@ -11,7 +11,6 @@
 
 package io.vertx.mssqlclient;
 
-import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.ext.unit.Async;
@@ -194,7 +193,7 @@ public void testQuerySequences(TestContext ctx) {
       ))
       .map(sql -> connection.query(sql).execute())
       .collect(Collectors.toList());
-    CompositeFuture.all(futures).onComplete(ctx.asyncAssertSuccess(cf -> {
+    Future.all(futures).onComplete(ctx.asyncAssertSuccess(cf -> {
       connection
         .query("SELECT * FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_NAME LIKE 'seq_%'")
         .execute()

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPoolTest.java

@@ -211,7 +211,7 @@ public void testNoConnectionLeaks(TestContext ctx) {
         .onComplete(ctx.asyncAssertSuccess(ids -> {
         CompositeFuture killAll = ids.value().stream()
           .map(connId -> conn.query("KILL " + connId).execute())
-          .collect(Collectors.collectingAndThen(toList(), CompositeFuture::all));
+          .collect(Collectors.collectingAndThen(toList(), Future::all));
         killAll.compose(cf -> conn.close()).onComplete(ctx.asyncAssertSuccess(v -> killConnections.complete()));
       }));
     }));

vertx-pg-client/src/test/java/io/vertx/pgclient/PgBouncerTest.java

@@ -85,7 +85,7 @@ public void testPreparedQuery() throws Exception {
     for (int i = 0;i < numConn;i++) {
       connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
     }
-    CompositeFuture cf = CompositeFuture.join(connections.stream()
+    CompositeFuture cf = Future.join(connections.stream()
       .map(conn -> conn.preparedQuery("select 1").execute().map(rows -> rows.iterator().next().getInteger(0)))
       .collect(Collectors.toList()));
     cf.toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
@@ -101,7 +101,7 @@ public void testPreparedBatch() throws Exception {
     for (int i = 0;i < numConn;i++) {
       connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
     }
-    CompositeFuture cf = CompositeFuture.join(connections.stream()
+    CompositeFuture cf = Future.join(connections.stream()
       .map(conn -> conn.preparedQuery("select 1")
         .executeBatch(Arrays.asList(Tuple.tuple(), Tuple.tuple()))
         .map(rows -> rows.iterator().next().getInteger(0)))
@@ -136,7 +136,7 @@ public void testCursor() throws Exception {
               .eventually(v -> ps.close());
       }).eventually(v -> tx.commit())));
     }
-    CompositeFuture cf = CompositeFuture.join(list);
+    CompositeFuture cf = Future.join(list);
     cf.toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS);
     for (int i = 0;i < numConn;i++) {
       assertEquals(i, (cf.<Object>resultAt(i)));

vertx-pg-client/src/test/java/io/vertx/pgclient/PoolMultiTest.java

@@ -1,6 +1,5 @@
 package io.vertx.pgclient;
 
-import io.vertx.core.CompositeFuture;
 import io.vertx.core.Context;
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
@@ -74,7 +73,7 @@ private void testLoadBalancing(TestContext ctx, PgPool pool) {
       futures.add(pool.getConnection());
     }
     List<String> users = Collections.synchronizedList(new ArrayList<>());
-    CompositeFuture.all((List)futures).onComplete(ctx.asyncAssertSuccess(c -> {
+    Future.all(futures).onComplete(ctx.asyncAssertSuccess(c -> {
       for (int i = 0;i < count;i++) {
         SqlConnection conn = futures.get(i).result();
         conn

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java

@@ -26,7 +26,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
@@ -50,7 +49,7 @@ protected ConnectionFactoryBase(VertxInternal vertx) {
   private void doClose(Promise<Void> p) {
     List<Future<Void>> futures = clients.values().stream().map(client -> client.close()).collect(Collectors.toList());
 
-    CompositeFuture join = CompositeFuture.join(futures);
+    CompositeFuture join = Future.join(futures);
 
     join.onComplete(ar -> p.complete());
   }

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java

@@ -248,7 +248,7 @@ public Future<Void> close() {
           .map(connection -> connection
             .compose(pooled -> Future.<Void>future(p -> pooled.conn.close(pooled, p))))
           .collect(Collectors.toList());
-        CompositeFuture
+        Future
           .join(results)
           .<Void>mapEmpty()
           .onComplete(promise);