Skip to content

Pool deprecation cleanup #1356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2023
Merged

Pool deprecation cleanup #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ad1324
Remove Pool sub types and implementations
vietj Sep 23, 2023
b33fd85
Remove deprecated pool connect handler
vietj Sep 23, 2023
4819fc1
Remove deprecated pool connection provider
vietj Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions vertx-db2-client/src/main/java/io/vertx/db2client/DB2Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public ClientBuilder<SqlClient> with(PoolOptions options) {
}

@Override
protected SqlClient create(Vertx vertx, Supplier<Future<SqlConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions) {
return driver.createPool(vertx, databases, poolOptions, transportOptions);
protected SqlClient create(Vertx vertx, Supplier<Future<SqlConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler) {
return driver.createPool(vertx, databases, poolOptions, transportOptions, connectHandler);
}
};
}
Expand Down
209 changes: 0 additions & 209 deletions vertx-db2-client/src/main/java/io/vertx/db2client/DB2Pool.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2PoolImpl.java
View file
Open in desktop

This file was deleted.

16 changes: 9 additions & 7 deletions vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package io.vertx.db2client.spi;

import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.impl.CloseFuture;
import io.vertx.core.impl.ContextInternal;
Expand All @@ -27,7 +28,9 @@
import io.vertx.sqlclient.Pool;
import io.vertx.sqlclient.PoolOptions;
import io.vertx.sqlclient.SqlConnectOptions;
import io.vertx.sqlclient.SqlConnection;
import io.vertx.sqlclient.impl.Connection;
import io.vertx.sqlclient.impl.CloseablePool;
import io.vertx.sqlclient.impl.PoolImpl;
import io.vertx.sqlclient.impl.SqlConnectionInternal;
import io.vertx.sqlclient.spi.ConnectionFactory;
Expand All @@ -47,22 +50,21 @@ public DB2ConnectOptions downcast(SqlConnectOptions connectOptions) {
}

@Override
public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler, CloseFuture closeFuture) {
VertxInternal vx = (VertxInternal) vertx;
PoolImpl pool;
if (poolOptions.isShared()) {
pool = vx.createSharedResource(SHARED_CLIENT_KEY, poolOptions.getName(), closeFuture, cf -> newPoolImpl(vx, databases, poolOptions, transportOptions, cf));
pool = vx.createSharedResource(SHARED_CLIENT_KEY, poolOptions.getName(), closeFuture, cf -> newPoolImpl(vx, connectHandler, databases, poolOptions, transportOptions, cf));
} else {
pool = newPoolImpl(vx, databases, poolOptions, transportOptions, closeFuture);
pool = newPoolImpl(vx, connectHandler, databases, poolOptions, transportOptions, closeFuture);
}
return new DB2PoolImpl(vx, closeFuture, pool);
return new CloseablePool<>(vx, closeFuture, pool);
}

private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {
private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {
boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, closeFuture);
ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, transportOptions);
pool.connectionProvider(context -> factory.connect(context, databases.get()));
PoolImpl pool = new PoolImpl(vertx, this, pipelinedPool, options, null, null, context -> factory.connect(context, databases.get()), connectHandler, closeFuture);
pool.init();
closeFuture.add(factory);
return pool;
Expand Down
Loading