Update to executeBlocking API change

Author: vietj

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/Helper.java

@@ -296,32 +296,32 @@ interface JdbcRow {
   }
 
   @FunctionalInterface
-  public interface SQLBlockingCodeHandler<T> extends Handler<Promise<T>> {
+  public interface SQLBlockingCodeHandler<T> extends java.util.concurrent.Callable<T> {
 
     T doHandle() throws SQLException;
 
     @Override
-    default void handle(Promise<T> promise) {
+    default T call() {
       try {
-        promise.complete(doHandle());
+        return doHandle();
       } catch (SQLException e) {
-        promise.fail(new OracleException(e));
+        throw new OracleException(e);
       }
     }
   }
 
   @FunctionalInterface
-  public interface SQLBlockingTaskHandler extends Handler<Promise<Void>> {
+  public interface SQLBlockingTaskHandler extends java.util.concurrent.Callable<Void> {
 
     void doHandle() throws SQLException;
 
     @Override
-    default void handle(Promise<Void> promise) {
+    default Void call() throws Exception {
       try {
         doHandle();
-        promise.complete(null);
+        return null;
       } catch (SQLException e) {
-        promise.fail(new OracleException(e));
+        throw new OracleException(e);
       }
     }
   }

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java

@@ -137,26 +137,18 @@ public int getSecretKey() {
 
   public Future<Void> afterAcquire() {
     PromiseInternal<Void> promise = context.owner().promise();
-    context.<Void>executeBlocking(prom -> {
-      try {
-        connection.beginRequest();
-        prom.complete();
-      } catch (SQLException e) {
-        prom.fail(e);
-      }
+    context.<Void>executeBlocking(() -> {
+      connection.beginRequest();
+      return null;
     }, false).onComplete(promise);
     return promise.future();
   }
 
   public Future<Void> beforeRecycle() {
     PromiseInternal<Void> promise = context.owner().promise();
-    context.<Void>executeBlocking(prom -> {
-      try {
-        connection.endRequest();
-        prom.complete();
-      } catch (SQLException e) {
-        prom.fail(e);
-      }
+    context.<Void>executeBlocking(() -> {
+      connection.endRequest();
+      return null;
     }, false).onComplete(promise);
     return promise.future();
   }

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleQueryCommand.java

@@ -12,6 +12,7 @@
 
 import io.vertx.core.Context;
 import io.vertx.core.Future;
+import io.vertx.core.VertxException;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.impl.ContextInternal;
 import io.vertx.core.json.JsonArray;
@@ -96,7 +97,7 @@ protected boolean returnAutoGeneratedKeys(Connection conn, OraclePrepareOptions
   protected abstract String query();
 
   private Future<OraclePreparedStatement> prepare(Connection conn, OraclePrepareOptions options, boolean returnAutoGeneratedKeys, Context context) {
-    return context.executeBlocking(prom -> {
+    return context.executeBlocking(() -> {
       String query = query();
       PreparedStatement ps = null;
       try {
@@ -119,20 +120,19 @@ private Future<OraclePreparedStatement> prepare(Connection conn, OraclePrepareOp
             }
             ps = conn.prepareStatement(query, keys);
           } else {
-            prom.fail("Invalid type of index, only [int, String] allowed");
-            return;
+            throw new VertxException("Invalid type of index, only [int, String] allowed", true);
           }
         } else {
           ps = conn.prepareStatement(query());
         }
 
         fillStatement(ps, conn);
 
-        prom.complete(ps.unwrap(OraclePreparedStatement.class));
+        return ps.unwrap(OraclePreparedStatement.class);
 
       } catch (SQLException e) {
         closeQuietly(ps);
-        prom.fail(e);
+        throw e;
       }
     }, false);
   }