Bootstrap API refactoring #20500

aloubyansky · 2021-10-01T12:04:11Z

This PR introduces a common Quarkus application model and workspace API that are supposed to be used for all the supported build systems (e.g. Maven, Gradle, JBang, etc).
I still plan to evolve the representation of the workspace module sources but I was thinking I'd open this PR now for review, since it's already a huge change.
It also reduces the number of workspace and application model resolutions for the dev mode. I am looking into getting it down to a single app model initialization in a different branch.

quarkus-bot · 2021-10-01T16:27:56Z

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building `9be6a31`

Status	Name	Step	Failures	Logs	Raw logs
✖	MicroProfile TCKs Tests	`Verify`	Failures	Logs	Raw logs

Full information is available in the Build summary check run.

Failures

⚙️ MicroProfile TCKs Tests #

- Failing: tcks/microprofile-fault-tolerance

📦 tcks/microprofile-fault-tolerance

✖ org.eclipse.microprofile.fault.tolerance.tck.TimeoutUninterruptableTest.testTimeoutAsyncBulkhead line 190 - More details - Source on GitHub

java.lang.AssertionError: Unexpected exception thrown from Future
	at org.testng.Assert.fail(Assert.java:85)
	at org.eclipse.microprofile.fault.tolerance.tck.util.Exceptions.expect(Exceptions.java:98)

glefloch

Nice work! That will definitely ease application model usage. I left few comments.

glefloch · 2021-10-02T06:36:13Z

...gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/AppModelGradleResolver.java


    }

    @Override
-    public Path resolve(AppArtifact appArtifact) throws AppModelResolverException {
-        return resolveArtifact(appArtifact).getPaths().getSinglePath();
+    public io.quarkus.maven.dependency.ResolvedDependency resolve(ArtifactCoords appArtifact) throws AppModelResolverException {


I think those imports can be global in the file

Right, now the class/interface names don't conflict with the Gradle API, adding the imports instead.

glefloch · 2021-10-02T07:00:52Z

...dle-application-plugin/src/main/java/io/quarkus/gradle/extension/QuarkusPluginExtension.java

@@ -249,7 +238,8 @@ private File getLastFile(FileCollection fileCollection) {
     * @return the source sets associated with the current project.
     */
    private SourceSetContainer getSourceSets() {
-        return project.getConvention().getPlugin(JavaPluginConvention.class).getSourceSets();
+        final JavaPluginExtension javaExtension = project.getExtensions().findByType(JavaPluginExtension.class);


This method has been introduce in gradle 7.1, as they also deprecate convention in that version, I think we can stick with convention for now as gradle 7.1 is quite recent

Ok, changing back to the convention, thanks!

glefloch · 2021-10-02T08:05:12Z

...-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/ApplicationModel.java

+
+    default Collection<WorkspaceModule> getWorkspaceModules() {
+        final List<WorkspaceModule> modules = new ArrayList<>();
+        //ProjectModule module = getApplicationModule();


Should we keep this commented block of code?

Originally I left it as a reminder to myself to review why we don't add the application module to the complete list of locally available dependencies. But it's not a big deal. I'll remove it.

glefloch · 2021-10-02T08:13:18Z

...ndent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/jbang/JBangBuilderImpl.java

-            AppArtifact appArtifact = new AppArtifact("dev.jbang.user", "quarkus", null, "jar", "999-SNAPSHOT");
-            appArtifact.setPath(appClasses);
+            final ResolvedArtifactDependency appArtifact = new ResolvedArtifactDependency("dev.jbang.user", "quarkus", null,
+                    "jar", "999-SNAPSHOT", appClasses);


It was present before your modification but should we get rid of the hard coded version?

I think it's not important what this version actually is. I'll leave it for now.

Serialize the ApplicationModel in DevMojo to avoid re-resolving it in the dev process

quarkus-bot · 2021-10-02T19:14:43Z

This workflow status is outdated as a new workflow run has been triggered.

Failing Jobs - Building `964727a`

Status	Name	Step	Failures	Logs	Raw logs
✖	Devtools Tests - JDK 11	`Build`	Failures	Logs	Raw logs
✖	Devtools Tests - JDK 11 Windows	`Build`	Failures	Logs	Raw logs
✖	Gradle Tests - JDK 11	`Build`	Failures	Logs	Raw logs
✖	Gradle Tests - JDK 11 Windows	`Build`	Failures	Logs	Raw logs
✖	JVM Tests - JDK 11	`Build`	⚠️ Check →	Logs	Raw logs
✖	JVM Tests - JDK 11 Windows	`Build`	Failures	Logs	Raw logs
✖	JVM Tests - JDK 17	`Build`	⚠️ Check →	Logs	Raw logs
✖	Native Tests - Misc4	`Build`	Failures	Logs	Raw logs

⚠️ Errors occurred while downloading the build reports. This report is incomplete.

Failures

⚙️ Devtools Tests - JDK 11 #

- Failing: integration-tests/devtools

📦 integration-tests/devtools

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradle(String)[1] line 77 - Source on GitHub

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradle(String)[2] line 77 - Source on GitHub

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradle(String)[3] line 77 - Source on GitHub

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradleKotlinDSL(String)[1] line 84 - Source on GitHub

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradleKotlinDSL(String)[2] line 84 - Source on GitHub

✖ io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartBuildIT.testGradleKotlinDSL(String)[3] line 84 - Source on GitHub