Rename FileSystemSnapshotVisitor to FileSystemSnapshotHierarchyVisitor

dmvk · Oct 30, 2020 · bc2130e · bc2130e
1 parent 376933a
commit bc2130e
Show file tree

Hide file tree

Showing 32 changed files with 62 additions and 62 deletions.
diff --git a/...ng/src/main/java/org/gradle/caching/internal/packaging/impl/TarBuildCacheEntryPacker.java b/...ng/src/main/java/org/gradle/caching/internal/packaging/impl/TarBuildCacheEntryPacker.java
@@ -40,7 +40,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.MerkleDirectorySnapshotBuilder;
 import org.gradle.internal.snapshot.RegularFileSnapshot;
 import org.gradle.internal.snapshot.RelativePathStringTracker;
@@ -329,7 +329,7 @@ private static String unescape(String name) {
         }
     }
 
-    private static class PackingVisitor implements FileSystemSnapshotVisitor {
+    private static class PackingVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final RelativePathStringTracker relativePathStringTracker;
         private final TarArchiveOutputStream tarOutput;
         private final String treePath;

diff --git a/...e/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationResult.java b/...e/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationResult.java
@@ -33,7 +33,7 @@
 import org.gradle.internal.operations.trace.CustomOperationTraceSerialization;
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.impl.ImplementationSnapshot;
 
 import javax.annotation.Nullable;
@@ -88,7 +88,7 @@ public byte[] apply(HashCode input) {
     }
 
     @NonNullApi
-    private static class State implements VisitState, FileSystemSnapshotVisitor {
+    private static class State implements VisitState, FileSystemSnapshotHierarchyVisitor {
 
         final InputFilePropertyVisitor visitor;
 

diff --git a/...t/groovy/org/gradle/internal/fingerprint/impl/DefaultFileCollectionSnapshotterTest.groovy b/...t/groovy/org/gradle/internal/fingerprint/impl/DefaultFileCollectionSnapshotterTest.groovy
@@ -31,7 +31,7 @@ import org.gradle.internal.Factory
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot
 import org.gradle.internal.snapshot.FileSystemSnapshot
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
@@ -234,7 +234,7 @@ class DefaultFileCollectionSnapshotterTest extends Specification {
     private static List getSnapshotInfo(FileSystemSnapshot tree) {
         String rootPath = null
         int count = 0
-        tree.accept(new FileSystemSnapshotVisitor() {
+        tree.accept(new FileSystemSnapshotHierarchyVisitor() {
             @Override
             boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {
                 if (rootPath == null) {

diff --git a/...src/test/groovy/org/gradle/internal/fingerprint/impl/FileSystemSnapshotBuilderTest.groovy b/...src/test/groovy/org/gradle/internal/fingerprint/impl/FileSystemSnapshotBuilderTest.groovy
@@ -25,7 +25,7 @@ import org.gradle.internal.hash.HashCode
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot
 import org.gradle.internal.snapshot.FileSystemSnapshot
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor
 import org.gradle.internal.snapshot.RegularFileSnapshot
 import org.gradle.internal.snapshot.RelativePathSegmentsTracker
 import org.gradle.test.fixtures.file.CleanupTestDirectory
@@ -66,7 +66,7 @@ class FileSystemSnapshotBuilderTest extends Specification {
         Set<String> files = [] as Set
         Set<String> relativePaths = [] as Set
         def result = builder.build()
-        result.accept(new FileSystemSnapshotVisitor() {
+        result.accept(new FileSystemSnapshotHierarchyVisitor() {
             private final relativePathTracker = new RelativePathSegmentsTracker()
 
             @Override

diff --git a/...rc/main/java/org/gradle/internal/execution/history/impl/DefaultOutputFilesRepository.java b/...rc/main/java/org/gradle/internal/execution/history/impl/DefaultOutputFilesRepository.java
@@ -25,7 +25,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.io.Closeable;
 import java.io.File;
@@ -65,7 +65,7 @@ private boolean containsFilesGeneratedByGradle(File absoluteFile) {
     @Override
     public void recordOutputs(Iterable<? extends FileSystemSnapshot> outputFileFingerprints) {
         for (FileSystemSnapshot outputFileFingerprint : outputFileFingerprints) {
-            outputFileFingerprint.accept(new FileSystemSnapshotVisitor() {
+            outputFileFingerprint.accept(new FileSystemSnapshotHierarchyVisitor() {
                 @Override
                 public boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {
                     recordOutputSnapshot(directorySnapshot);

diff --git a/subprojects/execution/src/main/java/org/gradle/internal/execution/impl/OutputFilterUtil.java b/subprojects/execution/src/main/java/org/gradle/internal/execution/impl/OutputFilterUtil.java
@@ -24,7 +24,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.MerkleDirectorySnapshotBuilder;
 
 import javax.annotation.Nullable;
@@ -109,7 +109,7 @@ private static boolean isOutputEntry(Map<String, FileSystemLocationFingerprint>
         return afterPreviousExecutionFingerprints.containsKey(afterExecutionSnapshot.getAbsolutePath());
     }
 
-    private static class GetAllSnapshotsVisitor implements FileSystemSnapshotVisitor {
+    private static class GetAllSnapshotsVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final Map<String, CompleteFileSystemLocationSnapshot> snapshots = new HashMap<>();
 
         @Override
@@ -132,7 +132,7 @@ public Map<String, CompleteFileSystemLocationSnapshot> getSnapshots() {
         }
     }
 
-    private static class SnapshotFilteringVisitor implements FileSystemSnapshotVisitor {
+    private static class SnapshotFilteringVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final BiPredicate<CompleteFileSystemLocationSnapshot, Boolean> predicate;
         private final ImmutableList.Builder<FileSystemSnapshot> newRootsBuilder = ImmutableList.builder();
 

diff --git a/.../execution/src/test/groovy/org/gradle/internal/execution/impl/OutputFilterUtilTest.groovy b/.../execution/src/test/groovy/org/gradle/internal/execution/impl/OutputFilterUtilTest.groovy
@@ -26,7 +26,7 @@ import org.gradle.internal.fingerprint.impl.DefaultCurrentFileCollectionFingerpr
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot
 import org.gradle.internal.snapshot.FileSystemSnapshot
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -178,7 +178,7 @@ class OutputFilterUtilTest extends Specification {
     List<File> collectFiles(ImmutableList<FileSystemSnapshot> fileSystemSnapshots) {
         def result = []
         fileSystemSnapshots.each {
-            it.accept(new FileSystemSnapshotVisitor() {
+            it.accept(new FileSystemSnapshotHierarchyVisitor() {
                 @Override
                 boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {
                     result.add(directorySnapshot)

diff --git a/...y/org/gradle/internal/watch/ChangesDuringTheBuildFileSystemWatchingIntegrationTest.groovy b/...y/org/gradle/internal/watch/ChangesDuringTheBuildFileSystemWatchingIntegrationTest.groovy
@@ -48,7 +48,7 @@ class ChangesDuringTheBuildFileSystemWatchingIntegrationTest extends AbstractFil
                 def vfs = gradle.services.get(VirtualFileSystem)
                 int filesInVfs = 0
                 vfs.rootReference.getRoot().visitSnapshotRoots { snapshot ->
-                    snapshot.accept(new FileSystemSnapshotVisitor() {
+                    snapshot.accept(new FileSystemSnapshotHierarchyVisitor() {
                         @Override
                         void visitFile(CompleteFileSystemLocationSnapshot fileSnapshot) {
                             if (fileSnapshot.type == FileType.RegularFile && fileSnapshot.absolutePath.startsWith(projectRoot)) {

diff --git a/.../main/java/org/gradle/internal/watch/registry/impl/NonHierarchicalFileWatcherUpdater.java b/.../main/java/org/gradle/internal/watch/registry/impl/NonHierarchicalFileWatcherUpdater.java
@@ -23,7 +23,7 @@
 import net.rubygrapefruit.platform.file.FileWatcher;
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.SnapshotHierarchy;
 import org.gradle.internal.watch.WatchingNotSupportedException;
 import org.gradle.internal.watch.registry.FileWatcherUpdater;
@@ -165,7 +165,7 @@ private static void increment(String path, Map<String, Integer> changedWatchedDi
         changedWatchedDirectories.compute(path, (key, value) -> value == null ? 1 : value + 1);
     }
 
-    private class SubdirectoriesToWatchVisitor implements FileSystemSnapshotVisitor {
+    private class SubdirectoriesToWatchVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final Consumer<String> subDirectoryToWatchConsumer;
         private boolean root;
 

diff --git a/...-watching/src/main/java/org/gradle/internal/watch/registry/impl/WatchableHierarchies.java b/...-watching/src/main/java/org/gradle/internal/watch/registry/impl/WatchableHierarchies.java
@@ -21,7 +21,7 @@
 import org.gradle.internal.file.FileMetadata;
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.SnapshotHierarchy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -121,7 +121,7 @@ public boolean shouldWatch(CompleteFileSystemLocationSnapshot snapshot) {
         return !ignoredForWatching(snapshot) && isInWatchableHierarchy(snapshot.getAbsolutePath());
     }
 
-    private class RemoveUnwatchedFiles implements FileSystemSnapshotVisitor {
+    private class RemoveUnwatchedFiles implements FileSystemSnapshotHierarchyVisitor {
         private SnapshotHierarchy root;
         private final Invalidator invalidator;
 

diff --git a/...src/main/java/org/gradle/internal/watch/vfs/impl/DefaultFileSystemWatchingStatistics.java b/...src/main/java/org/gradle/internal/watch/vfs/impl/DefaultFileSystemWatchingStatistics.java
@@ -21,7 +21,7 @@
 import org.gradle.internal.file.FileType;
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.SnapshotHierarchy;
 import org.gradle.internal.watch.registry.FileWatcherRegistry;
 import org.gradle.internal.watch.vfs.FileSystemWatchingStatistics;
@@ -65,7 +65,7 @@ public int getRetainedMissingFiles() {
 
     private static VirtualFileSystemStatistics getStatistics(SnapshotHierarchy root) {
         EnumMultiset<FileType> retained = EnumMultiset.create(FileType.class);
-        root.visitSnapshotRoots(snapshot -> snapshot.accept(new FileSystemSnapshotVisitor() {
+        root.visitSnapshotRoots(snapshot -> snapshot.accept(new FileSystemSnapshotHierarchyVisitor() {
             @Override
             public boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {
                 retained.add(directorySnapshot.getType());

diff --git a/.../java/org/gradle/internal/fingerprint/classpath/impl/ClasspathFingerprintingStrategy.java b/.../java/org/gradle/internal/fingerprint/classpath/impl/ClasspathFingerprintingStrategy.java
@@ -22,14 +22,14 @@
 import org.gradle.api.internal.changedetection.state.DefaultRegularFileSnapshotContext;
 import org.gradle.api.internal.changedetection.state.IgnoringResourceHasher;
 import org.gradle.api.internal.changedetection.state.ManifestFileZipEntryHasher;
-import org.gradle.api.internal.changedetection.state.RegularFileSnapshotContext;
+import org.gradle.api.internal.changedetection.state.MetaInfAwareClasspathResourceHasher;
 import org.gradle.api.internal.changedetection.state.PropertiesFileAwareClasspathResourceHasher;
+import org.gradle.api.internal.changedetection.state.RegularFileSnapshotContext;
 import org.gradle.api.internal.changedetection.state.ResourceEntryFilter;
 import org.gradle.api.internal.changedetection.state.ResourceFilter;
 import org.gradle.api.internal.changedetection.state.ResourceHasher;
 import org.gradle.api.internal.changedetection.state.ResourceSnapshotterCacheService;
 import org.gradle.api.internal.changedetection.state.RuntimeClasspathResourceHasher;
-import org.gradle.api.internal.changedetection.state.MetaInfAwareClasspathResourceHasher;
 import org.gradle.api.internal.changedetection.state.ZipHasher;
 import org.gradle.internal.file.FileType;
 import org.gradle.internal.fingerprint.FileSystemLocationFingerprint;
@@ -43,7 +43,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.RegularFileSnapshot;
 import org.gradle.internal.snapshot.RelativePathSegmentsTracker;
 import org.gradle.internal.snapshot.RelativePathStringTracker;
@@ -146,7 +146,7 @@ public HashCode determineNonJarFingerprint(HashCode original) {
         public abstract HashCode determineNonJarFingerprint(HashCode original);
     }
 
-    private class ClasspathContentFingerprintingVisitor implements FileSystemSnapshotVisitor {
+    private class ClasspathContentFingerprintingVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final ClasspathFingerprintVisitor delegate;
         private final RelativePathSegmentsTracker relativePathSegmentsTracker = new RelativePathSegmentsTracker();
         public ClasspathContentFingerprintingVisitor(ClasspathFingerprintVisitor delegate) {

diff --git a/...rc/main/java/org/gradle/internal/fingerprint/impl/AbsolutePathFingerprintingStrategy.java b/...rc/main/java/org/gradle/internal/fingerprint/impl/AbsolutePathFingerprintingStrategy.java
@@ -24,7 +24,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -54,7 +54,7 @@ public Map<String, FileSystemLocationFingerprint> collectFingerprints(Iterable<?
         final ImmutableMap.Builder<String, FileSystemLocationFingerprint> builder = ImmutableMap.builder();
         final HashSet<String> processedEntries = new HashSet<String>();
         for (FileSystemSnapshot root : roots) {
-            root.accept(new FileSystemSnapshotVisitor() {
+            root.accept(new FileSystemSnapshotHierarchyVisitor() {
                 private int treeDepth = 0;
 
                 @Override

diff --git a/...in/java/org/gradle/internal/fingerprint/impl/DefaultCurrentFileCollectionFingerprint.java b/...in/java/org/gradle/internal/fingerprint/impl/DefaultCurrentFileCollectionFingerprint.java
@@ -28,7 +28,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.util.Map;
 
@@ -59,7 +59,7 @@ private DefaultCurrentFileCollectionFingerprint(Map<String, FileSystemLocationFi
         this.roots = roots;
 
         final ImmutableMultimap.Builder<String, HashCode> builder = ImmutableMultimap.builder();
-        accept(new FileSystemSnapshotVisitor() {
+        accept(new FileSystemSnapshotHierarchyVisitor() {
             @Override
             public boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {
                 builder.put(directorySnapshot.getAbsolutePath(), directorySnapshot.getHash());
@@ -110,7 +110,7 @@ public String getStrategyIdentifier() {
     }
 
     @Override
-    public void accept(FileSystemSnapshotVisitor visitor) {
+    public void accept(FileSystemSnapshotHierarchyVisitor visitor) {
         if (roots == null) {
             throw new UnsupportedOperationException("Roots not available.");
         }

diff --git a/...main/java/org/gradle/internal/fingerprint/impl/EmptyCurrentFileCollectionFingerprint.java b/...main/java/org/gradle/internal/fingerprint/impl/EmptyCurrentFileCollectionFingerprint.java
@@ -22,7 +22,7 @@
 import org.gradle.internal.fingerprint.FileSystemLocationFingerprint;
 import org.gradle.internal.hash.HashCode;
 import org.gradle.internal.hash.Hashing;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.util.Collections;
 import java.util.Map;
@@ -53,7 +53,7 @@ public Map<String, FileSystemLocationFingerprint> getFingerprints() {
     }
 
     @Override
-    public void accept(FileSystemSnapshotVisitor visitor) {
+    public void accept(FileSystemSnapshotHierarchyVisitor visitor) {
     }
 
     @Override

diff --git a/...src/main/java/org/gradle/internal/fingerprint/impl/IgnoredPathFingerprintingStrategy.java b/...src/main/java/org/gradle/internal/fingerprint/impl/IgnoredPathFingerprintingStrategy.java
@@ -22,7 +22,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -52,7 +52,7 @@ public Map<String, FileSystemLocationFingerprint> collectFingerprints(Iterable<?
         final ImmutableMap.Builder<String, FileSystemLocationFingerprint> builder = ImmutableMap.builder();
         final HashSet<String> processedEntries = new HashSet<String>();
         for (FileSystemSnapshot root : roots) {
-            root.accept(new FileSystemSnapshotVisitor() {
+            root.accept(new FileSystemSnapshotHierarchyVisitor() {
 
                 @Override
                 public boolean preVisitDirectory(CompleteDirectorySnapshot directorySnapshot) {

diff --git a/...ts/src/main/java/org/gradle/internal/fingerprint/impl/NameOnlyFingerprintingStrategy.java b/...ts/src/main/java/org/gradle/internal/fingerprint/impl/NameOnlyFingerprintingStrategy.java
@@ -22,7 +22,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -51,7 +51,7 @@ public Map<String, FileSystemLocationFingerprint> collectFingerprints(Iterable<?
         final ImmutableMap.Builder<String, FileSystemLocationFingerprint> builder = ImmutableMap.builder();
         final HashSet<String> processedEntries = new HashSet<String>();
         for (FileSystemSnapshot root : roots) {
-            root.accept(new FileSystemSnapshotVisitor() {
+            root.accept(new FileSystemSnapshotHierarchyVisitor() {
                 private boolean root = true;
 
                 @Override

diff --git a/...rc/main/java/org/gradle/internal/fingerprint/impl/RelativePathFingerprintingStrategy.java b/...rc/main/java/org/gradle/internal/fingerprint/impl/RelativePathFingerprintingStrategy.java
@@ -24,7 +24,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 import org.gradle.internal.snapshot.RelativePathStringTracker;
 
 import java.util.HashSet;
@@ -59,7 +59,7 @@ public Map<String, FileSystemLocationFingerprint> collectFingerprints(Iterable<?
         final ImmutableMap.Builder<String, FileSystemLocationFingerprint> builder = ImmutableMap.builder();
         final HashSet<String> processedEntries = new HashSet<String>();
         for (FileSystemSnapshot root : roots) {
-            root.accept(new FileSystemSnapshotVisitor() {
+            root.accept(new FileSystemSnapshotHierarchyVisitor() {
                 private final RelativePathStringTracker relativePathStringTracker = new RelativePathStringTracker();
 
                 @Override

diff --git a/...n/java/org/gradle/internal/fingerprint/overlap/impl/DefaultOverlappingOutputDetector.java b/...n/java/org/gradle/internal/fingerprint/overlap/impl/DefaultOverlappingOutputDetector.java
@@ -26,7 +26,7 @@
 import org.gradle.internal.snapshot.CompleteDirectorySnapshot;
 import org.gradle.internal.snapshot.CompleteFileSystemLocationSnapshot;
 import org.gradle.internal.snapshot.FileSystemSnapshot;
-import org.gradle.internal.snapshot.FileSystemSnapshotVisitor;
+import org.gradle.internal.snapshot.FileSystemSnapshotHierarchyVisitor;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -76,7 +76,7 @@ private static boolean createdSincePreviousExecution(@Nullable HashCode previous
         return previousContentHash == null;
     }
 
-    private static class OverlappingOutputsDetectingVisitor implements FileSystemSnapshotVisitor {
+    private static class OverlappingOutputsDetectingVisitor implements FileSystemSnapshotHierarchyVisitor {
         private final Map<String, FileSystemLocationFingerprint> previousFingerprints;
         private int treeDepth = 0;
         private String overlappingPath;