This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch feat/WW-5864-struts-maven-plugin-watch
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 02e6d3318fc1e796fef86721b882cfce6a309af3
Author: Lukasz Lenart <[email protected]>
AuthorDate: Sat Nov 14 09:23:52 2026 +0100

    WW-5864 fix(tools): push overlapping roots in scan order
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
 .../struts2/maven/watch/ResourceWatcher.java       |  6 ++--
 .../struts2/maven/watch/ResourceScannerTest.java   | 12 ++++++++
 .../struts2/maven/watch/ResourceWatcherTest.java   | 33 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git 
a/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
 
b/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
index ce95e2da6..fd02710b6 100644
--- 
a/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
+++ 
b/tools/struts-maven-plugin/src/main/java/org/apache/struts2/maven/watch/ResourceWatcher.java
@@ -24,6 +24,8 @@ import java.nio.file.Path;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -72,10 +74,10 @@ public class ResourceWatcher {
         Map<Path, FileStamp> currentFilterStamps = filterStamps();
         Set<SourceFile> handled = new HashSet<>();
 
-        Set<SourceFile> paths = new HashSet<>(current.keySet());
+        Set<SourceFile> paths = new LinkedHashSet<>(current.keySet());
         paths.addAll(previous.keySet());
         paths.addAll(acted.keySet());
-        Map<SourceFile, FileStamp> nextActed = new HashMap<>(acted);
+        Map<SourceFile, FileStamp> nextActed = new LinkedHashMap<>(acted);
         for (SourceFile file : paths) {
             FileStamp now = current.get(file);
             if (Objects.equals(now, previous.get(file)) && 
!Objects.equals(now, acted.get(file))) {
diff --git 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceScannerTest.java
 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceScannerTest.java
index 93d9a734e..8a443fddc 100644
--- 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceScannerTest.java
+++ 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceScannerTest.java
@@ -95,4 +95,16 @@ public class ResourceScannerTest {
 
         assertThat(new ResourceScanner(List.of(root(dir, List.of(), 
List.of())), true).scan()).isEmpty();
     }
+
+    @Test
+    public void overlappingRootsAreListedInRootOrder() throws Exception {
+        Path dir = temp.newFolder("res").toPath();
+        Files.writeString(dir.resolve("a.txt"), "a");
+        WatchedRoot first = new WatchedRoot(dir, List.of(), List.of(), 
"first", false);
+        WatchedRoot second = new WatchedRoot(dir, List.of(), List.of(), 
"second", false);
+
+        Map<SourceFile, FileStamp> scan = new ResourceScanner(List.of(first, 
second), true).scan();
+
+        assertThat(scan.keySet()).containsExactly(new SourceFile(first, 
"a.txt"), new SourceFile(second, "a.txt"));
+    }
 }
diff --git 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
index d089f9dfd..2713d86cb 100644
--- 
a/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
+++ 
b/tools/struts-maven-plugin/src/test/java/org/apache/struts2/maven/watch/ResourceWatcherTest.java
@@ -206,4 +206,37 @@ public class ResourceWatcherTest {
 
         assertThat(remaining.get()).isNegative();
     }
+
+    @Test
+    public void overlappingRootsArePushedInScanOrder() {
+        List<WatchedRoot> roots = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            roots.add(new WatchedRoot(Path.of("same"), List.of(), List.of(), 
"t" + i, false));
+        }
+        Map<SourceFile, FileStamp> before = new LinkedHashMap<>();
+        Map<SourceFile, FileStamp> after = new LinkedHashMap<>();
+        for (WatchedRoot root : roots) {
+            before.putAll(scan(root, "a", 1));
+            after.putAll(scan(root, "a", 2));
+        }
+        List<String> targets = new ArrayList<>();
+        ResourcePusher recording = new ResourcePusher() {
+            @Override
+            public void push(SourceFile file) {
+                targets.add(file.root().targetPath());
+            }
+
+            @Override
+            public void delete(SourceFile file) {
+            }
+        };
+        FakeScanner scanner = new FakeScanner().add(before).add(after);
+        ResourceWatcher watcher = new ResourceWatcher(scanner, recording, 
List.of(), m -> { }, (m, e) -> { });
+
+        watcher.start();
+        watcher.pollOnce();
+        watcher.pollOnce();
+
+        assertThat(targets).containsExactly("t0", "t1", "t2", "t3", "t4", 
"t5");
+    }
 }

Reply via email to