Minor visibility tweaks

--
MOS_MIGRATED_REVID=103140718

3 files changed, 23 insertions, 20 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
index 3f486a4ce5..a509830c7a 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/FilteringPolicies.java
@@ -25,6 +25,16 @@ import java.util.Objects;
  */
 public final class FilteringPolicies {
 
+  public static final FilteringPolicy NO_FILTER = new NoFilter();
+  public static final FilteringPolicy FILTER_MANUAL = new FilterManual();
+  public static final FilteringPolicy FILTER_TESTS = new FilterTests();
+  public static final FilteringPolicy RULES_ONLY = new RulesOnly();
+
+  /** Returns the result of applying y, if target passes x. */
+  public static FilteringPolicy and(final FilteringPolicy x, final FilteringPolicy y) {
+    return new AndFilteringPolicy(x, y);
+  }
+
   private FilteringPolicies() {
   }
 
@@ -56,8 +66,6 @@ public final class FilteringPolicies {
     }
   }
 
-  public static final FilteringPolicy NO_FILTER = new NoFilter();
-
   private static class FilterManual extends AbstractFilteringPolicy {
     @Override
     public boolean shouldRetain(Target target, boolean explicit) {
@@ -65,8 +73,6 @@ public final class FilteringPolicies {
     }
   }
 
-  public static final FilteringPolicy FILTER_MANUAL = new FilterManual();
-
   private static class FilterTests extends AbstractFilteringPolicy {
     @Override
     public boolean shouldRetain(Target target, boolean explicit) {
@@ -75,8 +81,6 @@ public final class FilteringPolicies {
     }
   }
 
-  public static final FilteringPolicy FILTER_TESTS = new FilterTests();
-
   private static class RulesOnly extends AbstractFilteringPolicy {
     @Override
     public boolean shouldRetain(Target target, boolean explicit) {
@@ -84,21 +88,12 @@ public final class FilteringPolicies {
     }
   }
 
-  public static final FilteringPolicy RULES_ONLY = new RulesOnly();
-
-  /**
-   * Returns the result of applying y, if target passes x.
-   */
-  public static FilteringPolicy and(final FilteringPolicy x,
-                                    final FilteringPolicy y) {
-    return new AndFilteringPolicy(x, y);
-  }
-
-  private static class AndFilteringPolicy implements FilteringPolicy {
+  /** FilteringPolicy for combining FilteringPolicies. */
+  public static class AndFilteringPolicy implements FilteringPolicy {
     private final FilteringPolicy firstPolicy;
     private final FilteringPolicy secondPolicy;
 
-    public AndFilteringPolicy(FilteringPolicy firstPolicy, FilteringPolicy secondPolicy) {
+    private AndFilteringPolicy(FilteringPolicy firstPolicy, FilteringPolicy secondPolicy) {
       this.firstPolicy = Preconditions.checkNotNull(firstPolicy);
       this.secondPolicy = Preconditions.checkNotNull(secondPolicy);
     }
@@ -109,6 +104,14 @@ public final class FilteringPolicies {
           && secondPolicy.shouldRetain(target, explicit);
     }
 
+    public FilteringPolicy getFirstPolicy() {
+      return firstPolicy;
+    }
+
+    public FilteringPolicy getSecondPolicy() {
+      return secondPolicy;
+    }
+
     @Override
     public int hashCode() {
       return Objects.hash(firstPolicy, secondPolicy);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryValue.java
index 61096fba54..7416fb73cd 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfTargetsUnderDirectoryValue.java
@@ -119,7 +119,7 @@ public final class PrepareDepsOfTargetsUnderDirectoryValue implements SkyValue {
     private final RecursivePkgKey recursivePkgKey;
     private final FilteringPolicy filteringPolicy;
 
-    private PrepareDepsOfTargetsUnderDirectoryKey(RecursivePkgKey recursivePkgKey,
+    public PrepareDepsOfTargetsUnderDirectoryKey(RecursivePkgKey recursivePkgKey,
         FilteringPolicy filteringPolicy) {
       this.recursivePkgKey = Preconditions.checkNotNull(recursivePkgKey);
       this.filteringPolicy = Preconditions.checkNotNull(filteringPolicy);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java
index fe2d2c4300..04a53677c1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursivePkgValue.java
@@ -34,7 +34,7 @@ import java.util.Objects;
  */
 @Immutable
 @ThreadSafe
-class RecursivePkgValue implements SkyValue {
+public class RecursivePkgValue implements SkyValue {
   static final RecursivePkgValue EMPTY =
       new RecursivePkgValue(NestedSetBuilder.<String>emptySet(Order.STABLE_ORDER));