Cleanup in Oracle client, stop using CommandResponse which is actually not needed, since that is a command response message for Netty based pipelines.

Author: vietj

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

@@ -200,10 +200,9 @@ private void checkPending() {
           metrics.close();
         }
         OracleCommand action = wrap(cmd);
-        action.handler = handler;
-        Future<Void> future = action.processCommand(cmd, handler);
+        Future<?> future = action.processCommand(handler);
         CommandBase capture = cmd;
-        future.onComplete(ar -> actionComplete(capture, action, ar));
+        future.onComplete(ar -> actionComplete(action, ar));
       }
     } finally {
       executing = false;
@@ -254,7 +253,7 @@ private OracleCommand forExtendedQuery(ExtendedQueryCommand cmd) {
     return action;
   }
 
-  private void actionComplete(CommandBase cmd, OracleCommand<?> action, AsyncResult<Void> ar) {
+  private void actionComplete(OracleCommand<?> action, AsyncResult<?> ar) {
     inflight = false;
     Future<Void> future = Future.succeededFuture();
     if (ar.failed()) {

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

@@ -10,13 +10,12 @@
  */
 package io.vertx.oracleclient.impl.commands;
 
+import io.vertx.core.AsyncResult;
 import io.vertx.core.Completable;
 import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.oracleclient.impl.Helper.SQLBlockingCodeHandler;
-import io.vertx.sqlclient.internal.command.CommandBase;
-import io.vertx.sqlclient.internal.command.CommandResponse;
 import oracle.jdbc.OracleConnection;
 
 import java.util.concurrent.Flow;
@@ -26,26 +25,21 @@
 
 public abstract class OracleCommand<T> {
 
-  public Completable<T> handler;
   protected final OracleConnection oracleConnection;
   protected final ContextInternal connectionContext;
-  private CommandResponse<T> response;
+  private Completable<T> handler;
+  private AsyncResult<T> result;
 
   protected OracleCommand(OracleConnection oracleConnection, ContextInternal connectionContext) {
     this.oracleConnection = oracleConnection;
     this.connectionContext = connectionContext;
   }
 
-  public final Future<Void> processCommand(CommandBase<T> cmd, Completable<T> handler) {
+  public final Future<?> processCommand(Completable<T> handler) {
+    this.handler = handler;
     return execute().andThen(ar -> {
-      if (ar.succeeded()) {
-        response = CommandResponse.success(ar.result());
-      } else {
-        response = CommandResponse.failure(ar.cause());
-      }
-      response.cmd = cmd;
-      response.handler = handler;
-    }).mapEmpty();
+      this.result =  ar;
+    });
   }
 
   protected abstract Future<T> execute();
@@ -90,6 +84,6 @@ public void onComplete() {
   }
 
   public final void fireResponse() {
-    response.fire();
+    handler.complete(result.result(), result.cause());
   }
 }