commit 43c642d9aed366e4299225632783a2903d7607de
author janakr <janakr@google.com> Thu Oct 18 09:05:08 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Thu Oct 18 09:07:01 2018 -0700
tree 8cdd17fb1b3b1a2e3dbb09b68568bb2e1b4430e7
parent c1832a4b929790903ac2ae23166da9c5be524771

Adjust visibility and type declarations for ContainingPackageLookupValue$Key and GlobValue#key.

PiperOrigin-RevId: 217709920

src/main/java/com/google/devtools/build/lib/skyframe/GlobValue.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobValue.java
index e268135..bcc89fc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobValue.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.Root;
 import com.google.devtools.build.lib.vfs.UnixGlob;
-import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 
 /** A value corresponding to a glob. */
@@ -75,13 +74,13 @@
   }
 
   /**
-   * Constructs a {@link SkyKey} for a glob lookup. {@code packageName} is assumed to be an existing
-   * package. Trying to glob into a non-package is undefined behavior.
+   * Constructs a {@link GlobDescriptor} for a glob lookup. {@code packageName} is assumed to be an
+   * existing package. Trying to glob into a non-package is undefined behavior.
    *
    * @throws InvalidGlobPatternException if the pattern is not valid.
    */
   @ThreadSafe
-  public static SkyKey key(
+  public static GlobDescriptor key(
       PackageIdentifier packageId,
       Root packageRoot,
       String pattern,
@@ -101,12 +100,12 @@
   }
 
   /**
-   * Constructs a {@link SkyKey} for a glob lookup.
+   * Constructs a {@link GlobDescriptor} for a glob lookup.
    *
    * <p>Do not use outside {@code GlobFunction}.
    */
   @ThreadSafe
-  static SkyKey internalKey(
+  static GlobDescriptor internalKey(
       PackageIdentifier packageId,
       Root packageRoot,
       PathFragment subdir,
@@ -116,21 +115,6 @@
   }
 
   /**
-   * Constructs a {@link SkyKey} for a glob lookup.
-   *
-   * <p>Do not use outside {@code GlobFunction}.
-   */
-  @ThreadSafe
-  static SkyKey internalKey(GlobDescriptor glob, String subdirName) {
-    return internalKey(
-        glob.getPackageId(),
-        glob.getPackageRoot(),
-        glob.getSubdir().getRelative(subdirName),
-        glob.getPattern(),
-        glob.excludeDirs());
-  }
-
-  /**
    * An exception that indicates that a glob pattern is syntactically invalid.
    */
   @ThreadSafe