Use now a Supplier<Future<SqlConnectOptions>> instead of Supplier<SqlConnectOptions>

Author: vietj

vertx-db2-client/src/main/java/examples/SqlClientExamples.java

@@ -408,11 +408,11 @@ public static void poolSharing3(Vertx vertx, DB2ConnectOptions database, int max
   }
 
   public void dynamicPoolConfig(Vertx vertx, DB2Pool pool) {
+    // Do not forget to close later
+    ConnectionFactory factory = DB2Driver.INSTANCE.createConnectionFactory(vertx);
     pool.connectionProvider(ctx -> {
       Future<DB2ConnectOptions> fut = retrieveOptions();
       return fut.compose(connectOptions -> {
-        // Do not forget to close later
-        ConnectionFactory factory = DB2Driver.INSTANCE.createConnectionFactory(vertx, connectOptions);
         return factory.connect(ctx, connectOptions);
       });
     });

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java

@@ -33,12 +33,11 @@
 
 import java.util.Map;
 import java.util.function.Predicate;
-import java.util.function.Supplier;
 
 public class DB2ConnectionFactory extends ConnectionFactoryBase<DB2ConnectOptions> {
 
-  public DB2ConnectionFactory(VertxInternal vertx, Supplier<DB2ConnectOptions> options) {
-    super(vertx, options);
+  public DB2ConnectionFactory(VertxInternal vertx) {
+    super(vertx);
   }
 
   @Override

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java

@@ -24,7 +24,6 @@
 import io.vertx.db2client.spi.DB2Driver;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionBase;
-import io.vertx.sqlclient.impl.tracing.QueryTracer;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 
 public class DB2ConnectionImpl extends SqlConnectionBase<DB2ConnectionImpl> implements DB2Connection {
@@ -33,7 +32,7 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
     ContextInternal ctx = (ContextInternal) vertx.getOrCreateContext();
     DB2ConnectionFactory client;
     try {
-      client = new DB2ConnectionFactory(ctx.owner(), () -> options);
+      client = new DB2ConnectionFactory(ctx.owner());
     } catch (Exception e) {
       return ctx.failedFuture(e);
     }

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

@@ -15,6 +15,7 @@
  */
 package io.vertx.db2client.spi;
 
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.impl.CloseFuture;
 import io.vertx.core.impl.ContextInternal;
@@ -40,7 +41,12 @@ public class DB2Driver implements Driver<DB2ConnectOptions> {
   public static final DB2Driver INSTANCE = new DB2Driver();
 
   @Override
-  public Pool newPool(Vertx vertx, Supplier<DB2ConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  public DB2ConnectOptions downcast(SqlConnectOptions connectOptions) {
+    return connectOptions instanceof DB2ConnectOptions ? (DB2ConnectOptions) connectOptions : new DB2ConnectOptions(connectOptions);
+  }
+
+  @Override
+  public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
@@ -51,13 +57,11 @@ public Pool newPool(Vertx vertx, Supplier<DB2ConnectOptions> databases, PoolOpti
     return new DB2PoolImpl(vx, closeFuture, pool);
   }
 
-  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<DB2ConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
-    DB2ConnectOptions baseConnectOptions = DB2ConnectOptions.wrap(databases.get());
+  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
     boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
-    int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
-    PoolImpl pool = new PoolImpl(vertx, this, pipeliningLimit, options, null, null, closeFuture);
-    ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, databases);
-    pool.connectionProvider(context -> factory.connect(context, databases.get()));
+    PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
+    ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx);
+    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
     pool.init();
     closeFuture.add(factory);
     return pool;
@@ -75,13 +79,8 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   }
 
   @Override
-  public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx, DB2ConnectOptions database) {
-    return new DB2ConnectionFactory((VertxInternal) vertx, () -> DB2ConnectOptions.wrap(database));
-  }
-
-  @Override
-  public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx, Supplier<DB2ConnectOptions> database) {
-    return new DB2ConnectionFactory((VertxInternal) vertx, () -> DB2ConnectOptions.wrap(database.get()));
+  public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx) {
+    return new DB2ConnectionFactory((VertxInternal) vertx);
   }
 
   @Override

vertx-mssql-client/src/main/java/examples/SqlClientExamples.java

@@ -417,11 +417,11 @@ public static void poolSharing3(Vertx vertx, MSSQLConnectOptions database, int m
   }
 
   public void dynamicPoolConfig(Vertx vertx, MSSQLPool pool) {
+    // Do not forget to close later
+    ConnectionFactory factory = MSSQLDriver.INSTANCE.createConnectionFactory(vertx);
     pool.connectionProvider(ctx -> {
       Future<MSSQLConnectOptions> fut = retrieveOptions();
       return fut.compose(connectOptions -> {
-        // Do not forget to close later
-        ConnectionFactory factory = MSSQLDriver.INSTANCE.createConnectionFactory(vertx, connectOptions);
         return factory.connect(ctx, connectOptions);
       });
     });

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLPool.java

@@ -20,6 +20,7 @@
 import io.vertx.core.Vertx;
 import io.vertx.mssqlclient.spi.MSSQLDriver;
 import io.vertx.sqlclient.*;
+import io.vertx.sqlclient.impl.SingletonSupplier;
 
 import java.util.List;
 import java.util.function.Function;
@@ -76,7 +77,7 @@ static MSSQLPool pool(MSSQLConnectOptions database, PoolOptions options) {
    * Like {@link #pool(MSSQLConnectOptions, PoolOptions)} with a specific {@link Vertx} instance.
    */
   static MSSQLPool pool(Vertx vertx, MSSQLConnectOptions database, PoolOptions options) {
-    return pool(vertx, () -> database, options);
+    return pool(vertx, SingletonSupplier.wrap(database), options);
   }
 
   /**
@@ -107,15 +108,15 @@ static MSSQLPool pool(Vertx vertx, List<MSSQLConnectOptions> databases, PoolOpti
    * @return the connection pool
    */
   @GenIgnore
-  static MSSQLPool pool(Supplier<MSSQLConnectOptions> databases, PoolOptions options) {
+  static MSSQLPool pool(Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions options) {
     return pool(null, databases, options);
   }
 
   /**
    * Like {@link #pool(Supplier, PoolOptions)} with a specific {@link Vertx} instance.
    */
   @GenIgnore
-  static MSSQLPool pool(Vertx vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options) {
+  static MSSQLPool pool(Vertx vertx, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions options) {
     return (MSSQLPool) MSSQLDriver.INSTANCE.createPool(vertx, databases, options);
   }
 

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java

@@ -36,8 +36,8 @@
 
 public class MSSQLConnectionFactory extends ConnectionFactoryBase<MSSQLConnectOptions> {
 
-  public MSSQLConnectionFactory(VertxInternal vertx, Supplier<MSSQLConnectOptions> options) {
-    super(vertx, options);
+  public MSSQLConnectionFactory(VertxInternal vertx) {
+    super(vertx);
   }
 
   @Override

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java

@@ -34,7 +34,7 @@ public MSSQLConnectionImpl(ContextInternal context, ConnectionFactory factory, C
 
   public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions options) {
     ContextInternal ctx = (ContextInternal) vertx.getOrCreateContext();
-    MSSQLConnectionFactory client = new MSSQLConnectionFactory(ctx.owner(), () -> options);
+    MSSQLConnectionFactory client = new MSSQLConnectionFactory(ctx.owner());
     ctx.addCloseHook(client);
     return (Future)client.connect(ctx, options);
   }

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

@@ -15,6 +15,7 @@
  */
 package io.vertx.mssqlclient.spi;
 
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.impl.CloseFuture;
 import io.vertx.core.impl.ContextInternal;
@@ -31,7 +32,6 @@
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.PoolImpl;
 import io.vertx.sqlclient.impl.SqlConnectionInternal;
-import io.vertx.sqlclient.impl.tracing.QueryTracer;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.Driver;
 
@@ -44,7 +44,12 @@ public class MSSQLDriver implements Driver<MSSQLConnectOptions> {
   public static final MSSQLDriver INSTANCE = new MSSQLDriver();
 
   @Override
-  public Pool newPool(Vertx vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  public MSSQLConnectOptions downcast(SqlConnectOptions connectOptions) {
+    return connectOptions instanceof MSSQLConnectOptions ? (MSSQLConnectOptions) connectOptions : new MSSQLConnectOptions(connectOptions);
+  }
+
+  @Override
+  public Pool newPool(Vertx vertx, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
@@ -55,16 +60,20 @@ public Pool newPool(Vertx vertx, Supplier<MSSQLConnectOptions> databases, PoolOp
     return new MSSQLPoolImpl(vx, closeFuture, pool);
   }
 
-  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
-    MSSQLConnectOptions baseConnectOptions = MSSQLConnectOptions.wrap(databases.get());
-    PoolImpl pool = new PoolImpl(vertx, this, 1, options, null, null, closeFuture);
-    ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx, databases);
-    pool.connectionProvider(context -> factory.connect(context, databases.get()));
+  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
+    PoolImpl pool = new PoolImpl(vertx, this, false, options, null, null, closeFuture);
+    ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx);
+    pool.connectionProvider(context -> databases.get().compose(connectOptions -> factory.connect(context, connectOptions)));
     pool.init();
     closeFuture.add(factory);
     return pool;
   }
 
+  @Override
+  public ConnectionFactory<MSSQLConnectOptions> createConnectionFactory(Vertx vertx) {
+    return new MSSQLConnectionFactory((VertxInternal) vertx);
+  }
+
   @Override
   public MSSQLConnectOptions parseConnectionUri(String uri) {
     JsonObject conf = MSSQLConnectionUriParser.parse(uri, false);
@@ -76,16 +85,6 @@ public boolean acceptsOptions(SqlConnectOptions options) {
     return options instanceof MSSQLConnectOptions || SqlConnectOptions.class.equals(options.getClass());
   }
 
-  @Override
-  public ConnectionFactory<MSSQLConnectOptions> createConnectionFactory(Vertx vertx, MSSQLConnectOptions database) {
-    return new MSSQLConnectionFactory((VertxInternal) vertx, () -> MSSQLConnectOptions.wrap(database));
-  }
-
-  @Override
-  public ConnectionFactory<MSSQLConnectOptions> createConnectionFactory(Vertx vertx, Supplier<MSSQLConnectOptions> database) {
-    return new MSSQLConnectionFactory((VertxInternal) vertx, () -> MSSQLConnectOptions.wrap(database.get()));
-  }
-
   @Override
   public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int current) {
     queryBuilder.append('@').append('P').append(1 + index);

vertx-mysql-client/src/main/java/examples/SqlClientExamples.java

@@ -388,11 +388,11 @@ public static void poolSharing3(Vertx vertx, MySQLConnectOptions database, int m
   }
 
   public void dynamicPoolConfig(Vertx vertx, MySQLPool pool) {
+    // Do not forget to close later
+    ConnectionFactory factory = MySQLDriver.INSTANCE.createConnectionFactory(vertx);
     pool.connectionProvider(ctx -> {
       Future<MySQLConnectOptions> fut = retrieveOptions();
       return fut.compose(connectOptions -> {
-        // Do not forget to close later
-        ConnectionFactory factory = MySQLDriver.INSTANCE.createConnectionFactory(vertx, connectOptions);
         return factory.connect(ctx, connectOptions);
       });
     });