Merge pull request #38939 from aloubyansky/all-classes-dirs-in-update…

…s-processor Collect classes dirs from all the modules in RuntimeUpdatesProcessor
quarkusio · Jun 8, 2024 · 9222a8a · 9222a8a
2 parents 1c3f1cc + 02b1740
commit 9222a8a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/RuntimeUpdatesProcessor.java
@@ -187,12 +187,13 @@ public TestSupport getTestSupport() {
     }
 
     @Override
-    public Path getClassesDir() {
-        //TODO: fix all these
-        for (DevModeContext.ModuleInfo i : context.getAllModules()) {
-            return Paths.get(i.getMain().getClassesPath());
+    public List<Path> getClassesDir() {
+        final List<ModuleInfo> allModules = context.getAllModules();
+        final List<Path> paths = new ArrayList<>(allModules.size());
+        for (DevModeContext.ModuleInfo i : allModules) {
+            paths.add(Path.of(i.getMain().getClassesPath()));
         }
-        return null;
+        return paths;
     }
 
     @Override

diff --git a/core/devmode-spi/src/main/java/io/quarkus/dev/spi/HotReplacementContext.java b/core/devmode-spi/src/main/java/io/quarkus/dev/spi/HotReplacementContext.java
@@ -8,7 +8,7 @@
 
 public interface HotReplacementContext {
 
-    Path getClassesDir();
+    List<Path> getClassesDir();
 
     List<Path> getSourcesDir();
 

diff --git a/...c/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java b/...c/main/java/io/quarkus/vertx/http/runtime/devmode/StaticResourcesHotReplacementSetup.java
@@ -14,7 +14,9 @@ public class StaticResourcesHotReplacementSetup implements HotReplacementSetup {
     @Override
     public void setupHotDeployment(HotReplacementContext context) {
         List<Path> resources = new ArrayList<>();
-        addPathIfContainsStaticResources(resources, context.getClassesDir());
+        for (Path classesDir : context.getClassesDir()) {
+            addPathIfContainsStaticResources(resources, classesDir);
+        }
         for (Path resourceDir : context.getResourcesDir()) {
             addPathIfContainsStaticResources(resources, resourceDir);
         }