Don't create a new Vert.x on dev mode restart

Author: stuartwdouglas

core/deployment/src/main/java/io/quarkus/deployment/dev/DevModeMain.java

@@ -102,12 +102,14 @@ public void start() throws Exception {
 
             QuarkusBootstrap.Builder bootstrapBuilder = QuarkusBootstrap.builder()
                     .setApplicationRoot(appRoots.build())
-                    .setTargetDirectory(context.getDevModeRunnerJarFile().getParentFile().toPath())
                     .setIsolateDeployment(true)
                     .setLocalProjectDiscovery(context.isLocalProjectDiscovery())
                     .addAdditionalDeploymentArchive(path)
                     .setBaseName(context.getBaseName())
                     .setMode(context.getMode());
+            if (context.getDevModeRunnerJarFile() != null) {
+                bootstrapBuilder.setTargetDirectory(context.getDevModeRunnerJarFile().getParentFile().toPath());
+            }
             if (context.getProjectDir() != null) {
                 bootstrapBuilder.setProjectRoot(context.getProjectDir().toPath());
             } else {

extensions/vertx-core/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java

@@ -53,8 +53,8 @@ public class VertxCoreRecorder {
 
     public Supplier<Vertx> configureVertx(VertxConfiguration config,
             LaunchMode launchMode, ShutdownContext shutdown, List<Consumer<VertxOptions>> customizers) {
-        vertx = new VertxSupplier(config, customizers);
         if (launchMode != LaunchMode.DEVELOPMENT) {
+            vertx = new VertxSupplier(config, customizers);
             // we need this to be part of the last shutdown tasks because closing it early (basically before Arc)
             // could cause problem to beans that rely on Vert.x and contain shutdown tasks
             shutdown.addLastShutdownTask(new Runnable() {
@@ -63,6 +63,31 @@ public void run() {
                     destroy();
                 }
             });
+        } else {
+            if (vertx == null) {
+                vertx = new VertxSupplier(config, customizers);
+            } else if (vertx.v != null) {
+                tryCleanTccl(vertx.v);
+            }
+            shutdown.addLastShutdownTask(new Runnable() {
+                @Override
+                public void run() {
+                    CountDownLatch latch = new CountDownLatch(1);
+                    if (vertx.v != null) {
+                        vertx.v.eventBus().close(new Handler<AsyncResult<Void>>() {
+                            @Override
+                            public void handle(AsyncResult<Void> event) {
+                                vertx.v.eventBus().start(new Handler<AsyncResult<Void>>() {
+                                    @Override
+                                    public void handle(AsyncResult<Void> event) {
+                                        latch.countDown();
+                                    }
+                                });
+                            }
+                        });
+                    }
+                }
+            });
         }
         return vertx;
     }
@@ -303,7 +328,8 @@ public Supplier<EventLoopGroup> bossSupplier() {
         return new Supplier<EventLoopGroup>() {
             @Override
             public EventLoopGroup get() {
-                return ((VertxImpl) vertx.get()).getAcceptorEventLoopGroup();
+                vertx.get();
+                return ((VertxImpl) vertx.v).getAcceptorEventLoopGroup();
             }
         };
     }

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

@@ -0,0 +1,25 @@
+package io.quarkus.vertx.web;
+
+import static io.vertx.core.http.HttpMethod.GET;
+import static io.vertx.core.http.HttpMethod.OPTIONS;
+import static io.vertx.core.http.HttpMethod.POST;
+
+import io.quarkus.vertx.core.runtime.VertxCoreRecorder;
+import io.vertx.ext.web.RoutingContext;
+
+public class DevModeRoute {
+
+    @Route(path = "/test", methods = { GET, OPTIONS, POST })
+    void getRoutes(RoutingContext context) {
+        context.response().setStatusCode(200).end("test route");
+    }
+
+    @Route(path = "/assert", methods = GET)
+    void assertVertx(RoutingContext context) {
+        if (VertxCoreRecorder.getVertx().get() == context.vertx()) {
+            context.response().end("OK");
+        } else {
+            context.fail(new RuntimeException("Incorrect vertx in use"));
+        }
+    }
+}

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

@@ -16,7 +16,7 @@ public class VertxWebDevModeTestCase {
     @RegisterExtension
     static QuarkusDevModeTest runner = new QuarkusDevModeTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addClasses(TestRoute.class));
+                    .addClasses(DevModeRoute.class));
 
     @Test
     public void testRunningInDevMode() {
@@ -26,7 +26,7 @@ public void testRunningInDevMode() {
                 .then().statusCode(200)
                 .body(Matchers.equalTo("test route"));
 
-        runner.modifySourceFile(TestRoute.class, new Function<String, String>() {
+        runner.modifySourceFile(DevModeRoute.class, new Function<String, String>() {
             @Override
             public String apply(String s) {
                 return s.replace("test route", "new code");
@@ -39,6 +39,10 @@ public String apply(String s) {
                     .then().statusCode(200)
                     .body(Matchers.equalTo("new code"));
         }
+        RestAssured.given()
+                .get("/assert")
+                .then().statusCode(200)
+                .body(Matchers.equalTo("OK"));
     }
 
 }