Rename a few variables

Author: sungshik

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

@@ -43,8 +43,8 @@
 
 public class JDKDirectoryWatch extends JDKBaseWatch {
     private final Logger logger = LogManager.getLogger();
-    private volatile @MonotonicNonNull Closeable bundledWatch;
     private final boolean nativeRecursive;
+    private volatile @MonotonicNonNull Closeable bundledJDKWatcher;
 
     private static final BundledSubscription<SubscriptionKey, List<java.nio.file.WatchEvent<?>>>
         BUNDLED_JDK_WATCHERS = new BundledSubscription<>(JDKPoller::register);
@@ -75,20 +75,20 @@ private void handleChanges(List<java.nio.file.WatchEvent<?>> events) {
 
     @Override
     public synchronized void close() throws IOException {
-        if (bundledWatch != null) {
+        if (bundledJDKWatcher != null) {
             logger.trace("Closing watch for: {}", this.path);
-            bundledWatch.close();
+            bundledJDKWatcher.close();
         }
     }
 
     @Override
     protected synchronized boolean runIfFirstTime() throws IOException {
-        if (bundledWatch != null) {
+        if (bundledJDKWatcher != null) {
             return false;
         }
 
         var key = new SubscriptionKey(path, nativeRecursive);
-        bundledWatch = BUNDLED_JDK_WATCHERS.subscribe(key, this::handleChanges);
+        bundledJDKWatcher = BUNDLED_JDK_WATCHERS.subscribe(key, this::handleChanges);
         return true;
     }
 }

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

@@ -148,10 +148,10 @@ public FileVisitResult postVisitDirectory(Path subdir, IOException exc) throws I
         }
 
         private void addNewDirectory(Path dir) throws IOException {
-            var watcher = activeWatches.computeIfAbsent(dir, d -> new JDKDirectoryWatch(d, exec, relocater(dir)));
+            var watch = activeWatches.computeIfAbsent(dir, d -> new JDKDirectoryWatch(d, exec, relocater(dir)));
             try {
-                if (!watcher.runIfFirstTime()) {
-                    logger.debug("We lost the race on starting a nested watcher, that shouldn't be a problem, but it's a very busy, so we might have lost a few events in {}", dir);
+                if (!watch.runIfFirstTime()) {
+                    logger.debug("We lost the race on starting a nested watch, that shouldn't be a problem, but it's a very busy, so we might have lost a few events in {}", dir);
                 }
             } catch (IOException ex) {
                 activeWatches.remove(dir);
@@ -160,7 +160,7 @@ private void addNewDirectory(Path dir) throws IOException {
             }
         }
 
-        /** Make sure that the events are relative to the actual root of the recursive watcher */
+        /** Make sure that the events are relative to the actual root of the recursive watch */
         private Consumer<WatchEvent> relocater(Path subRoot) {
             final Path newRelative = path.relativize(subRoot);
             return ev -> {