Skip to content

Commit b33fd85

Browse files
committed
Remove deprecated pool connect handler
1 parent 7ad1324 commit b33fd85

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

vertx-db2-client/src/main/java/io/vertx/db2client/DB2Builder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public ClientBuilder<SqlClient> with(PoolOptions options) {
8787

8888
@Override
8989
protected SqlClient create(Vertx vertx, Supplier<Future<SqlConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler) {
90-
return driver.createPool(vertx, databases, poolOptions, transportOptions, );
90+
return driver.createPool(vertx, databases, poolOptions, transportOptions, connectHandler);
9191
}
9292
};
9393
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases,
5454
VertxInternal vx = (VertxInternal) vertx;
5555
PoolImpl pool;
5656
if (poolOptions.isShared()) {
57-
pool = vx.createSharedResource(SHARED_CLIENT_KEY, poolOptions.getName(), closeFuture, cf -> newPoolImpl(vx, databases, poolOptions, transportOptions, cf));
57+
pool = vx.createSharedResource(SHARED_CLIENT_KEY, poolOptions.getName(), closeFuture, cf -> newPoolImpl(vx, connectHandler, databases, poolOptions, transportOptions, cf));
5858
} else {
59-
pool = newPoolImpl(vx, databases, poolOptions, transportOptions, closeFuture);
59+
pool = newPoolImpl(vx, connectHandler, databases, poolOptions, transportOptions, closeFuture);
6060
}
6161
return new CloseablePool<>(vx, closeFuture, pool);
6262
}
6363

64-
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {
64+
private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {
6565
boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
66-
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
66+
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, connectHandler, closeFuture);
6767
ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, transportOptions);
6868
pool.connectionProvider(context -> factory.connect(context, databases.get()));
6969
pool.init();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ public Pool newPool(Vertx vertx, Supplier<Future<MSSQLConnectOptions>> databases
5656
VertxInternal vx = (VertxInternal) vertx;
5757
PoolImpl pool;
5858
if (options.isShared()) {
59-
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, transportOptions, cf));
59+
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, connectHandler, databases, options, transportOptions, cf));
6060
} else {
61-
pool = newPoolImpl(vx, databases, options, transportOptions, closeFuture);
61+
pool = newPoolImpl(vx, connectHandler, databases, options, transportOptions, closeFuture);
6262
}
6363
return new CloseablePool<>(vx, closeFuture, pool);
6464
}
6565

66-
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
67-
PoolImpl pool = new PoolImpl(vertx, this, false, poolOptions, null, null, closeFuture);
66+
private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<MSSQLConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
67+
PoolImpl pool = new PoolImpl(vertx, this, false, poolOptions, null, null, connectHandler, closeFuture);
6868
ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx, transportOptions);
6969
pool.connectionProvider(context -> factory.connect(context, databases.get()));
7070
pool.init();

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public ClientBuilder<SqlClient> with(PoolOptions options) {
8686
}
8787
@Override
8888
protected SqlClient create(Vertx vertx, Supplier<Future<SqlConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler) {
89-
return driver.createPool(vertx, databases, poolOptions, transportOptions, );
89+
return driver.createPool(vertx, databases, poolOptions, transportOptions, connectHandler);
9090
}
9191
};
9292
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ public Pool newPool(Vertx vertx, Supplier<Future<MySQLConnectOptions>> databases
5454
VertxInternal vx = (VertxInternal) vertx;
5555
PoolImpl pool;
5656
if (options.isShared()) {
57-
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, transportOptions, cf));
57+
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, connectHandler, databases, options, transportOptions, cf));
5858
} else {
59-
pool = newPoolImpl(vx, databases, options, transportOptions, closeFuture);
59+
pool = newPoolImpl(vx, connectHandler, databases, options, transportOptions, closeFuture);
6060
}
6161
return new CloseablePool<>(vx, closeFuture, pool);
6262
}
6363

64-
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<MySQLConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
64+
private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<MySQLConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
6565
boolean pipelinedPool = poolOptions instanceof MySQLPoolOptions && ((MySQLPoolOptions) poolOptions).isPipelined();
66-
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, poolOptions, null, null, closeFuture);
66+
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, poolOptions, null, null, connectHandler, closeFuture);
6767
ConnectionFactory<MySQLConnectOptions> factory = createConnectionFactory(vertx, transportOptions);
6868
pool.connectionProvider(context -> factory.connect(context, databases.get()));
6969
pool.init();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ public Pool newPool(Vertx vertx, Supplier<Future<OracleConnectOptions>> database
5050
VertxInternal vx = (VertxInternal) vertx;
5151
PoolImpl pool;
5252
if (options.isShared()) {
53-
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, databases, options, cf));
53+
pool = vx.createSharedResource(SHARED_CLIENT_KEY, options.getName(), closeFuture, cf -> newPoolImpl(vx, connectHandler, databases, options, cf));
5454
} else {
55-
pool = newPoolImpl(vx, databases, options, closeFuture);
55+
pool = newPoolImpl(vx, connectHandler, databases, options, closeFuture);
5656
}
5757
return new CloseablePool<>(vx, closeFuture, pool);
5858
}
5959

60-
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<OracleConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
60+
private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<OracleConnectOptions>> databases, PoolOptions options, CloseFuture closeFuture) {
6161
Function<Connection, Future<Void>> afterAcquire = conn -> ((OracleJdbcConnection) conn).afterAcquire();
6262
Function<Connection, Future<Void>> beforeRecycle = conn -> ((OracleJdbcConnection) conn).beforeRecycle();
63-
PoolImpl pool = new PoolImpl(vertx, this, false, options, afterAcquire, beforeRecycle, closeFuture);
63+
PoolImpl pool = new PoolImpl(vertx, this, false, options, afterAcquire, beforeRecycle, connectHandler, closeFuture);
6464
ConnectionFactory<OracleConnectOptions> factory = createConnectionFactory(vertx, null);
6565
pool.connectionProvider(context -> factory.connect(context, databases.get()));
6666
pool.init();

0 commit comments

Comments
 (0)