From f40780428c7d18ef96ce2dfede14399c127f4adf Mon Sep 17 00:00:00 2001
From: Paulo Lopes <pmlopes@gmail.com>
Date: Wed, 29 Jan 2020 21:01:58 +0100
Subject: [PATCH] Upgrade versions and used Handler interface

Signed-off-by: Paulo Lopes <pmlopes@gmail.com>
---
 .../java11-vert-x/entrypoint/build.gradle     |  2 +-
 .../java/com/openfaas/entrypoint/App.java     | 13 ++++++----
 template/java11-vert-x/function/build.gradle  |  2 +-
 .../java/com/openfaas/function/Handler.java   | 24 +------------------
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/template/java11-vert-x/entrypoint/build.gradle b/template/java11-vert-x/entrypoint/build.gradle
index e4514524..d5206cc4 100644
--- a/template/java11-vert-x/entrypoint/build.gradle
+++ b/template/java11-vert-x/entrypoint/build.gradle
@@ -20,7 +20,7 @@ mainClassName = 'App'
 
 dependencies {
     // Vert.x project
-    compile 'io.vertx:vertx-web:3.5.4'
+    compile 'io.vertx:vertx-web:3.8.5'
 
     // Use JUnit test framework
     testCompile 'junit:junit:4.12'
diff --git a/template/java11-vert-x/entrypoint/src/main/java/com/openfaas/entrypoint/App.java b/template/java11-vert-x/entrypoint/src/main/java/com/openfaas/entrypoint/App.java
index bb68b130..4a2aadfa 100644
--- a/template/java11-vert-x/entrypoint/src/main/java/com/openfaas/entrypoint/App.java
+++ b/template/java11-vert-x/entrypoint/src/main/java/com/openfaas/entrypoint/App.java
@@ -7,6 +7,9 @@
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.handler.StaticHandler;
 import io.vertx.ext.web.handler.BodyHandler;
+
+import com.openfaas.function.Handler;
+
 import java.util.Optional;
 
 public class App {
@@ -18,13 +21,15 @@ public static void main(String[] args) throws Exception {
 
     if (Boolean.parseBoolean(Optional.ofNullable(System.getenv("FRONTAPP")).orElse("false"))) {
       // serve static assets, see /resources/webroot directory
-      router.route("/*").handler(StaticHandler.create());
+      router.route().handler(StaticHandler.create());
     } else {
-      BodyHandler handler = new com.openfaas.function.Handler();
-      router.route().handler(handler);
+      // enable body parsing (i.e.: POST, multipart, etc...)
+      router.route().handler(BodyHandler.create());
+      // allow usage of any verb for the function
+      router.route().handler(new Handler());
     }
 
-    server.requestHandler(router::accept).listen(httpPort, result -> {
+    server.requestHandler(router).listen(httpPort, result -> {
       if(result.succeeded()) {
         System.out.println("Listening on port " + httpPort);
       } else {
diff --git a/template/java11-vert-x/function/build.gradle b/template/java11-vert-x/function/build.gradle
index 2e8b4339..24e87f40 100644
--- a/template/java11-vert-x/function/build.gradle
+++ b/template/java11-vert-x/function/build.gradle
@@ -13,7 +13,7 @@ plugins {
 
 dependencies {
     // Vert.x project
-    compile 'io.vertx:vertx-web:3.5.4'
+    compile 'io.vertx:vertx-web:3.8.5'
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'    
diff --git a/template/java11-vert-x/function/src/main/java/com/openfaas/function/Handler.java b/template/java11-vert-x/function/src/main/java/com/openfaas/function/Handler.java
index 1d4a4709..40aba6a2 100644
--- a/template/java11-vert-x/function/src/main/java/com/openfaas/function/Handler.java
+++ b/template/java11-vert-x/function/src/main/java/com/openfaas/function/Handler.java
@@ -1,11 +1,9 @@
 package com.openfaas.function;
 
-import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.BodyHandler;
 import io.vertx.core.json.JsonObject;
 
-public class Handler implements BodyHandler {
+public class Handler implements io.vertx.core.Handler<RoutingContext> {
 
   @Override
   public void handle(RoutingContext routingContext) {
@@ -17,24 +15,4 @@ public void handle(RoutingContext routingContext) {
           .encodePrettily()
       );
   }
-
-  @Override
-  public BodyHandler setBodyLimit(long bodyLimit) {
-    return null;
-  }
-
-  @Override
-  public BodyHandler setUploadsDirectory(String uploadsDirectory) {
-    return null;
-  }
-
-  @Override
-  public BodyHandler setMergeFormAttributes(boolean mergeFormAttributes) {
-    return null;
-  }
-
-  @Override
-  public BodyHandler setDeleteUploadedFilesOnEnd(boolean deleteUploadedFilesOnEnd) {
-    return null;
-  }
 }