Make sure request resumes on correct thread

Fixes #9693

Author: stuartwdouglas

extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/VertxHttpProcessor.java

@@ -103,11 +103,10 @@ public KubernetesPortBuildItem kubernetes() {
     @Record(ExecutionTime.RUNTIME_INIT)
     VertxWebRouterBuildItem initializeRouter(VertxHttpRecorder recorder,
             CoreVertxBuildItem vertx,
-            List<RouteBuildItem> routes, LaunchModeBuildItem launchModeBuildItem,
+            List<RouteBuildItem> routes,
             ShutdownContextBuildItem shutdown) {
 
-        RuntimeValue<Router> router = recorder.initializeRouter(vertx.getVertx(), launchModeBuildItem.getLaunchMode(),
-                shutdown);
+        RuntimeValue<Router> router = recorder.initializeRouter(vertx.getVertx());
         for (RouteBuildItem route : routes) {
             recorder.addRoute(router, route.getRouteFunction(), route.getHandler(), route.getType());
         }

extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java

@@ -180,15 +180,10 @@ public Integer get() {
         }
     }
 
-    public RuntimeValue<Router> initializeRouter(final Supplier<Vertx> vertxRuntimeValue,
-            final LaunchMode launchMode, final ShutdownContext shutdownContext) {
+    public RuntimeValue<Router> initializeRouter(final Supplier<Vertx> vertxRuntimeValue) {
 
         Vertx vertx = vertxRuntimeValue.get();
         Router router = Router.router(vertx);
-        if (hotReplacementHandler != null) {
-            router.route().order(Integer.MIN_VALUE).handler(hotReplacementHandler);
-        }
-
         return new RuntimeValue<>(router);
     }
 
@@ -294,14 +289,14 @@ public void handle(Void e) {
         Handler<HttpServerRequest> root;
         if (rootPath.equals("/")) {
             if (hotReplacementHandler != null) {
-                router.route().order(-1).handler(hotReplacementHandler);
+                router.route().order(Integer.MIN_VALUE).handler(hotReplacementHandler);
             }
             root = router;
         } else {
             Router mainRouter = Router.router(vertx.get());
             mainRouter.mountSubRouter(rootPath, router);
             if (hotReplacementHandler != null) {
-                mainRouter.route().order(-1).handler(hotReplacementHandler);
+                mainRouter.route().order(Integer.MIN_VALUE).handler(hotReplacementHandler);
             }
             root = mainRouter;
         }

extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/VertxHttpHotReplacementSetup.java

@@ -7,6 +7,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.impl.ConnectionBase;
 import io.vertx.ext.web.RoutingContext;
 
 public class VertxHttpHotReplacementSetup implements HotReplacementSetup {
@@ -39,7 +40,8 @@ void handleHotReplacementRequest(RoutingContext routingContext) {
             routingContext.next();
             return;
         }
-        routingContext.vertx().executeBlocking(new Handler<Promise<Boolean>>() {
+        ConnectionBase connectionBase = (ConnectionBase) routingContext.request().connection();
+        connectionBase.getContext().executeBlocking(new Handler<Promise<Boolean>>() {
             @Override
             public void handle(Promise<Boolean> event) {
                 boolean restart = false;

extensions/vertx-web/deployment/src/test/java/io/quarkus/vertx/web/VertxWebDevModeTestCase.java

@@ -0,0 +1,44 @@
+package io.quarkus.vertx.web;
+
+import java.util.function.Function;
+
+import org.hamcrest.Matchers;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusDevModeTest;
+import io.restassured.RestAssured;
+
+public class VertxWebDevModeTestCase {
+
+    @RegisterExtension
+    static QuarkusDevModeTest runner = new QuarkusDevModeTest()
+            .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+                    .addClasses(TestRoute.class));
+
+    @Test
+    public void testRunningInDevMode() {
+        RestAssured.given()
+                .body("OK")
+                .post("/test")
+                .then().statusCode(200)
+                .body(Matchers.equalTo("test route"));
+
+        runner.modifySourceFile(TestRoute.class, new Function<String, String>() {
+            @Override
+            public String apply(String s) {
+                return s.replace("test route", "new code");
+            }
+        });
+        for (int i = 0; i < 10; ++i) {
+            RestAssured.given()
+                    .body("OK")
+                    .post("/test")
+                    .then().statusCode(200)
+                    .body(Matchers.equalTo("new code"));
+        }
+    }
+
+}