Switch CollectTestSuitesInPackageValue.Key to be implemented using AbstractSkyKey rather than @AutoValue.
RELNOTES: None
PiperOrigin-RevId: 261794842
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageFunction.java
index dae7d91..696e260 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageFunction.java
@@ -38,9 +38,7 @@
@Override
public SkyValue compute(SkyKey skyKey, Environment env)
throws SkyFunctionException, InterruptedException {
- CollectTestSuitesInPackageValue.Key argument =
- (CollectTestSuitesInPackageValue.Key) skyKey.argument();
- PackageIdentifier packageId = argument.getPackageId();
+ PackageIdentifier packageId = (PackageIdentifier) skyKey.argument();
PackageValue packageValue = (PackageValue) env.getValue(PackageValue.key(packageId));
if (env.valuesMissing()) {
return null;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageValue.java
index a4732ed..7b6cc2c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTestSuitesInPackageValue.java
@@ -13,11 +13,11 @@
// limitations under the License.
package com.google.devtools.build.lib.skyframe;
-import com.google.auto.value.AutoValue;
import com.google.common.collect.Interner;
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
import com.google.devtools.build.lib.concurrent.BlazeInterners;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
+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;
@@ -39,19 +39,20 @@
}
/** {@link SkyKey} argument. */
- @AutoValue
@AutoCodec
- public abstract static class Key implements SkyKey {
+ public static class Key extends AbstractSkyKey<PackageIdentifier> {
private static final Interner<Key> interner = BlazeInterners.newWeakInterner();
+ private Key(PackageIdentifier arg) {
+ super(arg);
+ }
+
@AutoCodec.VisibleForSerialization
@AutoCodec.Instantiator
- static Key create(PackageIdentifier packageId) {
- return interner.intern(new AutoValue_CollectTestSuitesInPackageValue_Key(packageId));
+ static Key create(PackageIdentifier arg) {
+ return interner.intern(new Key(arg));
}
- public abstract PackageIdentifier getPackageId();
-
@Override
public SkyFunctionName functionName() {
return SkyFunctions.COLLECT_TEST_SUITES_IN_PACKAGE;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
index d35f9f7..70c6684 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareTestSuitesUnderDirectoryFunction.java
@@ -46,7 +46,7 @@
if (env.valuesMissing()) {
return null;
}
- Iterable<SkyKey> keysToRequest = packageExistenceAndSubdirDeps.getChildDeps();
+ Iterable<? extends SkyKey> keysToRequest = packageExistenceAndSubdirDeps.getChildDeps();
if (packageExistenceAndSubdirDeps.packageExists()) {
keysToRequest =
Iterables.concat(
