Merge pull request quarkusio#49117 from reaver585/fix-tests-reloadability

Force reloadability of project dependencies in QuarkusApplicationModelTask

Author: aloubyansky

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

@@ -31,6 +31,7 @@
 import org.gradle.api.artifacts.ResolvableDependencies;
 import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
 import org.gradle.api.artifacts.result.DependencyResult;
 import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.artifacts.result.ResolvedComponentResult;
@@ -186,7 +187,7 @@ private static void collectDestinationDirs(Collection<SourceDir> sources, final
         }
     }
 
-    private static void collectDependencies(QuarkusResolvedClasspath classpath, ApplicationModelBuilder modelBuilder,
+    private void collectDependencies(QuarkusResolvedClasspath classpath, ApplicationModelBuilder modelBuilder,
             WorkspaceModule.Mutable wsModule, ProjectDescriptor projectDescriptor) {
         final Map<ComponentIdentifier, List<QuarkusResolvedArtifact>> artifacts = classpath
                 .resolvedArtifactsByComponentIdentifier();
@@ -195,8 +196,11 @@ private static void collectDependencies(QuarkusResolvedClasspath classpath, Appl
         final Set<ModuleVersionIdentifier> processedModules = new HashSet<>();
         classpath.getRoot().get().getDependencies().forEach(d -> {
             if (d instanceof ResolvedDependencyResult resolved) {
-                final byte flags = (byte) (COLLECT_TOP_EXTENSION_RUNTIME_NODES | COLLECT_DIRECT_DEPS
-                        | COLLECT_RELOADABLE_MODULES);
+                byte flags = (byte) (COLLECT_TOP_EXTENSION_RUNTIME_NODES | COLLECT_DIRECT_DEPS);
+                final LaunchMode launchMode = getLaunchMode().get();
+                if (!launchMode.equals(LaunchMode.NORMAL)) {
+                    flags |= COLLECT_RELOADABLE_MODULES;
+                }
                 collectDependencies(resolved, modelBuilder, artifacts, wsModule, alreadyCollectedFiles,
                         processedModules, flags, projectDescriptor);
             }
@@ -311,8 +315,15 @@ private static void collectDependencies(
                 newFlags = clearFlag(newFlags, COLLECT_RELOADABLE_MODULES);
             }
             if (isFlagOn(flags, COLLECT_RELOADABLE_MODULES)) {
-                if (projectModule != null) {
-                    depBuilder.setFlags(DependencyFlags.RELOADABLE);
+                // Checking whether current dependency is a project module is a temporary workaround,
+                // that is required while projectModule for project dependencies is null (current
+                // deficiency of this task).
+                // That's why we set the workspace module flag explicitly via setWorkspaceModule().
+                // Once we have projectModule set for project dependencies, we can remove this workaround.
+                final boolean isProjectDependency = resolvedDependency.getSelected()
+                        .getId() instanceof ProjectComponentIdentifier;
+                if (projectModule != null || isProjectDependency) {
+                    depBuilder.setReloadable().setWorkspaceModule();
                     modelBuilder.addReloadableWorkspaceModule(artifactKey);
                 } else {
                     newFlags = clearFlag(newFlags, COLLECT_RELOADABLE_MODULES);

integration-tests/gradle/src/main/resources/test-with-sidecar-module/gradle.properties

@@ -0,0 +1,2 @@
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformGroupId=io.quarkus

integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/build.gradle

@@ -0,0 +1,23 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    mavenLocal {
+        content {
+            includeGroupByRegex 'io.quarkus.*'
+            includeGroup 'org.hibernate.orm'
+        }
+    }
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation "io.quarkus:quarkus-arc"
+
+    testImplementation project(":test-support")
+    testImplementation "io.quarkus:quarkus-junit5"
+}

integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/src/main/java/com/module/Person.java

@@ -0,0 +1,4 @@
+package com.module;
+
+public record Person(String id) {
+}

integration-tests/gradle/src/main/resources/test-with-sidecar-module/my-module/src/test/java/com/module/PersonTest.java

@@ -0,0 +1,16 @@
+package com.module;
+
+import org.junit.jupiter.api.Test;
+
+import com.module.test.PersonFactory;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+class PersonTest {
+
+    @Test
+    void test() {
+        PersonFactory.newRandomPerson();
+    }
+}

integration-tests/gradle/src/main/resources/test-with-sidecar-module/settings.gradle

@@ -0,0 +1,19 @@
+pluginManagement {
+    repositories {
+        mavenLocal {
+            content {
+                includeGroupByRegex 'io.quarkus.*'
+                includeGroup 'org.hibernate.orm'
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    plugins {
+      id 'io.quarkus' version "${quarkusPluginVersion}"
+    }
+}
+rootProject.name = 'test-with-sidecar-module'
+
+include "test-support"
+include "my-module"

integration-tests/gradle/src/main/resources/test-with-sidecar-module/test-support/build.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation project(":my-module")
+}

integration-tests/gradle/src/main/resources/test-with-sidecar-module/test-support/src/main/java/com/module/test/PersonFactory.java

@@ -0,0 +1,12 @@
+package com.module.test;
+
+import java.util.UUID;
+
+import com.module.Person;
+
+public class PersonFactory {
+
+    public static Person newRandomPerson() {
+        return new Person(UUID.randomUUID().toString());
+    }
+}

integration-tests/gradle/src/test/java/io/quarkus/gradle/TestWithSidecarModule.java

@@ -0,0 +1,18 @@
+package io.quarkus.gradle;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+
+import org.junit.jupiter.api.Test;
+
+// Reproduces https://github.com/quarkusio/quarkus/issues/48159
+public class TestWithSidecarModule extends QuarkusGradleWrapperTestBase {
+
+    @Test
+    public void test() throws Exception {
+        final File projectDir = getProjectDir("test-with-sidecar-module");
+        final BuildResult build = runGradleWrapper(projectDir, "clean", ":my-module:test");
+        assertThat(BuildResult.isSuccessful(build.getTasks().get(":my-module:test"))).isTrue();
+    }
+}