Remove simple option for connecting in factory

Author: vietj

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

@@ -413,7 +413,7 @@ public void dynamicPoolConfig(Vertx vertx, DB2Pool pool) {
       return fut.compose(connectOptions -> {
         // Do not forget to close later
         ConnectionFactory factory = DB2Driver.INSTANCE.createConnectionFactory(vertx, connectOptions);
-        return factory.connect(ctx);
+        return factory.connect(ctx, connectOptions);
       });
     });
   }

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

@@ -39,7 +39,7 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
       return ctx.failedFuture(e);
     }
     ctx.addCloseHook(client);
-    return (Future) client.connect(ctx);
+    return (Future) client.connect(ctx, options);
   }
 
   public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {

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

@@ -63,7 +63,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<DB2ConnectOptions> da
     int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, pipeliningLimit, options, null, null, closeFuture);
     ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, databases);
-    pool.connectionProvider(factory::connect);
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

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

@@ -422,7 +422,7 @@ public void dynamicPoolConfig(Vertx vertx, MSSQLPool pool) {
       return fut.compose(connectOptions -> {
         // Do not forget to close later
         ConnectionFactory factory = MSSQLDriver.INSTANCE.createConnectionFactory(vertx, connectOptions);
-        return factory.connect(ctx);
+        return factory.connect(ctx, connectOptions);
       });
     });
   }

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

@@ -38,7 +38,7 @@ public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions o
     ContextInternal ctx = (ContextInternal) vertx.getOrCreateContext();
     MSSQLConnectionFactory client = new MSSQLConnectionFactory(ctx.owner(), () -> options);
     ctx.addCloseHook(client);
-    return (Future)client.connect(ctx);
+    return (Future)client.connect(ctx, options);
   }
 
   @Override

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

@@ -64,7 +64,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MSSQLConnectOptions>
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, 1, options, null, null, closeFuture);
     ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx, databases);
-    pool.connectionProvider(factory::connect);
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

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

@@ -393,7 +393,7 @@ public void dynamicPoolConfig(Vertx vertx, MySQLPool pool) {
       return fut.compose(connectOptions -> {
         // Do not forget to close later
         ConnectionFactory factory = MySQLDriver.INSTANCE.createConnectionFactory(vertx, connectOptions);
-        return factory.connect(ctx);
+        return factory.connect(ctx, connectOptions);
       });
     });
   }

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java

@@ -41,7 +41,7 @@ public static Future<MySQLConnection> connect(ContextInternal ctx, MySQLConnectO
       return ctx.failedFuture(e);
     }
     ctx.addCloseHook(client);
-    return (Future)client.connect(ctx);
+    return (Future)client.connect(ctx, options);
   }
 
   public MySQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {

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

@@ -63,7 +63,7 @@ private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MySQLConnectOptions>
     int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, pipeliningLimit, options, null, null, closeFuture);
     ConnectionFactory<MySQLConnectOptions> factory = createConnectionFactory(vertx, databases);
-    pool.connectionProvider(factory::connect);
+    pool.connectionProvider(context -> factory.connect(context, databases.get()));
     pool.init();
     closeFuture.add(factory);
     return pool;

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

@@ -344,7 +344,7 @@ public void dynamicPoolConfig(Vertx vertx, OraclePool pool) {
       return fut.compose(connectOptions -> {
         // Do not forget to close later
         ConnectionFactory factory = OracleDriver.INSTANCE.createConnectionFactory(vertx, connectOptions);
-        return factory.connect(ctx);
+        return factory.connect(ctx, connectOptions);
       });
     });
   }