Merge pull request #48185 from aloubyansky/resolve-app-model-with-sources

Initialize the main WorkspaceModule during the configuration time

Author: aloubyansky

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java

@@ -5,7 +5,6 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -182,14 +181,14 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
                     .getByName(ApplicationDeploymentClasspathBuilder.getBaseRuntimeConfigName(LaunchMode.DEVELOPMENT)));
         });
 
-        Provider<DefaultProjectDescriptor> projectDescriptor = ProjectDescriptorBuilder.buildForApp(project);
         ApplicationDeploymentClasspathBuilder normalClasspath = new ApplicationDeploymentClasspathBuilder(project,
                 LaunchMode.NORMAL);
         ApplicationDeploymentClasspathBuilder testClasspath = new ApplicationDeploymentClasspathBuilder(project,
                 LaunchMode.TEST);
         ApplicationDeploymentClasspathBuilder devClasspath = new ApplicationDeploymentClasspathBuilder(project,
                 LaunchMode.DEVELOPMENT);
 
+        Provider<DefaultProjectDescriptor> projectDescriptor = ProjectDescriptorBuilder.buildForApp(project);
         TaskProvider<QuarkusApplicationModelTask> quarkusGenerateTestAppModelTask = tasks.register(
                 "quarkusGenerateTestAppModel",
                 QuarkusApplicationModelTask.class, task -> {
@@ -204,8 +203,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
 
         TaskProvider<QuarkusApplicationModelTask> quarkusGenerateAppModelTask = tasks.register("quarkusGenerateAppModel",
                 QuarkusApplicationModelTask.class, task -> {
-                    configureApplicationModelTask(project, task, projectDescriptor
-                            .map(d -> d.withSourceSetView(Collections.singleton(SourceSet.MAIN_SOURCE_SET_NAME))),
+                    configureApplicationModelTask(project, task, projectDescriptor,
                             normalClasspath, LaunchMode.NORMAL,
                             "quarkus/application-model/quarkus-app-model.dat");
                 });
@@ -237,8 +235,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
         TaskProvider<QuarkusApplicationModelTask> quarkusBuildAppModelTask = tasks.register("quarkusBuildAppModel",
                 QuarkusApplicationModelTask.class, task -> {
                     task.dependsOn(tasks.named(JavaPlugin.CLASSES_TASK_NAME));
-                    configureApplicationModelTask(project, task, projectDescriptor
-                            .map(d -> d.withSourceSetView(Collections.singleton(SourceSet.MAIN_SOURCE_SET_NAME))),
+                    configureApplicationModelTask(project, task, projectDescriptor,
                             normalClasspath, LaunchMode.NORMAL,
                             "quarkus/application-model/quarkus-app-model-build.dat");
                 });
@@ -519,9 +516,9 @@ private static void configureApplicationModelTask(Project project, QuarkusApplic
         task.getOriginalClasspath().setFrom(classpath.getOriginalRuntimeClasspathAsInput());
         task.getAppClasspath().configureFrom(classpath.getRuntimeConfigurationWithoutResolvingDeployment());
         task.getPlatformConfiguration().configureFrom(classpath.getPlatformConfiguration());
+        task.getPlatformInfo().configureFrom(classpath.getPlatformPropertiesConfiguration());
         task.getDeploymentClasspath().configureFrom(classpath.getDeploymentConfiguration());
         task.getDeploymentResolvedWorkaround().from(classpath.getDeploymentConfiguration().getIncoming().getFiles());
-        task.getPlatformImports().set(classpath.getPlatformImportsWithoutResolvingPlatform());
         task.getApplicationModel().set(project.getLayout().getBuildDirectory().file(quarkusModelFile));
     }
 

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusApplicationModelTask.java

@@ -1,105 +1,38 @@
 package io.quarkus.gradle.workspace.descriptors;
 
-import java.io.File;
 import java.io.Serializable;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
+
+import io.quarkus.bootstrap.workspace.WorkspaceModule;
+import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
 
 public class DefaultProjectDescriptor implements Serializable, ProjectDescriptor {
 
     private static final long serialVersionUID = 1L;
 
-    private final File projectDir;
-    private final File buildDir;
-    private final File buildFile;
-
-    private final Map<String, QuarkusTaskDescriptor> tasks;
-    private final Map<String, Set<String>> sourceSetTasks;
-    private final Map<String, Set<String>> sourceSetTasksRaw;
-
-    public DefaultProjectDescriptor(File projectDir, File buildDir, File buildFile, Map<String, QuarkusTaskDescriptor> tasks,
-            Map<String, Set<String>> sourceSetTasks, Map<String, Set<String>> sourceSetTasksRaw) {
-        this.projectDir = projectDir;
-        this.buildDir = buildDir;
-        this.buildFile = buildFile;
-        this.tasks = tasks;
-        this.sourceSetTasks = sourceSetTasks;
-        this.sourceSetTasksRaw = sourceSetTasksRaw;
-    }
-
-    @Override
-    public File getProjectDir() {
-        return projectDir;
-    }
+    private WorkspaceModule.Mutable module;
 
-    @Override
-    public File getBuildDir() {
-        return buildDir;
+    public DefaultProjectDescriptor(WorkspaceModule.Mutable module) {
+        this.module = module;
     }
 
     @Override
-    public File getBuildFile() {
-        return buildFile;
-    }
-
-    public Map<String, Set<String>> getSourceSetTasks() {
-        return sourceSetTasks;
-    }
-
-    public Map<String, Set<String>> getSourceSetTasksRaw() {
-        return sourceSetTasksRaw;
+    public WorkspaceModule.Mutable getWorkspaceModule() {
+        return module;
     }
 
-    public Map<String, QuarkusTaskDescriptor> getTasks() {
-        return tasks;
+    public void setWorkspaceModule(WorkspaceModule.Mutable module) {
+        this.module = module;
     }
 
     @Override
-    public Set<String> getTasksForSourceSet(String sourceSetName) {
-        return sourceSetTasks.getOrDefault(sourceSetName, Collections.emptySet());
-    }
-
-    @Override
-    public String getTaskSource(String task) {
-        return tasks.get(task).getSourceDir().getAbsolutePath();
-    }
-
-    @Override
-    public String getTaskDestinationDir(String task) {
-        return tasks.get(task).getDestinationDir().getAbsolutePath();
-    }
-
-    @Override
-    public TaskType getTaskType(String task) {
-        return tasks.get(task).getTaskType();
-    }
-
-    /**
-     * Returns a new {@link DefaultProjectDescriptor} with only the given source sets.
-     */
-    public DefaultProjectDescriptor withSourceSetView(Set<String> acceptedSourceSets) {
-        Map<String, Set<String>> filteredSourceSets = sourceSetTasks.entrySet().stream()
-                .filter(e -> acceptedSourceSets.contains(e.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, TreeMap::new));
-        Map<String, QuarkusTaskDescriptor> filteredTasks = tasks.entrySet().stream()
-                .filter(e -> filteredSourceSets.values().stream().anyMatch(tasks -> tasks.contains(e.getKey())))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, TreeMap::new));
-        return new DefaultProjectDescriptor(projectDir, buildDir, buildFile, filteredTasks, filteredSourceSets,
-                sourceSetTasksRaw);
+    public WorkspaceModule.Mutable getWorkspaceModuleOrNull(WorkspaceModuleId moduleId) {
+        return module.getId().equals(moduleId) ? module : null;
     }
 
     @Override
     public String toString() {
         return "DefaultProjectDescriptor{" +
-                "\nprojectDir=" + projectDir +
-                ",\nbuildDir=" + buildDir +
-                ",\nbuildFile=" + buildFile +
-                ",\ntasks=" + tasks +
-                ",\nsourceSetTasks=" + sourceSetTasks +
-                ",\nsourceSetTasksRaw=" + sourceSetTasksRaw +
+                "\nmodule=" + module +
                 "\n}";
     }
 }

devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/workspace/descriptors/DefaultProjectDescriptor.java

@@ -1,27 +1,22 @@
 package io.quarkus.gradle.workspace.descriptors;
 
-import java.io.File;
-import java.util.Set;
+import io.quarkus.bootstrap.workspace.WorkspaceModule;
+import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
 
 public interface ProjectDescriptor {
 
-    public enum TaskType {
-        COMPILE,
-        RESOURCES
-    }
-
-    public File getProjectDir();
-
-    public File getBuildDir();
-
-    public File getBuildFile();
-
-    public Set<String> getTasksForSourceSet(String sourceName);
-
-    public String getTaskSource(String task);
-
-    public String getTaskDestinationDir(String task);
-
-    public TaskType getTaskType(String task);
-
+    /**
+     * Project workspace module
+     *
+     * @return workspace module
+     */
+    WorkspaceModule.Mutable getWorkspaceModule();
+
+    /**
+     * Workspace module for a specific module ID (in a multi module project)
+     *
+     * @param moduleId module ID
+     * @return workspace module for a given module ID or null, if the requested module info is not available
+     */
+    WorkspaceModule.Mutable getWorkspaceModuleOrNull(WorkspaceModuleId moduleId);
 }