Move some code from PoolBase as default methods in Pool to ease reuse

Author: vietj

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

@@ -145,12 +145,31 @@ static Pool pool(Vertx vertx, SqlConnectOptions connectOptions, PoolOptions pool
    * @param function the code to execute
    * @param handler the result handler
    */
-  <T> void withTransaction(Function<SqlClient, Future<T>> function, Handler<AsyncResult<T>> handler);
+  default <T> void withTransaction(Function<SqlClient, Future<T>> function, Handler<AsyncResult<T>> handler) {
+    Future<T> res = withTransaction(function);
+    if (handler != null) {
+      res.onComplete(handler);
+    }
+  }
 
   /**
    * Like {@link #withTransaction(Function, Handler)} but returns a {@code Future} of the asynchronous result
    */
-  <T> Future<T> withTransaction(Function<SqlClient, Future<T>> function);
+  default <T> Future<T> withTransaction(Function<SqlClient, Future<T>> function) {
+    return getConnection()
+      .flatMap(conn -> conn
+        .begin()
+        .flatMap(tx -> function
+          .apply(conn)
+          .compose(
+            res -> tx
+              .commit()
+              .flatMap(v -> Future.succeededFuture(res)),
+            err -> tx
+              .rollback()
+              .flatMap(v -> Future.failedFuture(err))))
+        .onComplete(ar -> conn.close()));
+  }
 
   /**
    * Close the pool and release the associated resources.

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolBase.java

@@ -24,7 +24,6 @@
 import io.vertx.core.impl.VertxInternal;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
-import io.vertx.sqlclient.SqlClient;
 import io.vertx.sqlclient.SqlConnection;
 import io.vertx.sqlclient.impl.command.CommandBase;
 import io.vertx.core.AsyncResult;
@@ -33,8 +32,6 @@
 import io.vertx.sqlclient.impl.pool.ConnectionPool;
 import io.vertx.sqlclient.impl.tracing.QueryTracer;
 
-import java.util.function.Function;
-
 /**
  * @author <a href="mailto:julien@julienviet.com">Julien Viet</a>
  * @author <a href="mailto:emad.albloushi@gmail.com">Emad Alblueshi</a>
@@ -75,11 +72,6 @@ protected <T> Promise<T> promise(Handler<AsyncResult<T>> handler) {
    */
   public abstract void connect(Handler<AsyncResult<Connection>> completionHandler);
 
-  private void acquire(Handler<AsyncResult<Connection>> completionHandler) {
-    pool.acquire(completionHandler);
-  }
-
-
   @Override
   public void getConnection(Handler<AsyncResult<SqlConnection>> handler) {
     Future<SqlConnection> fut = getConnection();
@@ -100,31 +92,6 @@ public Future<SqlConnection> getConnection() {
     });
   }
 
-  @Override
-  public <T> void withTransaction(Function<SqlClient, Future<T>> function, Handler<AsyncResult<T>> handler) {
-    Future<T> res = withTransaction(function);
-    if (handler != null) {
-      res.onComplete(handler);
-    }
-  }
-
-  @Override
-  public <T> Future<T> withTransaction(Function<SqlClient, Future<T>> function) {
-    return getConnection()
-      .flatMap(conn -> conn
-        .begin()
-        .flatMap(tx -> function
-          .apply(conn)
-          .compose(
-            res -> tx
-              .commit()
-              .flatMap(v -> Future.succeededFuture(res)),
-            err -> tx
-              .rollback()
-              .flatMap(v -> Future.failedFuture(err))))
-        .onComplete(ar -> conn.close()));
-  }
-
   @Override
   public <R> void schedule(CommandBase<R> cmd, Promise<R> promise) {
     acquire(new CommandWaiter() {
@@ -141,7 +108,11 @@ protected void onFailure(Throwable cause) {
     });
   }
 
-  private abstract class CommandWaiter implements Connection.Holder, Handler<AsyncResult<Connection>> {
+  private void acquire(Handler<AsyncResult<Connection>> completionHandler) {
+    pool.acquire(completionHandler);
+  }
+
+  private static abstract class CommandWaiter implements Connection.Holder, Handler<AsyncResult<Connection>> {
 
     protected abstract void onSuccess(Connection conn);