Skip to content

Commit db291ad

Browse files
aloubyanskyaloubyansky
committed
wip
1 parent ddd0ebc commit db291ad

File tree

7 files changed

+230
-142
lines changed

7 files changed

+230
-142
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import java.io.File;
77
import java.nio.file.Path;
8-
import java.util.Collections;
98
import java.util.HashMap;
109
import java.util.HashSet;
1110
import java.util.Map;
@@ -204,8 +203,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
204203

205204
TaskProvider<QuarkusApplicationModelTask> quarkusGenerateAppModelTask = tasks.register("quarkusGenerateAppModel",
206205
QuarkusApplicationModelTask.class, task -> {
207-
configureApplicationModelTask(project, task, projectDescriptor
208-
.map(d -> d.withSourceSetView(Collections.singleton(SourceSet.MAIN_SOURCE_SET_NAME))),
206+
configureApplicationModelTask(project, task, projectDescriptor,
209207
normalClasspath, LaunchMode.NORMAL,
210208
"quarkus/application-model/quarkus-app-model.dat");
211209
});
@@ -237,8 +235,7 @@ private void registerTasks(Project project, QuarkusPluginExtension quarkusExt) {
237235
TaskProvider<QuarkusApplicationModelTask> quarkusBuildAppModelTask = tasks.register("quarkusBuildAppModel",
238236
QuarkusApplicationModelTask.class, task -> {
239237
task.dependsOn(tasks.named(JavaPlugin.CLASSES_TASK_NAME));
240-
configureApplicationModelTask(project, task, projectDescriptor
241-
.map(d -> d.withSourceSetView(Collections.singleton(SourceSet.MAIN_SOURCE_SET_NAME))),
238+
configureApplicationModelTask(project, task, projectDescriptor,
242239
normalClasspath, LaunchMode.NORMAL,
243240
"quarkus/application-model/quarkus-app-model-build.dat");
244241
});

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

Lines changed: 74 additions & 69 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import java.util.Collections;
66
import java.util.Map;
77
import java.util.Set;
8-
import java.util.TreeMap;
9-
import java.util.stream.Collectors;
8+
9+
import io.quarkus.bootstrap.workspace.WorkspaceModule;
10+
import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
1011

1112
public class DefaultProjectDescriptor implements Serializable, ProjectDescriptor {
1213

@@ -19,15 +20,23 @@ public class DefaultProjectDescriptor implements Serializable, ProjectDescriptor
1920
private final Map<String, QuarkusTaskDescriptor> tasks;
2021
private final Map<String, Set<String>> sourceSetTasks;
2122
private final Map<String, Set<String>> sourceSetTasksRaw;
23+
private WorkspaceModule.Mutable module;
2224

2325
public DefaultProjectDescriptor(File projectDir, File buildDir, File buildFile, Map<String, QuarkusTaskDescriptor> tasks,
24-
Map<String, Set<String>> sourceSetTasks, Map<String, Set<String>> sourceSetTasksRaw) {
26+
Map<String, Set<String>> sourceSetTasks, Map<String, Set<String>> sourceSetTasksRaw,
27+
WorkspaceModule.Mutable module) {
2528
this.projectDir = projectDir;
2629
this.buildDir = buildDir;
2730
this.buildFile = buildFile;
2831
this.tasks = tasks;
2932
this.sourceSetTasks = sourceSetTasks;
3033
this.sourceSetTasksRaw = sourceSetTasksRaw;
34+
this.module = module;
35+
36+
System.out.println("DefaultProjectDescriptor.ctor " + module.getId());
37+
for (var classifier : module.getSourceClassifiers()) {
38+
System.out.println(" classifier " + module.getSources(classifier));
39+
}
3140
}
3241

3342
@Override
@@ -77,18 +86,18 @@ public TaskType getTaskType(String task) {
7786
return tasks.get(task).getTaskType();
7887
}
7988

80-
/**
81-
* Returns a new {@link DefaultProjectDescriptor} with only the given source sets.
82-
*/
83-
public DefaultProjectDescriptor withSourceSetView(Set<String> acceptedSourceSets) {
84-
Map<String, Set<String>> filteredSourceSets = sourceSetTasks.entrySet().stream()
85-
.filter(e -> acceptedSourceSets.contains(e.getKey()))
86-
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, TreeMap::new));
87-
Map<String, QuarkusTaskDescriptor> filteredTasks = tasks.entrySet().stream()
88-
.filter(e -> filteredSourceSets.values().stream().anyMatch(tasks -> tasks.contains(e.getKey())))
89-
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a, TreeMap::new));
90-
return new DefaultProjectDescriptor(projectDir, buildDir, buildFile, filteredTasks, filteredSourceSets,
91-
sourceSetTasksRaw);
89+
@Override
90+
public WorkspaceModule.Mutable getWorkspaceModule() {
91+
return module;
92+
}
93+
94+
public void setWorkspaceModule(WorkspaceModule.Mutable module) {
95+
this.module = module;
96+
}
97+
98+
@Override
99+
public WorkspaceModule.Mutable getWorkspaceModuleOrNull(WorkspaceModuleId moduleId) {
100+
return module.getId().equals(moduleId) ? module : null;
92101
}
93102

94103
@Override

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import java.io.File;
44
import java.util.Set;
55

6+
import io.quarkus.bootstrap.workspace.WorkspaceModule;
7+
import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
8+
69
public interface ProjectDescriptor {
710

811
public enum TaskType {
@@ -24,4 +27,7 @@ public enum TaskType {
2427

2528
public TaskType getTaskType(String task);
2629

30+
WorkspaceModule.Mutable getWorkspaceModule();
31+
32+
WorkspaceModule.Mutable getWorkspaceModuleOrNull(WorkspaceModuleId moduleId);
2733
}

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

Lines changed: 120 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
import static io.quarkus.gradle.workspace.descriptors.ProjectDescriptor.TaskType.RESOURCES;
55

66
import java.io.File;
7-
import java.util.Collections;
7+
import java.util.ArrayList;
8+
import java.util.Collection;
9+
import java.util.HashMap;
810
import java.util.HashSet;
911
import java.util.LinkedHashMap;
12+
import java.util.List;
1013
import java.util.Map;
1114
import java.util.Set;
1215
import java.util.concurrent.atomic.AtomicReference;
@@ -16,71 +19,68 @@
1619
import org.gradle.api.tasks.SourceSet;
1720
import org.gradle.api.tasks.SourceSetContainer;
1821
import org.gradle.api.tasks.compile.AbstractCompile;
19-
import org.gradle.api.tasks.testing.Test;
2022
import org.gradle.language.jvm.tasks.ProcessResources;
2123
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile;
2224

23-
import com.google.common.collect.ImmutableSet;
25+
import io.quarkus.bootstrap.workspace.ArtifactSources;
26+
import io.quarkus.bootstrap.workspace.DefaultArtifactSources;
27+
import io.quarkus.bootstrap.workspace.SourceDir;
28+
import io.quarkus.bootstrap.workspace.WorkspaceModule;
29+
import io.quarkus.bootstrap.workspace.WorkspaceModuleId;
30+
import io.quarkus.maven.dependency.ArtifactCoords;
2431

2532
public class ProjectDescriptorBuilder {
2633

27-
private static final Set<String> DEPENDENCY_SOURCE_SETS = ImmutableSet.of(SourceSet.MAIN_SOURCE_SET_NAME,
28-
SourceSet.TEST_SOURCE_SET_NAME, "test-fixtures");
29-
3034
private final File projectDir;
3135
private final File buildDir;
3236
private final File buildFile;
3337
private final Map<String, QuarkusTaskDescriptor> tasks;
3438
private final Map<String, Set<String>> sourceSetTasks;
3539
private final Map<String, Set<String>> sourceSetTasksRaw;
36-
private final Set<String> collectOnlySourceSets;
3740

38-
private ProjectDescriptorBuilder(Project project, Set<String> collectOnlySourceSets) {
41+
private final WorkspaceModuleId moduleId;
42+
private final Map<String, ClassifiedSources> classifiedSources = new HashMap<>();
43+
44+
private ProjectDescriptorBuilder(Project project) {
3945
this.tasks = new LinkedHashMap<>();
4046
this.sourceSetTasks = new LinkedHashMap<>();
4147
this.sourceSetTasksRaw = new LinkedHashMap<>();
48+
this.moduleId = WorkspaceModuleId.of(String.valueOf(project.getGroup()), project.getName(),
49+
String.valueOf(project.getVersion()));
4250
this.buildFile = project.getBuildFile();
4351
this.projectDir = project.getLayout().getProjectDirectory().getAsFile();
4452
this.buildDir = project.getLayout().getBuildDirectory().get().getAsFile();
45-
this.collectOnlySourceSets = collectOnlySourceSets;
4653
}
4754

4855
public static Provider<DefaultProjectDescriptor> buildForApp(Project target) {
49-
ProjectDescriptorBuilder builder = new ProjectDescriptorBuilder(target, Collections.emptySet());
56+
ProjectDescriptorBuilder builder = new ProjectDescriptorBuilder(target);
5057
target.afterEvaluate(project -> {
51-
project.getTasks().withType(AbstractCompile.class)
52-
.configureEach(builder::readConfigurationFor);
58+
project.getTasks().withType(AbstractCompile.class).configureEach(builder::readConfigurationFor);
5359
builder.withKotlinJvmCompileType(project);
54-
project.getTasks().withType(ProcessResources.class)
55-
.configureEach(builder::readConfigurationFor);
56-
project.getTasks().withType(Test.class)
57-
.configureEach(builder::readConfigurationFor);
60+
project.getTasks().withType(ProcessResources.class).configureEach(builder::readConfigurationFor);
5861
});
59-
return target.getProviders().provider(() -> new DefaultProjectDescriptor(
60-
builder.projectDir,
61-
builder.buildDir,
62-
builder.buildFile,
63-
builder.tasks,
64-
builder.sourceSetTasks,
65-
builder.sourceSetTasksRaw));
66-
}
6762

68-
public static Provider<DefaultProjectDescriptor> buildForDependency(Project target) {
69-
ProjectDescriptorBuilder builder = new ProjectDescriptorBuilder(target, DEPENDENCY_SOURCE_SETS);
70-
target.afterEvaluate(project -> {
71-
project.getTasks().withType(AbstractCompile.class)
72-
.configureEach(builder::readConfigurationFor);
73-
builder.withKotlinJvmCompileType(project);
74-
project.getTasks().withType(ProcessResources.class)
75-
.configureEach(builder::readConfigurationFor);
63+
return target.getProviders().provider(() -> {
64+
65+
var moduleBuilder = WorkspaceModule.builder()
66+
.setModuleId(builder.moduleId)
67+
.setBuildFile(builder.buildFile.toPath())
68+
.setModuleDir(builder.projectDir.toPath());
69+
70+
for (var classifiedSources : builder.classifiedSources.values()) {
71+
moduleBuilder.addArtifactSources(classifiedSources.toArtifactSources());
72+
}
73+
74+
return new DefaultProjectDescriptor(
75+
builder.projectDir,
76+
builder.buildDir,
77+
builder.buildFile,
78+
builder.tasks,
79+
builder.sourceSetTasks,
80+
builder.sourceSetTasksRaw,
81+
moduleBuilder);
7682
});
77-
return target.getProviders().provider(() -> new DefaultProjectDescriptor(
78-
builder.projectDir,
79-
builder.buildDir,
80-
builder.buildFile,
81-
builder.tasks,
82-
builder.sourceSetTasks,
83-
builder.sourceSetTasksRaw));
83+
8484
}
8585

8686
private void readConfigurationFor(AbstractCompile task) {
@@ -95,18 +95,17 @@ private void readConfigurationFor(AbstractCompile task) {
9595
tasks.put(task.getName(), new QuarkusTaskDescriptor(task.getName(), COMPILE, srcDir, destDir));
9696
SourceSetContainer sourceSets = task.getProject().getExtensions().getByType(SourceSetContainer.class);
9797
sourceSets.stream().filter(sourceSet -> sourceSet.getOutput().getClassesDirs().contains(destDir))
98-
.forEach(sourceSet -> sourceSetTasks
99-
.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>())
100-
.add(task.getName()));
98+
.forEach(sourceSet -> {
99+
sourceSetTasks.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>()).add(task.getName());
100+
classifiedSources.computeIfAbsent(getClassifier(sourceSet), ClassifiedSources::new)
101+
.addSources(srcDir, destDir);
102+
});
101103
fileVisitDetails.stopVisiting();
102104
}
103105
});
104106
}
105107
}
106108

107-
private void readConfigurationFor(Test task) {
108-
}
109-
110109
private void readConfigurationFor(ProcessResources task) {
111110
if (task.getEnabled() && !task.getSource().isEmpty()) {
112111
File destDir = task.getDestinationDir();
@@ -116,9 +115,11 @@ private void readConfigurationFor(ProcessResources task) {
116115
tasks.put(task.getName(), new QuarkusTaskDescriptor(task.getName(), RESOURCES, srcDir, destDir));
117116
SourceSetContainer sourceSets = task.getProject().getExtensions().getByType(SourceSetContainer.class);
118117
sourceSets.stream().filter(sourceSet -> destDir.equals(sourceSet.getOutput().getResourcesDir()))
119-
.forEach(sourceSet -> sourceSetTasks
120-
.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>())
121-
.add(task.getName()));
118+
.forEach(sourceSet -> {
119+
sourceSetTasks.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>()).add(task.getName());
120+
classifiedSources.computeIfAbsent(getClassifier(sourceSet), ClassifiedSources::new)
121+
.addResources(srcDir, destDir);
122+
});
122123
fileVisitDetails.stopVisiting();
123124
}
124125
});
@@ -147,9 +148,77 @@ private void readConfigurationFor(KotlinJvmCompile task) {
147148
tasks.put(task.getName(), new QuarkusTaskDescriptor(task.getName(), COMPILE, srcDir.get(), destDir));
148149
SourceSetContainer sourceSets = task.getProject().getExtensions().getByType(SourceSetContainer.class);
149150
sourceSets.stream().filter(sourceSet -> sourceSet.getOutput().getClassesDirs().contains(destDir))
150-
.forEach(sourceSet -> sourceSetTasks
151-
.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>())
152-
.add(task.getName()));
151+
.forEach(sourceSet -> {
152+
sourceSetTasks.computeIfAbsent(sourceSet.getName(), s -> new HashSet<>()).add(task.getName());
153+
classifiedSources.computeIfAbsent(getClassifier(sourceSet), ClassifiedSources::new)
154+
.addSources(srcDir.get(), destDir);
155+
});
156+
}
157+
}
158+
159+
private static String getClassifier(SourceSet sourceSet) {
160+
switch (sourceSet.getName()) {
161+
case SourceSet.MAIN_SOURCE_SET_NAME:
162+
return ArtifactCoords.DEFAULT_CLASSIFIER;
163+
case SourceSet.TEST_SOURCE_SET_NAME:
164+
return "tests";
165+
default:
166+
return sourceSet.getName();
167+
}
168+
}
169+
170+
private static class ClassifiedSources {
171+
private final String classifier;
172+
private final List<SourceOutputDir> sources = new ArrayList<>(1);
173+
private final List<SourceOutputDir> resources = new ArrayList<>(1);
174+
175+
public ClassifiedSources(String classifier) {
176+
this.classifier = classifier;
177+
}
178+
179+
private void addSources(File src, File output) {
180+
addIfNotPresent(sources, src, output);
181+
}
182+
183+
private void addResources(File src, File output) {
184+
addIfNotPresent(resources, src, output);
185+
}
186+
187+
private static Collection<SourceDir> toSourceDir(List<SourceOutputDir> dirs) {
188+
if (dirs.isEmpty()) {
189+
return List.of();
190+
}
191+
if (dirs.size() == 1) {
192+
return List.of(dirs.get(0).toSourceDir());
193+
}
194+
final List<SourceDir> result = new ArrayList<>(dirs.size());
195+
for (var dir : dirs) {
196+
result.add(dir.toSourceDir());
197+
}
198+
return result;
199+
}
200+
201+
private ArtifactSources toArtifactSources() {
202+
return new DefaultArtifactSources(classifier, toSourceDir(sources), toSourceDir(resources));
203+
}
204+
205+
private static void addIfNotPresent(List<SourceOutputDir> resources, File src, File output) {
206+
if (resources.isEmpty()) {
207+
resources.add(new SourceOutputDir(src, output));
208+
} else {
209+
for (var added : resources) {
210+
if (added.src().equals(src)) {
211+
return;
212+
}
213+
}
214+
resources.add(new SourceOutputDir(src, output));
215+
}
153216
}
154217
}
218+
219+
private record SourceOutputDir(File src, File output) {
220+
private SourceDir toSourceDir() {
221+
return SourceDir.of(src.toPath(), output.toPath());
222+
}
223+
};
155224
}

‎devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@ private void collectDependencies(org.gradle.api.artifacts.ResolvedDependency res
362362
final IncludedBuild includedBuild = ToolingUtils.includedBuild(project.getRootProject(),
363363
compId.getBuild().getName());
364364
if (includedBuild != null) {
365+
System.out.println("GradleApplicationModelBuilder.collectDependencies INCLUDED BUILD");
365366
final PathList.Builder pathBuilder = PathList.builder();
366367

367368
if (includedBuild instanceof IncludedBuildInternal ib) {
@@ -382,12 +383,14 @@ private void collectDependencies(org.gradle.api.artifacts.ResolvedDependency res
382383
paths = pathBuilder.build();
383384
}
384385
} else if (sourceSets != null) {
386+
System.out.println("GradleApplicationModelBuilder.collectDependencies classifier " + classifier);
385387
if (SourceSet.TEST_SOURCE_SET_NAME.equals(classifier)) {
386388
final PathList.Builder pathBuilder = PathList.builder();
387389
projectModule = initProjectModuleAndBuildPaths(projectDep, a, modelBuilder, depBuilder,
388390
pathBuilder, SourceSet.TEST_SOURCE_SET_NAME, true);
389391
paths = pathBuilder.build();
390392
} else if ("test-fixtures".equals(classifier)) {
393+
System.out.println("GradleApplicationModelBuilder.collectDependencies TEST FIXTURES");
391394
final PathList.Builder pathBuilder = PathList.builder();
392395
projectModule = initProjectModuleAndBuildPaths(projectDep, a, modelBuilder, depBuilder,
393396
pathBuilder, "testFixtures", true);

‎integration-tests/gradle/src/test/java/io/quarkus/gradle/TestFixtureModuleWithPackagePrivateParentTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import java.io.IOException;
77
import java.net.URISyntaxException;
88

9-
import org.junit.jupiter.api.Disabled;
109
import org.junit.jupiter.api.Test;
1110

1211
public class TestFixtureModuleWithPackagePrivateParentTest extends QuarkusGradleWrapperTestBase {
1312

14-
@Disabled("See https://github.com/quarkusio/quarkus/issues/47760")
13+
//@Disabled("See https://github.com/quarkusio/quarkus/issues/47760")
1514
@Test
1615
public void testTaskShouldUseTestFixtures() throws IOException, URISyntaxException, InterruptedException {
1716
final File projectDir = getProjectDir("test-fixtures-module-with-package-private-parent");

0 commit comments

Comments
 (0)