Skip to content

Commit 7ad1324

Browse files
committed
Remove Pool sub types and implementations
1 parent ec87392 commit 7ad1324

File tree

27 files changed

+79
-1147
lines changed

27 files changed

+79
-1147
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public ClientBuilder<SqlClient> with(PoolOptions options) {
8686
}
8787

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

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

Lines changed: 0 additions & 209 deletions
This file was deleted.

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package io.vertx.db2client.spi;
1717

1818
import io.vertx.core.Future;
19+
import io.vertx.core.Handler;
1920
import io.vertx.core.Vertx;
2021
import io.vertx.core.impl.CloseFuture;
2122
import io.vertx.core.impl.ContextInternal;
@@ -27,7 +28,9 @@
2728
import io.vertx.sqlclient.Pool;
2829
import io.vertx.sqlclient.PoolOptions;
2930
import io.vertx.sqlclient.SqlConnectOptions;
31+
import io.vertx.sqlclient.SqlConnection;
3032
import io.vertx.sqlclient.impl.Connection;
33+
import io.vertx.sqlclient.impl.CloseablePool;
3134
import io.vertx.sqlclient.impl.PoolImpl;
3235
import io.vertx.sqlclient.impl.SqlConnectionInternal;
3336
import io.vertx.sqlclient.spi.ConnectionFactory;
@@ -47,15 +50,15 @@ public DB2ConnectOptions downcast(SqlConnectOptions connectOptions) {
4750
}
4851

4952
@Override
50-
public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
53+
public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler, CloseFuture closeFuture) {
5154
VertxInternal vx = (VertxInternal) vertx;
5255
PoolImpl pool;
5356
if (poolOptions.isShared()) {
5457
pool = vx.createSharedResource(SHARED_CLIENT_KEY, poolOptions.getName(), closeFuture, cf -> newPoolImpl(vx, databases, poolOptions, transportOptions, cf));
5558
} else {
5659
pool = newPoolImpl(vx, databases, poolOptions, transportOptions, closeFuture);
5760
}
58-
return new DB2PoolImpl(vx, closeFuture, pool);
61+
return new CloseablePool<>(vx, closeFuture, pool);
5962
}
6063

6164
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {

0 commit comments

Comments
 (0)