Merge pull request quarkusio#36202 from cescoffier/ignore-module-info-in-dev-mode

Author: cescoffier

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

@@ -50,6 +50,7 @@ class Context {
         private final String targetJvmVersion;
         private final List<String> compilePluginArtifacts;
         private final List<String> compilerPluginOptions;
+        private final boolean ignoreModuleInfo;
 
         public Context(
                 String name,
@@ -64,7 +65,7 @@ public Context(
                 String sourceJavaVersion,
                 String targetJvmVersion,
                 List<String> compilePluginArtifacts,
-                List<String> compilerPluginOptions) {
+                List<String> compilerPluginOptions, String ignoreModuleInfo) {
             this.name = name;
             this.classpath = classpath;
             this.reloadableClasspath = reloadableClasspath;
@@ -78,6 +79,7 @@ public Context(
             this.targetJvmVersion = targetJvmVersion;
             this.compilePluginArtifacts = compilePluginArtifacts;
             this.compilerPluginOptions = compilerPluginOptions;
+            this.ignoreModuleInfo = Boolean.parseBoolean(ignoreModuleInfo);
         }
 
         public String getName() {
@@ -131,5 +133,9 @@ public List<String> getCompilePluginArtifacts() {
         public List<String> getCompilerPluginOptions() {
             return compilerPluginOptions;
         }
+
+        public boolean ignoreModuleInfo() {
+            return ignoreModuleInfo;
+        }
     }
 }

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

@@ -74,7 +74,8 @@ public void compile(Set<File> filesToCompile, CompilationProvider.Context contex
 
         final QuarkusFileManager.Context sourcesContext = new QuarkusFileManager.Context(
                 context.getClasspath(), context.getReloadableClasspath(),
-                context.getOutputDirectory(), context.getSourceEncoding());
+                context.getOutputDirectory(), context.getSourceEncoding(),
+                context.ignoreModuleInfo());
 
         if (this.fileManager == null) {
             final Supplier<StandardJavaFileManager> supplier = () -> {

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

@@ -209,7 +209,9 @@ public void setupSourceCompilationContext(DevModeContext context,
                                 context.getSourceJavaVersion(),
                                 context.getTargetJvmVersion(),
                                 context.getCompilerPluginArtifacts(),
-                                context.getCompilerPluginsOptions()));
+                                context.getCompilerPluginsOptions(),
+                                context.getBuildSystemProperties().getOrDefault("quarkus.live-reload.ignore-module-info",
+                                        "true")));
             }
         }
     }

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

@@ -407,6 +407,8 @@ protected void prepare() throws Exception {
         devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.name", applicationName);
         devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.application.version", applicationVersion);
 
+        devModeContext.getBuildSystemProperties().putIfAbsent("quarkus.live-reload.ignore-module-info", "true");
+
         devModeContext.setSourceEncoding(sourceEncoding);
         devModeContext.setCompilerOptions(compilerOptions);
 

core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/QuarkusFileManager.java

@@ -44,13 +44,15 @@ public static class Context {
         private final Set<File> reloadableClassPath;
         private final File outputDirectory;
         private final Charset sourceEncoding;
+        private final boolean ignoreModuleInfo;
 
         public Context(Set<File> classPath, Set<File> reloadableClassPath,
-                File outputDirectory, Charset sourceEncoding) {
+                File outputDirectory, Charset sourceEncoding, boolean ignoreModuleInfo) {
             this.classPath = classPath;
             this.reloadableClassPath = reloadableClassPath;
             this.outputDirectory = outputDirectory;
             this.sourceEncoding = sourceEncoding;
+            this.ignoreModuleInfo = ignoreModuleInfo;
         }
 
         public Set<File> getClassPath() {
@@ -68,5 +70,9 @@ public File getOutputDirectory() {
         public Charset getSourceEncoding() {
             return sourceEncoding;
         }
+
+        public boolean ignoreModuleInfo() {
+            return ignoreModuleInfo;
+        }
     }
 }

core/deployment/src/main/java/io/quarkus/deployment/dev/filesystem/StaticFileManager.java

@@ -1,22 +1,46 @@
 package io.quarkus.deployment.dev.filesystem;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
 
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
+import org.jboss.logging.Logger;
+
 /**
  * This static file manager handle the class-paths and file locations of a single manager instance.
  */
 public class StaticFileManager extends QuarkusFileManager {
 
+    private final Context context;
+    private final AtomicBoolean once = new AtomicBoolean();
+
     public StaticFileManager(Supplier<StandardJavaFileManager> supplier, Context context) {
         super(supplier.get(), context);
+        this.context = context;
     }
 
     @Override
     public Iterable<? extends JavaFileObject> getJavaSources(Iterable<? extends File> files) {
         return this.fileManager.getJavaFileObjectsFromFiles(files);
     }
+
+    @Override
+    public JavaFileObject getJavaFileForInput(Location location, String className, JavaFileObject.Kind kind)
+            throws IOException {
+        // Ignore the module info of the application in dev mode.
+        if (context.ignoreModuleInfo() && "CLASS_OUTPUT".equalsIgnoreCase(location.getName())
+                && "module-info".equalsIgnoreCase(className)) {
+            if (once.compareAndSet(false, true)) {
+                Logger.getLogger(StaticFileManager.class).info("Ignoring module-info.java in dev mode, " +
+                        "set the `quarkus.live-reload.ignore-module-info` property to `false` in your project descriptor (`pom.xml` or `build.gradle`) to disable this behavior.");
+            }
+            return null;
+        }
+        return this.fileManager.getJavaFileForInput(location, className, kind);
+    }
+
 }