Update to vertx-core changes.

Author: vietj

vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java

@@ -50,7 +50,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases,
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
-      pool = vx.createSharedClient(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
+      pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
     } else {
       pool = newPoolImpl(vx, databases, options, closeFuture);
     }

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java

@@ -53,7 +53,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<MSSQLConnectOptions>> databases
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
-      pool = vx.createSharedClient(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
+      pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
     } else {
       pool = newPoolImpl(vx, databases, options, closeFuture);
     }

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java

@@ -50,7 +50,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<MySQLConnectOptions>> databases
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
-      pool = vx.createSharedClient(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
+      pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
     } else {
       pool = newPoolImpl(vx, databases, options, closeFuture);
     }

vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java

@@ -46,7 +46,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<OracleConnectOptions>> database
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
-      pool = vx.createSharedClient(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
+      pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
     } else {
       pool = newPoolImpl(vx, databases, options, closeFuture);
     }

vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java

@@ -30,7 +30,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<PgConnectOptions>> databases, P
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
-      pool = vx.createSharedClient(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
+      pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
     } else {
       pool = newPoolImpl(vx, databases, options, closeFuture);
     }

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

@@ -10,23 +10,24 @@
  */
 package io.vertx.sqlclient.impl;
 
+import io.vertx.core.CompositeFuture;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
-import io.vertx.core.impl.CloseFuture;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.EventLoopContext;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.impl.*;
 import io.vertx.core.impl.future.PromiseInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.NetClient;
 import io.vertx.core.net.NetClientOptions;
 import io.vertx.core.net.impl.NetClientBuilder;
+import io.vertx.core.net.impl.NetClientInternal;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * An base connection factory for creating database connections
@@ -39,16 +40,29 @@ public abstract class ConnectionFactoryBase<C extends SqlConnectOptions> impleme
   private final Map<JsonObject, NetClient> clients;
 
   // close hook
-  protected final CloseFuture clientCloseFuture = new CloseFuture();
+  protected final CloseSequence clientCloseFuture = new CloseSequence(this::doClose);
 
   protected ConnectionFactoryBase(VertxInternal vertx) {
     this.vertx = vertx;
     this.clients = new HashMap<>();
   }
 
+  private void doClose(Promise<Void> p) {
+    List<Future> futures = clients.values().stream().map(client -> client.close()).collect(Collectors.toList());
+
+    CompositeFuture join = CompositeFuture.join(futures);
+
+    join.onComplete(ar -> p.complete());
+  }
+
   private NetClient createNetClient(NetClientOptions options) {
     options.setReconnectAttempts(0); // auto-retry is handled on the protocol level instead of network level
-    return new NetClientBuilder(vertx, options).closeFuture(clientCloseFuture).build();
+
+    NetClientInternal netClient = new NetClientBuilder(vertx, options).build();
+
+
+    // return new NetClientBuilder(vertx, options).closeFuture(clientCloseFuture).build();
+    return netClient;
   }
 
   protected NetClient netClient(NetClientOptions options) {