Move the pool implementation to the implementation package, it should not be exposed.

Expose lifecycle hooks in the generic driver instead.

Author: vietj

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

@@ -30,7 +30,7 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.internal.Connection;
-import io.vertx.sqlclient.internal.pool.PoolImpl;
+import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.GenericDriver;

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

@@ -30,7 +30,7 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.internal.Connection;
-import io.vertx.sqlclient.internal.pool.PoolImpl;
+import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.GenericDriver;

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

@@ -11,34 +11,34 @@
 package io.vertx.oracleclient.spi;
 
 import io.vertx.core.Future;
-import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.core.internal.CloseFuture;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.NetClientOptions;
 import io.vertx.oracleclient.OracleConnectOptions;
 import io.vertx.oracleclient.impl.*;
-import io.vertx.sqlclient.Pool;
-import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.internal.Connection;
-import io.vertx.sqlclient.internal.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.GenericDriver;
 
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 public class OracleDriver extends GenericDriver<OracleConnectOptions> {
 
   private static final String DISCRIMINANT = "oracleclient";
 
+  private static final Function<Connection, Future<Void>> AFTER_ACQUIRE = conn -> ((OracleJdbcConnection) conn).afterAcquire();
+  private static final Function<Connection, Future<Void>> BEFORE_RECYCLE = conn -> ((OracleJdbcConnection) conn).beforeRecycle();
+
   public static final OracleDriver INSTANCE = new OracleDriver();
 
+  public OracleDriver() {
+    super(AFTER_ACQUIRE, BEFORE_RECYCLE);
+  }
+
   @Override
   protected String discriminant() {
     return DISCRIMINANT;
@@ -49,18 +49,6 @@ public OracleConnectOptions downcast(SqlConnectOptions connectOptions) {
     return connectOptions instanceof OracleConnectOptions ? (OracleConnectOptions) connectOptions : new OracleConnectOptions(connectOptions);
   }
 
-  @Override
-  protected Pool newPool(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<OracleConnectOptions>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
-    Function<Connection, Future<Void>> afterAcquire = conn -> ((OracleJdbcConnection) conn).afterAcquire();
-    Function<Connection, Future<Void>> beforeRecycle = conn -> ((OracleJdbcConnection) conn).beforeRecycle();
-    ConnectionFactory<OracleConnectOptions> factory = createConnectionFactory(vertx, null);
-    PoolImpl pool = new PoolImpl(vertx, this,  false, poolOptions, afterAcquire, beforeRecycle,
-      factory, databases, connectHandler, closeFuture);
-    pool.init();
-    closeFuture.add(factory);
-    return pool;
-  }
-
   @Override
   public OracleConnectOptions parseConnectionUri(String uri) {
     JsonObject conf = OracleConnectionUriParser.parse(uri, false);

vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java

@@ -18,7 +18,7 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.internal.Connection;
-import io.vertx.sqlclient.internal.pool.PoolImpl;
+import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.GenericDriver;

vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java

@@ -34,7 +34,7 @@
 
 import java.util.function.Function;
 
-import static io.vertx.sqlclient.internal.pool.PoolImpl.startPropagatableConnection;
+import static io.vertx.sqlclient.impl.pool.PoolImpl.startPropagatableConnection;
 
 /**
  * A connection pool which reuses a number of SQL connections.

vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/CloseablePool.java renamed to vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/CloseablePool.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.sqlclient.internal.pool;
+package io.vertx.sqlclient.impl.pool;
 
 import io.vertx.codegen.annotations.Nullable;
 import io.vertx.core.Future;

vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/PoolImpl.java renamed to vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/PoolImpl.java

@@ -15,7 +15,7 @@
  *
  */
 
-package io.vertx.sqlclient.internal.pool;
+package io.vertx.sqlclient.impl.pool;
 
 import io.vertx.codegen.annotations.Nullable;
 import io.vertx.core.*;
@@ -27,7 +27,6 @@
 import io.vertx.core.spi.metrics.VertxMetrics;
 import io.vertx.sqlclient.*;
 import io.vertx.sqlclient.impl.TransactionPropagationLocal;
-import io.vertx.sqlclient.impl.pool.SqlConnectionPool;
 import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.internal.SqlClientBase;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/GenericDriver.java

@@ -10,9 +10,11 @@
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.internal.pool.CloseablePool;
-import io.vertx.sqlclient.internal.pool.PoolImpl;
+import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.impl.pool.CloseablePool;
+import io.vertx.sqlclient.impl.pool.PoolImpl;
 
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 public abstract class GenericDriver<O extends SqlConnectOptions> implements Driver<O> {
@@ -23,6 +25,19 @@ public abstract class GenericDriver<O extends SqlConnectOptions> implements Driv
 
   protected abstract String discriminant();
 
+  private final Function<Connection, Future<Void>> afterAcquire;
+  private final Function<Connection, Future<Void>> beforeRecycle;
+
+  public GenericDriver() {
+    this.afterAcquire = null;
+    this.beforeRecycle = null;
+  }
+
+  public GenericDriver(Function<Connection, Future<Void>> afterAcquire, Function<Connection, Future<Void>> beforeRecycle) {
+    this.afterAcquire = afterAcquire;
+    this.beforeRecycle = beforeRecycle;
+  }
+
   @Override
   public Pool newPool(Vertx vertx, Supplier<Future<O>> databases, PoolOptions options, NetClientOptions transportOptions, Handler<SqlConnection> connectHandler, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
@@ -37,7 +52,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<O>> databases, PoolOptions opti
 
   protected Pool newPool(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<O>> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) {
     ConnectionFactory<O> factory = createConnectionFactory(vertx, transportOptions);
-    PoolImpl pool = new PoolImpl(vertx, this, false, poolOptions, null, null,
+    PoolImpl pool = new PoolImpl(vertx, this, false, poolOptions, afterAcquire, beforeRecycle,
       factory, databases, connectHandler, closeFuture);
     pool.init();
     closeFuture.add(factory);

vertx-sql-client/src/main/java/module-info.java

@@ -24,8 +24,7 @@
 
   exports io.vertx.sqlclient.internal;
   exports io.vertx.sqlclient.internal.command;
-  exports io.vertx.sqlclient.internal.pool;
-
+  
   // Expose impl to our own implementation, this actually would deserve to be in another module since it is not
   // related to the API or the internal API