From 3cd726b8641b1be4e6973f9a76c40cb79e5e712e Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Sun, 24 Jan 2021 15:21:34 +0100 Subject: [PATCH] Rename getDependentPaths() to getDependencyPaths() because the paths are not dependent on the given CacheRecord - it is the other way round --- .../java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java | 2 +- .../mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java | 2 +- .../mvnd/cache/factory/WatchServiceCacheFactory.java | 4 ++-- .../org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java | 2 +- .../mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java | 2 +- .../mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java | 2 +- .../org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java | 2 +- .../mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java | 2 +- .../mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java index 543eb063..83861f75 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java @@ -27,7 +27,7 @@ public interface CacheRecord { * @return a {@link Stream} of file (not directory) {@link Path}s whose modification or deletion causes invalidation * of this {@link CacheRecord}. */ - Stream getDependentPaths(); + Stream getDependencyPaths(); /** * Callback called by the cache when this {@link CacheRecord} is removed from the cache. diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java index 95403275..51f9fbf9 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java @@ -103,7 +103,7 @@ public class TimestampCacheFactory extends AbstractLogEnabled implements CacheFa * @return {@link Set} of {@link FileState}s at current time */ private Set currentFileStates() { - return record.getDependentPaths() + return record.getDependencyPaths() .map(FileState::new) .collect(Collectors.toSet()); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java index 25f977a4..c2d576d4 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java @@ -65,7 +65,7 @@ public class WatchServiceCacheFactory extends AbstractLogEnabled implements Cach * @param record the {@link CacheRecord} to watch */ public void add(CacheRecord record) { - record.getDependentPaths().forEach(p -> { + record.getDependencyPaths().forEach(p -> { final List records = recordsByPath.computeIfAbsent(p, k -> new ArrayList<>()); synchronized (records) { records.add(record); @@ -159,7 +159,7 @@ public class WatchServiceCacheFactory extends AbstractLogEnabled implements Cach void remove(List records) { for (CacheRecord record : records) { record.invalidate(); - record.getDependentPaths() + record.getDependencyPaths() .map(Path::getParent) .forEach(dir -> registrationsByDir.compute(dir, this::unregister)); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java index 82436f4b..d6468041 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java @@ -43,7 +43,7 @@ public class CliExtensionRealmCache extends DefaultExtensionRealmCache { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return record.getArtifacts().stream().map(artifact -> artifact.getFile().toPath()); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java index a9531f1b..94e88847 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java @@ -39,7 +39,7 @@ public class CliPluginArtifactsCache extends DefaultPluginArtifactsCache { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return record.getArtifacts().stream().map(artifact -> artifact.getFile().toPath()); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java index 2d90f060..3037220e 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java @@ -56,7 +56,7 @@ public class CliPluginDescriptorCache extends DefaultPluginDescriptorCache { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return Optional.ofNullable(descriptor.getArtifacts()).orElse(Collections.emptyList()) .stream().map(artifact -> artifact.getFile().toPath()); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java index 4cc7ead0..69c9a639 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java @@ -54,7 +54,7 @@ public class CliPluginRealmCache extends DefaultPluginRealmCache { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return record.getArtifacts().stream().map(artifact -> artifact.getFile().toPath()); } diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java index 9a0fb138..9a838d8b 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java @@ -42,7 +42,7 @@ public class CliProjectArtifactsCache extends DefaultProjectArtifactsCache { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return record.getArtifacts().stream() .map(Artifact::getFile) .filter(Objects::nonNull) diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java b/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java index 67e859e3..c7af37a5 100644 --- a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java +++ b/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java @@ -89,7 +89,7 @@ public class TimestampCacheFactoryTest { } @Override - public Stream getDependentPaths() { + public Stream getDependencyPaths() { return paths.stream(); }