router and future already extends from Handler

Author: okou19900722

cloudfoundry-example/src/main/java/hello/MainVerticle.java

@@ -49,7 +49,7 @@ public void start(Future<Void> startFuture) throws Exception {
         Router mainRouter = Router.router(getVertx());
         mainRouter.route("/*")
                 .handler(StaticHandler.create());
-        httpServer.requestHandler(mainRouter::accept);
+        httpServer.requestHandler(mainRouter);
 
         // Start listening
         httpServer.listen(PORT, asyncResult -> {

http2-showcase/src/main/java/io/vertx/examples/http2/Http2ServerVerticle.java

@@ -37,14 +37,14 @@ public class Http2ServerVerticle extends AbstractVerticle {
     @Override
     public void start(Future<Void> future) {
         http1 = vertx.createHttpServer(createOptions(false));
-        http1.requestHandler(createRouter("http://localhost:8080/image.hbs")::accept);
+        http1.requestHandler(createRouter("http://localhost:8080/image.hbs"));
         http1.listen(res -> {
             if (res.failed()) {
                 future.fail(res.cause());
                 return;
             }
             http2 = vertx.createHttpServer(createOptions(true));
-            http2.requestHandler(createRouter("https://localhost:8443/image.hbs")::accept);
+            http2.requestHandler(createRouter("https://localhost:8443/image.hbs"));
             http2.listen(res2 -> {
                 if (res2.failed()) {
                     future.fail(res.cause());
@@ -57,7 +57,7 @@ public void start(Future<Void> future) {
 
     @Override
     public void stop(Future<Void> future) {
-        http1.close(res -> http2.close(future.completer()));
+        http1.close(res -> http2.close(future));
     }
 
 

java9-examples/src/main/java/io/vertx/example/java9/web/Server.java

@@ -29,7 +29,7 @@ public void start(Future<Void> startFuture) throws Exception {
     });
 
     vertx.createHttpServer()
-      .requestHandler(router::accept)
+      .requestHandler(router)
       .listen(8080, ar -> startFuture.handle(ar.mapEmpty()));
   }
 }

kafka-examples/src/main/java/io/vertx/example/kafka/dashboard/DashboardVerticle.java

@@ -29,7 +29,7 @@ public void start() throws Exception {
 
     // Start http server
     HttpServer httpServer = vertx.createHttpServer();
-    httpServer.requestHandler(router::accept).listen(8080, ar -> {
+    httpServer.requestHandler(router).listen(8080, ar -> {
       if (ar.succeeded()) {
         System.out.println("Http server started");
       } else {

kotlin-examples/kotlintest/src/test/kotlin/org/digieng/vertx/kotlintest/Server.kt

@@ -16,7 +16,7 @@ class Server : AbstractVerticle() {
         val router = Router.router(vertx)
 
         setupRoutes(router)
-        vertx.createHttpServer(serverOptions).requestHandler(router::accept).listen()
+        vertx.createHttpServer(serverOptions).requestHandler(router).listen()
         println("Server running on http://${serverOptions.host}:${serverOptions.port}")
     }
 
@@ -39,4 +39,4 @@ class Server : AbstractVerticle() {
     override fun stop() {
         println("Stopping server...")
     }
-}
+}

metrics-examples/src/main/groovy/io/vertx/example/metrics/dashboard/dashboard.groovy

@@ -23,7 +23,7 @@ router.route("/eventbus/*").handler(SockJSHandler.create(vertx).bridge(options))
 router.route().handler(StaticHandler.create())
 
 def httpServer = vertx.createHttpServer()
-httpServer.requestHandler(router.&accept).listen(8080)
+httpServer.requestHandler(router).listen(8080)
 
 // Send a metrics events every second
 vertx.setPeriodic(1000, { t ->

metrics-examples/src/main/java/io/vertx/example/metrics/dashboard/Dashboard.java

@@ -59,7 +59,7 @@ public void start() {
     router.route().handler(StaticHandler.create());
 
     HttpServer httpServer = vertx.createHttpServer();
-    httpServer.requestHandler(router::accept).listen(8080);
+    httpServer.requestHandler(router).listen(8080);
 
     // Send a metrics events every second
     vertx.setPeriodic(1000, t -> {

metrics-examples/src/main/java/io/vertx/example/metrics/prometheus/PrometheusMetricsVerticle.java

@@ -29,7 +29,7 @@ public void start() throws Exception {
     router.get("/metrics").handler(new MetricsHandler());
 
     //Start httpserver on localhost:8080
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
 
     //Increase counter every second
     vertx.setPeriodic(1_000L, e -> metricRegistry.counter("testCounter").inc());

micrometer-metrics-examples/src/main/java/io/vertx/example/micrometer/verticles/SimpleWebServer.java

@@ -13,6 +13,6 @@ public void start() throws Exception {
     router.get("/").handler(ctx -> {
       Greetings.get(vertx, greetingResult -> ctx.response().end(greetingResult.result()));
     });
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 }

micrometer-metrics-examples/src/main/java/io/vertx/example/micrometer/verticles/WebServerForBoundPrometheus.java

@@ -24,6 +24,6 @@ public void start() throws Exception {
     router.get("/").handler(ctx -> {
       Greetings.get(vertx, greetingResult -> ctx.response().end(greetingResult.result()));
     });
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 }

openshift3-examples/README.adoc

@@ -31,7 +31,7 @@ public void start() {
           System.out.println("D'oh the service is not available");
         } else {
           client = ar.result();
-          vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+          vertx.createHttpServer().requestHandler(router).listen(8080);
         }
       }));
   }

openshift3-examples/vertx-kubernetes-applications/vertx-kubernetes-client-application/src/main/java/io/vertx/example/kubernetes/client/ClientApplication.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     router.get("/:name").handler(rc -> rc.response().end("Hello " + rc.pathParam("name")));
 
     vertx.createHttpServer()
-      .requestHandler(router::accept)
+      .requestHandler(router)
       .listen(8080);
   }
 }

openshift3-examples/vertx-kubernetes-applications/vertx-kubernetes-greeting-application/src/main/java/io/vertx/example/kubernetes/greeting/GreetingApplication.java

@@ -24,7 +24,7 @@ public void start() {
     });
 
     vertx.createHttpServer()
-        .requestHandler(router::accept)
+        .requestHandler(router)
         .listen(8080);
 
   }

openshift3-examples/vertx-openshift-applications/vertx-clustered-application/clustered-application-http/src/main/java/io/vertx/examples/openshift/MyHttpVerticle.java

@@ -17,7 +17,7 @@ public static void main(String[] args) {
 
     // Start the HTTP server.
     vertx.createHttpServer()
-      .requestHandler(router::accept)
+      .requestHandler(router)
       .listen(8080);
   }
 }

openshift3-examples/vertx-openshift-applications/vertx-greeting-application/src/main/java/io/vertx/example/openshift/greeting/MyGreetingApp.java

@@ -13,7 +13,7 @@ public void start() {
       router.get("/").handler(rc -> rc.response().end(UUID.randomUUID().toString()));
 
       vertx.createHttpServer()
-        .requestHandler(router::accept)
+        .requestHandler(router)
         .listen(8080);
     }
 }

openshift3-examples/vertx-openshift-applications/vertx-id-generator/src/main/java/io/vertx/example/openshift/IdGeneratorVerticle.java

@@ -50,7 +50,7 @@ public void start() throws Exception {
 
       LOGGER.info("Creating HTTP server for vert.x web application");
       HttpServer server = vertx.createHttpServer();
-      server.requestHandler(router::accept).listen(8081);
+      server.requestHandler(router).listen(8081);
     });
   }
 

osgi-examples/src/main/java/io/vertx/example/osgi/VertxWebApplication.java

@@ -23,6 +23,6 @@ public void start() throws Exception {
       routingContext.response().putHeader("content-type", "text/html").end("Hello World!");
     });
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 }

rxjava-1-examples/src/main/java/io/vertx/example/rxjava/web/helloworld/Server.java

@@ -42,7 +42,7 @@ public void start() throws Exception {
     // Serve the static resources
     router.route().handler(StaticHandler.create());
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
 
     // Publish a message to the address "news-feed" every second
     vertx.setPeriodic(1000, t -> vertx.eventBus().publish("news-feed", "news from the server!"));

rxjava-1-examples/src/main/java/io/vertx/example/rxjava/web/realtime/Server.java

@@ -23,6 +23,6 @@ public void start() throws Exception {
       routingContext.response().putHeader("content-type", "text/html").end("Hello World!");
     });
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 }

rxjava-2-examples/src/main/java/io/vertx/example/reactivex/web/helloworld/Server.java

@@ -42,7 +42,7 @@ public void start() throws Exception {
     // Serve the static resources
     router.route().handler(StaticHandler.create());
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
 
     // Publish a message to the address "news-feed" every second
     vertx.setPeriodic(1000, t -> vertx.eventBus().publish("news-feed", "news from the server!"));

rxjava-2-examples/src/main/java/io/vertx/example/reactivex/web/realtime/Server.java

@@ -47,7 +47,7 @@ public void start() throws Exception {
     router.route().handler(StaticHandler.create());
 
     //
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
 
   }
 

service-proxy-examples/service-provider/src/main/java/io/vertx/examples/service/ProcessorServiceVerticle.java

@@ -39,6 +39,6 @@ public void start() throws Exception {
     // Serve the static resources
     router.route().handler(StaticHandler.create());
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 }

service-proxy-examples/sockjs-proxies/src/main/java/io/vertx/example/web/proxies/Server.java

@@ -57,7 +57,7 @@ public void start(Future<Void> startFuture) throws Exception {
     StaticHandler staticHandler = StaticHandler.create();
     router.route().handler(staticHandler);
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080, listen -> {
+    vertx.createHttpServer().requestHandler(router).listen(8080, listen -> {
       if (listen.succeeded()) {
         LOG.info("BookRestApi started");
         startFuture.complete();

spring-examples/spring-worker-example/src/main/java/io/vertx/example/spring/worker/BookRestApi.java

@@ -31,6 +31,6 @@ public class HelloVerticle extends AbstractVerticle {
   public void start(Future<Void> startFuture) throws Exception {
     vertx.eventBus().<String>consumer("hello", message -> {
       message.reply("Hello " + message.body() + " from " + ID);
-    }).completionHandler(startFuture.completer());
+    }).completionHandler(startFuture);
   }
 }

spring-examples/springboot-clustering/springboot-clustering-hazelcast/src/main/java/io/vertx/examples/spring/clustering/hazelcast/HelloVerticle.java

@@ -19,6 +19,6 @@ public void start() throws Exception {
     // Serve the static pages
     router.route().handler(StaticHandler.create());
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(configuration.httpPort());
+    vertx.createHttpServer().requestHandler(router).listen(configuration.httpPort());
   }
 }

spring-examples/springboot-example/src/main/java/io/vertx/example/StaticServer.java

@@ -42,4 +42,4 @@ router.route("/logout").handler({ context ->
 // Serve the non private static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/auth/server.groovy

@@ -81,4 +81,4 @@ router.route("/logout").handler({ context ->
 // Serve the non private static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/authjdbc/server.groovy

@@ -65,4 +65,4 @@ router.get("/api/protected/defcon3").handler({ ctx ->
 // Serve the non private static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/authorisation/server.groovy

@@ -19,4 +19,4 @@ router.route().handler({ routingContext ->
   routingContext.response().putHeader("content-type", "text/html").end("Hello World!")
 })
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/blockinghandler/server.groovy

@@ -26,7 +26,7 @@ router.route("/eventbus/*").handler(ebHandler)
 router.route().handler(StaticHandler.create())
 
 // Start the web server and tell it to use the router to handle requests.
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)
 
 def eb = vertx.eventBus()
 

web-examples/src/main/groovy/io/vertx/example/web/chat/server.groovy

@@ -35,4 +35,4 @@ router.route().handler({ ctx ->
 // Serve the static resources
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/cookie/server.groovy

@@ -54,4 +54,4 @@ router.post("/access-control-with-post-preflight").handler({ ctx ->
 // Serve the static resources
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/cors/server.groovy

@@ -97,4 +97,4 @@ router.get("/api/protected/defcon3").handler({ ctx ->
 // Serve the non private static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/custom_authorisation/server.groovy

@@ -6,4 +6,4 @@ router.route().handler({ routingContext ->
   routingContext.response().putHeader("content-type", "text/html").end("Hello World!")
 })
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/helloworld/server.groovy

@@ -19,4 +19,4 @@ vertx.createHttpServer([
     keyPath:"tls/server-key.pem",
     certPath:"tls/server-cert.pem"
   ]
-]).requestHandler(router.&accept).listen(8443)
+]).requestHandler(router).listen(8443)

web-examples/src/main/groovy/io/vertx/example/web/http2/server.groovy

@@ -34,4 +34,4 @@ router.get("/api/protected").handler({ ctx ->
 // Serve the non private static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/jwt/server.groovy

@@ -84,4 +84,4 @@ router.get("/protected").handler({ ctx ->
   })
 })
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/oauth2/server.groovy

@@ -26,4 +26,4 @@ router.route("/eventbus/*").handler(ebHandler)
 router.route().handler(StaticHandler.create())
 
 // Start the web server and tell it to use the router to handle requests.
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/react/server.groovy

@@ -75,4 +75,4 @@ router.get("/products/:productID").handler(this.&handleGetProduct)
 router.put("/products/:productID").handler(this.&handleAddProduct)
 router.get("/products").handler(this.&handleListProducts)
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/rest/simple_rest.groovy

@@ -20,4 +20,4 @@ router.route().handler({ routingContext ->
   routingContext.response().putHeader("content-type", "text/html").end("<html><body><h1>Hitcount: ${cnt}</h1></body></html>")
 })
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/sessions/server.groovy

@@ -6,7 +6,7 @@ def router = Router.router(vertx)
 // Serve the static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)
 
 println("Server is started")
 

web-examples/src/main/groovy/io/vertx/example/web/staticsite/server.groovy

@@ -27,4 +27,4 @@ router.get().handler({ ctx ->
 })
 
 // start a HTTP web server on port 8080
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/templating/freemarker/server.groovy

@@ -24,4 +24,4 @@ router.get().handler({ ctx ->
 })
 
 // start a HTTP web server on port 8080
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/templating/handlebars/server.groovy

@@ -15,4 +15,4 @@ router.route("/dynamic/*").handler({ ctx ->
 // Serve the static pages
 router.route().handler(StaticHandler.create())
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/templating/mvel/server.groovy

@@ -27,4 +27,4 @@ router.get().handler({ ctx ->
 })
 
 // start a HTTP web server on port 8080
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/templating/pebble/server.groovy

@@ -16,4 +16,4 @@ router.route().handler({ ctx ->
 // See the pom.xml for an example
 router.route().handler(TemplateHandler.create(RockerTemplateEngine.create()))
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/templating/rocker/server.groovy

@@ -26,4 +26,4 @@ router.post("/form").handler({ ctx ->
   ctx.response().end()
 })
 
-vertx.createHttpServer().requestHandler(router.&accept).listen(8080)
+vertx.createHttpServer().requestHandler(router).listen(8080)

web-examples/src/main/groovy/io/vertx/example/web/upload/server.groovy

@@ -110,7 +110,7 @@ public void start() throws Exception {
     // Serve the static resources
     router.route().handler(StaticHandler.create());
 
-    vertx.createHttpServer().requestHandler(router::accept).listen(8080);
+    vertx.createHttpServer().requestHandler(router).listen(8080);
   }
 
   private void listAlbums(Message<JsonObject> msg) {