Update to connection pool changes

Author: vietj

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

@@ -151,9 +151,8 @@ public int size() {
 
   public void evict() {
     long now = System.currentTimeMillis();
-    pool.evict(conn -> conn.shouldEvict(now)).onComplete(ar -> {
-      if (ar.succeeded()) {
-        List<PooledConnection> res = ar.result();
+    pool.evict(conn -> conn.shouldEvict(now), (res, err) -> {
+      if (err == null) {
         for (PooledConnection conn : res) {
           conn.close(Promise.promise());
         }
@@ -187,8 +186,7 @@ public <R> void execute(CommandBase<R> cmd, Completable<R> handler) {
     ContextInternal context = vertx.getOrCreateContext();
     Promise<Lease<PooledConnection>> p = context.promise();
     Object metric = enqueueMetric();
-    pool.acquire(context, 0)
-      .onComplete(p);
+    pool.acquire(context, 0, p);
     p.future().compose(lease -> {
       dequeueMetric(metric);
       PooledConnection pooled = lease.get();
@@ -254,9 +252,9 @@ private void handle(Lease<PooledConnection> lease) {
       public void onEnqueue(PoolWaiter<PooledConnection> waiter) {
         if (timeout > 0L && timerID == -1L) {
           timerID = context.setTimer(timeout, id -> {
-            pool.cancel(waiter).onComplete(ar -> {
-              if (ar.succeeded()) {
-                if (ar.result()) {
+            pool.cancel(waiter, (res, err) -> {
+              if (err == null) {
+                if (res) {
                   handler.fail("Timeout");
                 }
               } else {
@@ -274,17 +272,14 @@ public void onConnect(PoolWaiter<PooledConnection> waiter) {
     }
     Object metric = enqueueMetric();
     PoolRequest request = new PoolRequest(metric);
-    pool.acquire(context, request, 0)
-      .onComplete(request);
+    pool.acquire(context, request, 0, request);
   }
 
   public Future<Void> close() {
     Promise<Void> promise = vertx.promise();
-    pool.close().onComplete(ar1 -> {
-      if (ar1.succeeded()) {
-        List<Future<Void>> results = ar1
-          .result()
-          .stream()
+    pool.close((res, err) -> {
+      if (err == null) {
+        List<Future<Void>> results = res.stream()
           .map(connection -> connection
             .compose(pooled -> Future.<Void>future(p -> pooled.conn.close(pooled, p))))
           .collect(Collectors.toList());
@@ -293,7 +288,7 @@ public Future<Void> close() {
           .<Void>mapEmpty()
           .onComplete(promise);
       } else {
-        promise.fail(ar1.cause());
+        promise.fail(err);
       }
     });
     return promise.future();