Fix issue in JDKFileWatch that the wrong division of root/relative path was reported

Author: sungshik

src/main/java/engineering/swat/watch/impl/jdk/JDKFileWatch.java

@@ -61,12 +61,9 @@ public JDKFileWatch(Path file, Executor exec,
         assert !parent.equals(file);
 
         this.internal = new JDKDirectoryWatch(parent, exec, (w, e) -> {
-            if (e.getKind() == WatchEvent.Kind.OVERFLOW) {
-                var overflow = new WatchEvent(WatchEvent.Kind.OVERFLOW, file);
-                eventHandler.accept(w, overflow);
-            }
-            if (fileName.equals(e.getRelativePath())) {
-                eventHandler.accept(w, e);
+            var kind = e.getKind();
+            if (kind == WatchEvent.Kind.OVERFLOW || e.getRelativePath().equals(fileName)) {
+                eventHandler.accept(w, new WatchEvent(kind, file));
             }
         }, eventFilter);
 

src/test/java/engineering/swat/watch/SingleFileTests.java

@@ -143,13 +143,11 @@ void memorylessRescanOnOverflow() throws IOException, InterruptedException {
         try (var watch = startWatchAndTriggerOverflow(Approximation.ALL, bookkeeper)) {
             Thread.sleep(TestHelper.SHORT_WAIT.toMillis());
 
-            var fileName = watch.getPath().getFileName();
-            var parent = watch.getPath().getParent();
-
-            await("Overflow should trigger created event for `" + fileName + "`")
-                .until(() -> bookkeeper.events().kind(CREATED).rootPath(parent).relativePath(fileName).any());
+            var path = watch.getPath();
+            await("Overflow should trigger created event for `" + path + "`")
+                .until(() -> bookkeeper.events().kind(CREATED).rootPath(path).any());
             await("Overflow shouldn't trigger created events for other files")
-                .until(() -> bookkeeper.events().kind(CREATED).rootPath(parent).relativePathNot(fileName).none());
+                .until(() -> bookkeeper.events().kind(CREATED).rootPathNot(path).none());
             await("Overflow shouldn't trigger modified or deleted events")
                 .until(() -> bookkeeper.events().kind(MODIFIED, DELETED).none());
             await("Overflow should be visible to user-defined event handler")