Command mode support

quarkusio · Mar 9, 2020 · 5d98d3d · 5d98d3d
1 parent 5e35991
commit 5d98d3d
Show file tree

Hide file tree

Showing 70 changed files with 1,606 additions and 294 deletions.
diff --git a/bom/deployment/pom.xml b/bom/deployment/pom.xml
@@ -617,12 +617,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-development-mode</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-scala-deployment</artifactId>

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -280,6 +280,23 @@
                 <artifactId>quarkus-development-mode-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-ide-launcher</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-ide-launcher</artifactId>
+                <version>${project.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- This has shaded dependencies -->
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-arc</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java b/core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
@@ -31,6 +31,7 @@
 import io.quarkus.deployment.builditem.GeneratedResourceBuildItem;
 import io.quarkus.deployment.builditem.LaunchModeBuildItem;
 import io.quarkus.deployment.builditem.LiveReloadBuildItem;
+import io.quarkus.deployment.builditem.RawCommandLineArgumentsBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem;
 import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem;
@@ -99,6 +100,7 @@ public BuildResult run() throws Exception {
                     .addInitial(DeploymentClassLoaderBuildItem.class)
                     .addInitial(ArchiveRootBuildItem.class)
                     .addInitial(ShutdownContextBuildItem.class)
+                    .addInitial(RawCommandLineArgumentsBuildItem.class)
                     .addInitial(LaunchModeBuildItem.class)
                     .addInitial(LiveReloadBuildItem.class)
                     .addInitial(AdditionalApplicationArchiveBuildItem.class)
@@ -124,6 +126,7 @@ public BuildResult run() throws Exception {
                     .produce(liveReloadBuildItem)
                     .produce(new ArchiveRootBuildItem(root, rootFs == null ? root : rootFs.getPath("/"), excludedFromIndexing))
                     .produce(new ShutdownContextBuildItem())
+                    .produce(new RawCommandLineArgumentsBuildItem())
                     .produce(new LaunchModeBuildItem(launchMode))
                     .produce(new BuildSystemTargetBuildItem(targetDir, baseName))
                     .produce(new DeploymentClassLoaderBuildItem(deploymentClassLoader))

diff --git a/...yment/src/main/java/io/quarkus/deployment/builditem/RawCommandLineArgumentsBuildItem.java b/...yment/src/main/java/io/quarkus/deployment/builditem/RawCommandLineArgumentsBuildItem.java
@@ -0,0 +1,31 @@
+package io.quarkus.deployment.builditem;
+
+import java.util.function.Supplier;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.deployment.recording.BytecodeRecorderImpl;
+import io.quarkus.runtime.StartupContext;
+
+/**
+ * A build item that represents the raw command line arguments as they were passed to the application.
+ *
+ * No filtering is done on these parameters.
+ */
+public final class RawCommandLineArgumentsBuildItem extends SimpleBuildItem
+        implements BytecodeRecorderImpl.ReturnedProxy, Supplier<String[]> {
+
+    @Override
+    public String __returned$proxy$key() {
+        return StartupContext.RAW_COMMAND_LINE_ARGS;
+    }
+
+    @Override
+    public boolean __static$$init() {
+        return true;
+    }
+
+    @Override
+    public String[] get() {
+        throw new IllegalStateException("Can only be called at runtime");
+    }
+}
diff --git a/...a/io/quarkus/dev/ClassLoaderCompiler.java → ...s/deployment/dev/ClassLoaderCompiler.java b/...a/io/quarkus/dev/ClassLoaderCompiler.java → ...s/deployment/dev/ClassLoaderCompiler.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...a/io/quarkus/dev/CompilationProvider.java → ...s/deployment/dev/CompilationProvider.java b/...a/io/quarkus/dev/CompilationProvider.java → ...s/deployment/dev/CompilationProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.io.File;
 import java.nio.charset.Charset;

diff --git a/...in/java/io/quarkus/dev/CompilerFlags.java → ...quarkus/deployment/dev/CompilerFlags.java b/...in/java/io/quarkus/dev/CompilerFlags.java → ...quarkus/deployment/dev/CompilerFlags.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...n/java/io/quarkus/dev/DevModeContext.java → ...uarkus/deployment/dev/DevModeContext.java b/...n/java/io/quarkus/dev/DevModeContext.java → ...uarkus/deployment/dev/DevModeContext.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.io.File;
 import java.io.Serializable;
@@ -27,6 +27,7 @@ public class DevModeContext implements Serializable {
     private String sourceEncoding;
 
     private final List<File> classesRoots = new ArrayList<>();
+    private final List<URL> additionalClassPathElements = new ArrayList<>();
     private File frameworkClassesDir;
     private File cacheDir;
     private File projectDir;
@@ -80,6 +81,10 @@ public List<File> getClassesRoots() {
         return classesRoots;
     }
 
+    public List<URL> getAdditionalClassPathElements() {
+        return additionalClassPathElements;
+    }
+
     public File getFrameworkClassesDir() {
         return frameworkClassesDir;
     }

diff --git a/...main/java/io/quarkus/dev/DevModeMain.java → ...o/quarkus/deployment/dev/DevModeMain.java b/...main/java/io/quarkus/dev/DevModeMain.java → ...o/quarkus/deployment/dev/DevModeMain.java
@@ -1,4 +1,5 @@
-package io.quarkus.dev;
+
+package io.quarkus.deployment.dev;
 
 import java.io.Closeable;
 import java.io.DataInputStream;
@@ -20,6 +21,7 @@
 import io.quarkus.bootstrap.app.AdditionalDependency;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.app.QuarkusBootstrap;
+import io.quarkus.dev.appstate.ApplicationStateNotification;
 
 /**
  * The main entry point for the dev mojo execution
@@ -115,5 +117,6 @@ public void close() throws IOException {
         if (realCloseable != null) {
             realCloseable.close();
         }
+        ApplicationStateNotification.waitForApplicationStop();
     }
 }
diff --git a/...dev/HotDeploymentConfigFileBuildStep.java → ...dev/HotDeploymentConfigFileBuildStep.java b/...dev/HotDeploymentConfigFileBuildStep.java → ...dev/HotDeploymentConfigFileBuildStep.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...a/io/quarkus/dev/IsolatedDevModeMain.java → ...s/deployment/dev/IsolatedDevModeMain.java b/...a/io/quarkus/dev/IsolatedDevModeMain.java → ...s/deployment/dev/IsolatedDevModeMain.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,8 +29,10 @@
 import io.quarkus.builder.BuildContext;
 import io.quarkus.builder.BuildStep;
 import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem;
+import io.quarkus.dev.appstate.ApplicationStateNotification;
 import io.quarkus.dev.spi.HotReplacementSetup;
 import io.quarkus.runner.bootstrap.AugmentActionImpl;
+import io.quarkus.runtime.ApplicationLifecycleManager;
 import io.quarkus.runtime.Timing;
 import io.quarkus.runtime.configuration.QuarkusConfigFactory;
 import io.quarkus.runtime.logging.InitialConfigurator;
@@ -49,6 +51,7 @@ public class IsolatedDevModeMain implements BiConsumer<CuratedApplication, Map<S
     static volatile RuntimeUpdatesProcessor runtimeUpdatesProcessor;
     private static volatile CuratedApplication curatedApplication;
     private static volatile AugmentAction augmentAction;
+    private static volatile boolean restarting;
 
     private synchronized void firstStart() {
         ClassLoader old = Thread.currentThread().getContextClassLoader();
@@ -57,7 +60,31 @@ private synchronized void firstStart() {
             //ok, we have resolved all the deps
             try {
                 StartupAction start = augmentAction.createInitialRuntimeApplication();
-                runner = start.run();
+                //this is a bit yuck, but we need replace the default
+                //exit handler in the runtime class loader
+                //TODO: look at implementing a common core classloader, that removes the need for this sort of crappy hack
+                curatedApplication.getBaseRuntimeClassLoader().loadClass(ApplicationLifecycleManager.class.getName())
+                        .getMethod("setDefaultExitCodeHandler", Consumer.class)
+                        .invoke(null, new Consumer<Integer>() {
+                            @Override
+                            public void accept(Integer integer) {
+                                if (restarting || ApplicationLifecycleManager.isVmShuttingDown()) {
+                                    return;
+                                }
+                                System.out.println("Quarkus application exited with code " + integer);
+                                System.out.println("Press Enter to restart");
+                                try {
+                                    while (System.in.read() != '\n') {
+                                    }
+                                    runtimeUpdatesProcessor.checkForChangedClasses();
+                                    restartApp(runtimeUpdatesProcessor.checkForFileChange());
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        });
+
+                runner = start.runMainClass();
             } catch (Throwable t) {
                 deploymentProblem = t;
                 if (context.isAbortOnFailedStart()) {
@@ -91,7 +118,12 @@ private synchronized void firstStart() {
     }
 
     public synchronized void restartApp(Set<String> changedResources) {
+        restarting = true;
         stop();
+
+        //this clears any old state
+        ApplicationStateNotification.notifyApplicationStopped();
+        restarting = false;
         Timing.restart(curatedApplication.getAugmentClassLoader());
         deploymentProblem = null;
         ClassLoader old = Thread.currentThread().getContextClassLoader();
@@ -100,11 +132,11 @@ public synchronized void restartApp(Set<String> changedResources) {
             //ok, we have resolved all the deps
             try {
                 StartupAction start = augmentAction.reloadExistingApplication(changedResources);
-                runner = start.run();
+                runner = start.runMainClass();
+                ApplicationStateNotification.waitForApplicationStart();
             } catch (Throwable t) {
                 deploymentProblem = t;
                 log.error("Failed to start quarkus", t);
-
             }
         } finally {
             Thread.currentThread().setContextClassLoader(old);
@@ -169,6 +201,8 @@ public void stop() {
     }
 
     public void close() {
+        //don't attempt to restart in the exit code handler
+        restarting = true;
         try {
             stop();
         } finally {

diff --git a/.../quarkus/dev/JavaCompilationProvider.java → ...ployment/dev/JavaCompilationProvider.java b/.../quarkus/dev/JavaCompilationProvider.java → ...ployment/dev/JavaCompilationProvider.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/LauncherMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/LauncherMain.java
@@ -0,0 +1,38 @@
+package io.quarkus.deployment.dev;
+
+import java.io.File;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+
+import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+
+import io.smallrye.config.SmallRyeConfigProviderResolver;
+
+/**
+ * The entry point when launched from an IDE
+ */
+public class LauncherMain {
+
+    public static void main(Path appClasses, Path wiring, URL[] classPath, String... args) throws Exception {
+        DevModeContext context = new DevModeContext();
+        context.setAbortOnFailedStart(true);
+        context.setTest(false);
+        context.setCacheDir(Files.createTempDirectory("quarkus-cache").toFile());
+        context.setSourceEncoding("UTF-8");
+        File appClassesFile = appClasses.toFile();
+        context.getClassesRoots().add(appClassesFile);
+
+        //TODO: huge hacks
+        File src = new File(appClassesFile, "../../src/main/java");
+        File res = new File(appClassesFile, "../../src/main/resources");
+
+        context.getModules().add(new DevModeContext.ModuleInfo("main", new File("").getAbsolutePath(),
+                Collections.singleton(src.getAbsolutePath()), appClassesFile.getAbsolutePath(), res.getAbsolutePath()));
+        //the loading of this is super wierd, and does its own class loader delegation for some reason
+        ConfigProviderResolver.setInstance(new SmallRyeConfigProviderResolver());
+        DevModeMain main = new DevModeMain(context);
+        main.start();
+    }
+}
diff --git a/.../quarkus/dev/RuntimeUpdatesProcessor.java → ...ployment/dev/RuntimeUpdatesProcessor.java b/.../quarkus/dev/RuntimeUpdatesProcessor.java → ...ployment/dev/RuntimeUpdatesProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.dev;
+package io.quarkus.deployment.dev;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/PackageConfig.java
@@ -35,8 +35,8 @@ public class PackageConfig {
     /**
      * The entry point of the application. In most cases this should not be modified.
      */
-    @ConfigItem(defaultValue = "io.quarkus.runner.GeneratedMain")
-    public String mainClass;
+    @ConfigItem
+    public Optional<String> mainClass;
 
     /**
      * Files that should not be copied to the output artifact