Remove usage of Handler/AsyncResult idiom.

Author: vietj

src/main/generated/io/vertx/httpproxy/ProxyOptionsConverter.java

@@ -0,0 +1,45 @@
+package io.vertx.httpproxy;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+
+/**
+ * Converter and mapper for {@link io.vertx.httpproxy.ProxyOptions}.
+ * NOTE: This class has been automatically generated from the {@link io.vertx.httpproxy.ProxyOptions} original class using Vert.x codegen.
+ */
+public class ProxyOptionsConverter {
+
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, ProxyOptions obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+        case "cacheOptions":
+          if (member.getValue() instanceof JsonObject) {
+            obj.setCacheOptions(new io.vertx.httpproxy.cache.CacheOptions((io.vertx.core.json.JsonObject)member.getValue()));
+          }
+          break;
+        case "supportWebSocket":
+          if (member.getValue() instanceof Boolean) {
+            obj.setSupportWebSocket((Boolean)member.getValue());
+          }
+          break;
+      }
+    }
+  }
+
+   static void toJson(ProxyOptions obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(ProxyOptions obj, java.util.Map<String, Object> json) {
+    if (obj.getCacheOptions() != null) {
+      json.put("cacheOptions", obj.getCacheOptions().toJson());
+    }
+    json.put("supportWebSocket", obj.getSupportWebSocket());
+  }
+}

src/main/generated/io/vertx/httpproxy/cache/CacheOptionsConverter.java

@@ -0,0 +1,37 @@
+package io.vertx.httpproxy.cache;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.json.JsonArray;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.util.Base64;
+
+/**
+ * Converter and mapper for {@link io.vertx.httpproxy.cache.CacheOptions}.
+ * NOTE: This class has been automatically generated from the {@link io.vertx.httpproxy.cache.CacheOptions} original class using Vert.x codegen.
+ */
+public class CacheOptionsConverter {
+
+  private static final Base64.Decoder BASE64_DECODER = Base64.getUrlDecoder();
+  private static final Base64.Encoder BASE64_ENCODER = Base64.getUrlEncoder().withoutPadding();
+
+   static void fromJson(Iterable<java.util.Map.Entry<String, Object>> json, CacheOptions obj) {
+    for (java.util.Map.Entry<String, Object> member : json) {
+      switch (member.getKey()) {
+        case "maxSize":
+          if (member.getValue() instanceof Number) {
+            obj.setMaxSize(((Number)member.getValue()).intValue());
+          }
+          break;
+      }
+    }
+  }
+
+   static void toJson(CacheOptions obj, JsonObject json) {
+    toJson(obj, json.getMap());
+  }
+
+   static void toJson(CacheOptions obj, java.util.Map<String, Object> json) {
+    json.put("maxSize", obj.getMaxSize());
+  }
+}

src/main/java/io/vertx/httpproxy/impl/ProxiedRequest.java

@@ -146,13 +146,7 @@ public ProxyResponse response() {
     return new ProxiedResponse(this, proxiedRequest.response());
   }
 
-  void sendRequest(Handler<AsyncResult<ProxyResponse>> responseHandler) {
-
-    request.response().<ProxyResponse>map(r -> {
-      r.pause(); // Pause it
-      return new ProxiedResponse(this, proxiedRequest.response(), r);
-    }).onComplete(responseHandler);
-
+  Future<ProxyResponse> sendRequest() {
 
     request.setMethod(method);
     request.setURI(uri);
@@ -192,6 +186,11 @@ void sendRequest(Handler<AsyncResult<ProxyResponse>> responseHandler) {
         request.reset();
       }
     });
+
+    return request.response().<ProxyResponse>map(r -> {
+      r.pause(); // Pause it
+      return new ProxiedResponse(this, proxiedRequest.response(), r);
+    });
   }
 
   private static boolean equals(HostAndPort hp1, HostAndPort hp2) {
@@ -214,9 +213,7 @@ public MultiMap headers() {
 
   @Override
   public Future<ProxyResponse> send(HttpClientRequest request) {
-    Promise<ProxyResponse> promise = context.promise();
     this.request = request;
-    sendRequest(promise);
-    return promise.future();
+    return sendRequest();
   }
 }

src/main/java/io/vertx/httpproxy/impl/ProxiedResponse.java

@@ -167,12 +167,6 @@ public ProxyResponse putHeader(CharSequence name, CharSequence value) {
 
   @Override
   public Future<Void> send() {
-    Promise<Void> promise = request.context.promise();
-    send(promise);
-    return promise.future();
-  }
-
-  public void send(Handler<AsyncResult<Void>> completionHandler) {
     // Set stuff
     proxiedResponse.setStatusCode(statusCode);
 
@@ -222,32 +216,30 @@ public void send(Handler<AsyncResult<Void>> completionHandler) {
 
     //
     if (body == null) {
-      proxiedResponse.end();
-      return;
-    }
-
-    long len = body.length();
-    if (len >= 0) {
-      proxiedResponse.putHeader(HttpHeaders.CONTENT_LENGTH, Long.toString(len));
+      return proxiedResponse.end();
     } else {
-      if (request.proxiedRequest().version() == HttpVersion.HTTP_1_0) {
-        // Special handling for HTTP 1.0 clients that cannot handle chunked encoding
-        // we need to buffer the content
-        BufferingWriteStream buffer = new BufferingWriteStream();
-        body.stream().pipeTo(buffer).onComplete(ar -> {
-          if (ar.succeeded()) {
-            Buffer content = buffer.content();
-            proxiedResponse.end(content).onComplete(completionHandler);
-          } else {
-            System.out.println("Not implemented");
-          }
-        });
-        return;
+      long len = body.length();
+      if (len >= 0) {
+        proxiedResponse.putHeader(HttpHeaders.CONTENT_LENGTH, Long.toString(len));
+      } else {
+        if (request.proxiedRequest().version() == HttpVersion.HTTP_1_0) {
+          // Special handling for HTTP 1.0 clients that cannot handle chunked encoding
+          // we need to buffer the content
+          BufferingWriteStream buffer = new BufferingWriteStream();
+          return
+            body
+            .stream()
+            .pipeTo(buffer)
+            .compose(v -> {
+              Buffer content = buffer.content();
+              return proxiedResponse.end(content);
+            });
+        }
+        proxiedResponse.setChunked(true);
       }
-      proxiedResponse.setChunked(true);
+      ReadStream<Buffer> bodyStream = body.stream();
+      return sendResponse(bodyStream);
     }
-    ReadStream<Buffer> bodyStream = body.stream();
-    sendResponse(bodyStream, completionHandler);
   }
 
   @Override
@@ -261,16 +253,17 @@ public ProxyResponse release() {
     return this;
   }
 
-  private void sendResponse(ReadStream<Buffer> body, Handler<AsyncResult<Void>> completionHandler) {
+  private Future<Void> sendResponse(ReadStream<Buffer> body) {
     Pipe<Buffer> pipe = body.pipe();
     pipe.endOnSuccess(true);
     pipe.endOnFailure(false);
-    pipe.to(proxiedResponse).onComplete(ar -> {
+    return pipe
+      .to(proxiedResponse)
+      .andThen(ar -> {
       if (ar.failed()) {
         request.request.reset();
         proxiedResponse.reset();
       }
-      completionHandler.handle(ar);
     });
   }
 }