Minor tweaks to DirectoryListingStateValue

--
MOS_MIGRATED_REVID=107805824

2 files changed, 8 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java
index 7a422e5388..5e83b7700e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/DirectoryListingStateValue.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.vfs.Dirent;
@@ -47,14 +46,13 @@ public final class DirectoryListingStateValue implements SkyValue {
     this.compactSortedDirents = CompactSortedDirents.create(dirents);
   }
 
-  @VisibleForTesting
-  public static DirectoryListingStateValue createForTesting(Collection<Dirent> dirents) {
+  public static DirectoryListingStateValue create(Collection<Dirent> dirents) {
     return new DirectoryListingStateValue(dirents);
   }
 
   public static DirectoryListingStateValue create(RootedPath dirRootedPath) throws IOException {
     Collection<Dirent> dirents = dirRootedPath.asPath().readdir(Symlinks.NOFOLLOW);
-    return new DirectoryListingStateValue(dirents);
+    return create(dirents);
   }
 
   @ThreadSafe
@@ -169,7 +167,8 @@ public final class DirectoryListingStateValue implements SkyValue {
       };
     }
 
-    private int size() {
+    @Override
+    public int size() {
       return names.length;
     }
 
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/Dirents.java b/src/main/java/com/google/devtools/build/lib/skyframe/Dirents.java
index 7d8b1f5267..feb7c11982 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/Dirents.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/Dirents.java
@@ -21,7 +21,10 @@ import javax.annotation.Nullable;
  * Interface for both iterating over the entries in a directory and getting the entry, if any, for a
  * given basename.
  */
-interface Dirents extends Iterable<Dirent> {
+public interface Dirents extends Iterable<Dirent> {
+
+  int size();
+
   @Nullable
   Dirent maybeGetDirent(String baseName);
 }