Adjust visibility and type declarations for ContainingPackageLookupValue$Key and GlobValue#key.
PiperOrigin-RevId: 217709920
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java
index c9a341e..f9cfb82 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupValue.java
@@ -23,6 +23,7 @@
import com.google.devtools.build.lib.vfs.Root;
import com.google.devtools.build.skyframe.AbstractSkyKey;
import com.google.devtools.build.skyframe.SkyFunctionName;
+import com.google.devtools.build.skyframe.SkyKey;
import com.google.devtools.build.skyframe.SkyValue;
/**
@@ -83,9 +84,9 @@
return message;
}
- @AutoCodec.VisibleForSerialization
+ /** {@link SkyKey} for {@code ContainingPackageLookupValue}. */
@AutoCodec
- static class Key extends AbstractSkyKey<PackageIdentifier> {
+ public static class Key extends AbstractSkyKey<PackageIdentifier> {
private static final Interner<Key> interner = BlazeInterners.newWeakInterner();
private Key(PackageIdentifier arg) {
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
