Merge pull request #10459 from glefloch/fix/gradle-model

init custom gradle tooling model
quarkusio · Jul 24, 2020 · 47b78d2 · 47b78d2
2 parents 4260d34 + 9735fad
commit 47b78d2
Show file tree

Hide file tree

Showing 50 changed files with 1,603 additions and 360 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -4408,6 +4408,11 @@
                 <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-gradle-resolver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-core</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/IDEDevModeMain.java
@@ -1,16 +1,25 @@
 package io.quarkus.deployment.dev;
 
+import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiConsumer;
 
 import org.jboss.logging.Logger;
 
+import io.quarkus.bootstrap.BootstrapGradleException;
 import io.quarkus.bootstrap.app.CuratedApplication;
 import io.quarkus.bootstrap.model.AppArtifactKey;
-import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+import io.quarkus.bootstrap.resolver.AppModelResolverException;
+import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
+import io.quarkus.bootstrap.resolver.model.QuarkusModel;
+import io.quarkus.bootstrap.resolver.model.WorkspaceModule;
+import io.quarkus.bootstrap.util.QuarkusModelHelper;
+import io.quarkus.bootstrap.utils.BuildToolHelper;
 
 @SuppressWarnings("unused")
 public class IDEDevModeMain implements BiConsumer<CuratedApplication, Map<String, Object>> {
@@ -23,30 +32,70 @@ public void accept(CuratedApplication curatedApplication, Map<String, Object> st
         DevModeContext devModeContext = new DevModeContext();
         devModeContext.setArgs((String[]) stringObjectMap.get("args"));
         try {
-            LocalProject project = LocalProject.loadWorkspace(appClasses);
-            DevModeContext.ModuleInfo root = toModule(project);
-            devModeContext.setApplicationRoot(root);
-            for (Map.Entry<AppArtifactKey, LocalProject> module : project.getWorkspace().getProjects().entrySet()) {
-                if (module.getKey().equals(project.getKey())) {
-                    continue;
+            if (BuildToolHelper.isMavenProject(appClasses)) {
+                LocalProject project = LocalProject.loadWorkspace(appClasses);
+                DevModeContext.ModuleInfo root = toModule(project);
+                devModeContext.setApplicationRoot(root);
+                for (Map.Entry<AppArtifactKey, LocalProject> module : project.getWorkspace().getProjects().entrySet()) {
+                    if (module.getKey().equals(project.getKey())) {
+                        continue;
+                    }
+                    devModeContext.getAdditionalModules().add(toModule(module.getValue()));
+                }
+            } else {
+                // TODO find a way to reuse the previously model instead of building a new one.
+                QuarkusModel quarkusModel = QuarkusGradleModelFactory.createForTasks(
+                        BuildToolHelper.getBuildFile(appClasses, BuildToolHelper.BuildTool.GRADLE).toFile(),
+                        QuarkusModelHelper.DEVMODE_REQUIRED_TASKS);
+                final WorkspaceModule launchingModule = quarkusModel.getWorkspace().getMainModule();
+                DevModeContext.ModuleInfo root = toModule(quarkusModel.getWorkspace().getMainModule());
+                devModeContext.setApplicationRoot(root);
+                for (WorkspaceModule additionalModule : quarkusModel.getWorkspace().getAllModules()) {
+                    if (!additionalModule.getArtifactCoords().equals(launchingModule.getArtifactCoords())) {
+                        devModeContext.getAdditionalModules().add(toModule(additionalModule));
+                    }
                 }
-                devModeContext.getAdditionalModules().add(toModule(module.getValue()));
             }
-        } catch (BootstrapMavenException e) {
+
+        } catch (AppModelResolverException e) {
             log.error("Failed to load workspace, hot reload will not be available", e);
         }
 
         new IsolatedDevModeMain().accept(curatedApplication,
                 Collections.singletonMap(DevModeContext.class.getName(), devModeContext));
     }
 
+    private DevModeContext.ModuleInfo toModule(WorkspaceModule module) throws BootstrapGradleException {
+        AppArtifactKey key = new AppArtifactKey(module.getArtifactCoords().getGroupId(),
+                module.getArtifactCoords().getArtifactId(), module.getArtifactCoords().getClassifier());
+
+        Set<String> sourceDirectories = new HashSet<>();
+        Set<String> sourceParents = new HashSet<>();
+        for (File srcDir : module.getSourceSourceSet().getSourceDirectories()) {
+            sourceDirectories.add(srcDir.getPath());
+            sourceParents.add(srcDir.getParent());
+        }
+
+        return new DevModeContext.ModuleInfo(key,
+                module.getArtifactCoords().getArtifactId(),
+                module.getProjectRoot().getPath(),
+                sourceDirectories,
+                QuarkusModelHelper.getClassPath(module).toAbsolutePath().toString(),
+                module.getSourceSourceSet().getResourceDirectory().toString(),
+                module.getSourceSet().getResourceDirectory().getPath(),
+                sourceParents,
+                module.getBuildDir().toPath().resolve("generated-sources").toAbsolutePath().toString(),
+                module.getBuildDir().toString());
+    }
+
     private DevModeContext.ModuleInfo toModule(LocalProject project) {
         return new DevModeContext.ModuleInfo(project.getKey(), project.getArtifactId(),
                 project.getDir().toAbsolutePath().toString(),
                 Collections.singleton(project.getSourcesSourcesDir().toAbsolutePath().toString()),
                 project.getClassesDir().toAbsolutePath().toString(),
                 project.getResourcesSourcesDir().toAbsolutePath().toString(),
-                project.getSourcesDir().toString(), project.getCodeGenOutputDir().toString(),
+                project.getSourcesDir().toString(),
+                project.getCodeGenOutputDir().toString(),
                 project.getOutputDir().toString());
     }
 }
diff --git a/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java b/core/launcher/src/main/java/io/quarkus/launcher/QuarkusLauncher.java
@@ -11,6 +11,8 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import io.quarkus.bootstrap.BootstrapConstants;
+
 /**
  * IDE entry point.
  * <p>
@@ -24,7 +26,6 @@
 public class QuarkusLauncher {
 
     public static void launch(String callingClass, String quarkusApplication, Consumer<Integer> exitHandler, String... args) {
-
         try {
             String classResource = callingClass.replace(".", "/") + ".class";
             URL resource = Thread.currentThread().getContextClassLoader().getResource(classResource);
@@ -43,11 +44,14 @@ public static void launch(String callingClass, String quarkusApplication, Consum
 
             IDEClassLoader loader = new IDEClassLoader(QuarkusLauncher.class.getClassLoader());
             Thread.currentThread().setContextClassLoader(loader);
+
             Class<?> launcher = loader.loadClass("io.quarkus.bootstrap.IDELauncherImpl");
             launcher.getDeclaredMethod("launch", Path.class, Map.class).invoke(null, appClasses, context);
 
         } catch (Exception e) {
             throw new RuntimeException(e);
+        } finally {
+            System.clearProperty(BootstrapConstants.SERIALIZED_APP_MODEL);
         }
     }