diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe')
16 files changed, 16 insertions, 68 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java index 0536e8200a..dd60938de0 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.actions.ActionLookupValue; import com.google.devtools.build.lib.actions.Actions.GeneratingActions; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -38,8 +37,6 @@ public final class ActionTemplateExpansionValue extends ActionLookupValue { @AutoCodec static final class ActionTemplateExpansionKey extends ActionLookupKey { - static final ObjectCodec<ActionTemplateExpansionKey> CODEC = - new ActionTemplateExpansionValue_ActionTemplateExpansionKey_AutoCodec(); private static final Interner<ActionTemplateExpansionKey> interner = BlazeInterners.newWeakInterner(); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java index 96b8d1666f..20d9e97bb5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactSkyKey.java @@ -21,7 +21,6 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; @@ -56,7 +55,6 @@ import java.util.Collection; @AutoCodec public class ArtifactSkyKey implements SkyKey { private static final Interner<ArtifactSkyKey> INTERNER = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<ArtifactSkyKey> CODEC = new ArtifactSkyKey_AutoCodec(); private static final Function<Artifact, SkyKey> TO_MANDATORY_KEY = artifact -> key(artifact, true); private static final Function<ArtifactSkyKey, Artifact> TO_ARTIFACT = ArtifactSkyKey::getArtifact; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java index 73ce2489c1..08c8c06895 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValue.java @@ -34,7 +34,6 @@ import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.skyframe.BuildConfigurationValue.Key; import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey.KeyAndHost; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.syntax.SkylarkImport; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -55,7 +54,6 @@ public final class AspectValue extends ActionLookupValue { /** A base class for a key representing an aspect applied to a particular target. */ @AutoCodec public static class AspectKey extends AspectValueKey { - public static final ObjectCodec<AspectKey> CODEC = new AspectValue_AspectKey_AutoCodec(); private final Label label; private final ImmutableList<AspectKey> baseKeys; private final BuildConfigurationValue.Key aspectConfigurationKey; @@ -274,8 +272,6 @@ public final class AspectValue extends ActionLookupValue { /** An {@link AspectKey} for an aspect in the host configuration. */ static class HostAspectKey extends AspectKey { - static final ObjectCodec<AspectKey> CODEC = AspectKey.CODEC; - private HostAspectKey( Label label, Key aspectConfigurationKey, diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationValue.java index b2e7ee3286..b445cc0a2b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildConfigurationValue.java @@ -44,9 +44,6 @@ import java.util.Set; @AutoCodec @ThreadSafe public class BuildConfigurationValue implements SkyValue { - public static final ObjectCodec<BuildConfigurationValue> CODEC = - new BuildConfigurationValue_AutoCodec(); - private static final Interner<Key> keyInterner = BlazeInterners.newWeakInterner(); private final BuildConfiguration configuration; @@ -81,8 +78,6 @@ public class BuildConfigurationValue implements SkyValue { /** {@link SkyKey} for {@link BuildConfigurationValue}. */ @VisibleForSerialization public static final class Key implements SkyKey, Serializable { - public static final ObjectCodec<Key> CODEC = new Codec(); - private final FragmentClassSet fragments; private final BuildOptions buildOptions; // If hashCode really is -1, we'll recompute it from scratch each time. Oh well. @@ -136,7 +131,7 @@ public class BuildConfigurationValue implements SkyValue { @Override public void serialize(SerializationContext context, Key obj, CodedOutputStream codedOut) throws SerializationException, IOException { - BuildOptions.CODEC.serialize(context, obj.buildOptions, codedOut); + context.serialize(obj.buildOptions, codedOut); codedOut.writeInt32NoTag(obj.fragments.fragmentClasses().size()); for (Class<? extends BuildConfiguration.Fragment> fragment : obj.fragments.fragmentClasses()) { @@ -148,7 +143,7 @@ public class BuildConfigurationValue implements SkyValue { @SuppressWarnings("unchecked") // Class<? extends...> cast public Key deserialize(DeserializationContext context, CodedInputStream codedIn) throws SerializationException, IOException { - BuildOptions buildOptions = BuildOptions.CODEC.deserialize(context, codedIn); + BuildOptions buildOptions = context.deserialize(codedIn); int fragmentsSize = codedIn.readInt32(); ImmutableSortedSet.Builder<Class<? extends BuildConfiguration.Fragment>> fragmentsBuilder = ImmutableSortedSet.orderedBy(BuildConfiguration.lexicalFragmentSorter); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java index 7d3fe847eb..485a6a7dcc 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildInfoCollectionValue.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.buildinfo.BuildInfoFactory; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import java.util.Objects; @@ -61,8 +60,6 @@ public class BuildInfoCollectionValue extends ActionLookupValue { public static class BuildInfoKeyAndConfig extends ActionLookupKey { private static final Interner<BuildInfoKeyAndConfig> keyInterner = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<BuildInfoKeyAndConfig> CODEC = - new BuildInfoCollectionValue_BuildInfoKeyAndConfig_AutoCodec(); private final BuildInfoFactory.BuildInfoKey infoKey; private final BuildConfigurationValue.Key configKey; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java index 19d5ba3152..94c73f9f67 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentValue.java @@ -44,9 +44,6 @@ import javax.annotation.Nullable; @ThreadSafe @AutoCodec public class ConfigurationFragmentValue implements SkyValue { - public static final ObjectCodec<ConfigurationFragmentValue> CODEC = - new ConfigurationFragmentValue_AutoCodec(); - @Nullable private final BuildConfiguration.Fragment fragment; @@ -75,8 +72,6 @@ public class ConfigurationFragmentValue implements SkyValue { public static final class ConfigurationFragmentKey implements SkyKey { private static Interner<ConfigurationFragmentKey> interner = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<ConfigurationFragmentKey> CODEC = new Codec(); - private final BuildOptions buildOptions; private final String checksum; private final Class<? extends Fragment> fragmentType; @@ -140,7 +135,7 @@ public class ConfigurationFragmentValue implements SkyValue { public void serialize( SerializationContext context, ConfigurationFragmentKey obj, CodedOutputStream codedOut) throws SerializationException, IOException { - BuildOptions.CODEC.serialize(context, obj.buildOptions, codedOut); + context.serialize(obj.buildOptions, codedOut); StringCodecs.asciiOptimized().serialize(context, obj.fragmentType.getName(), codedOut); } @@ -152,7 +147,7 @@ public class ConfigurationFragmentValue implements SkyValue { try { return of( - BuildOptions.CODEC.deserialize(context, codedIn), + context.deserialize(codedIn), (Class<? extends Fragment>) Class.forName(StringCodecs.asciiOptimized().deserialize(context, codedIn))); } catch (ClassNotFoundException e) { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java index ab1655f353..f9489794cc 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import java.util.Objects; @@ -34,8 +33,6 @@ import javax.annotation.Nullable; */ @AutoCodec public class ConfiguredTargetKey extends ActionLookupKey { - public static final ObjectCodec<ConfiguredTargetKey> CODEC = new ConfiguredTargetKey_AutoCodec(); - private final Label label; @Nullable private final BuildConfigurationValue.Key configurationKey; @@ -172,8 +169,6 @@ public class ConfiguredTargetKey extends ActionLookupKey { } static class HostConfiguredTargetKey extends ConfiguredTargetKey { - public static final ObjectCodec<ConfiguredTargetKey> CODEC = ConfiguredTargetKey.CODEC; - private HostConfiguredTargetKey( Label label, @Nullable BuildConfigurationValue.Key configurationKey) { super(label, configurationKey); diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/GlobDescriptor.java b/src/main/java/com/google/devtools/build/lib/skyframe/GlobDescriptor.java index 4b20998b0e..f64d451c9e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/GlobDescriptor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/GlobDescriptor.java @@ -18,7 +18,6 @@ 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.concurrent.ThreadSafety.ThreadSafe; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.util.StringCanonicalizer; import com.google.devtools.build.lib.vfs.PathFragment; @@ -39,8 +38,6 @@ public final class GlobDescriptor implements SkyKey { private static final Interner<GlobDescriptor> interner = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<GlobDescriptor> CODEC = new GlobDescriptor_AutoCodec(); - /** * Returns interned instance based on the parameters. * diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageValue.java index 96304a1080..0314de623d 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageValue.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException; import com.google.devtools.build.lib.packages.Package; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.NotComparableSkyValue; @@ -32,8 +31,6 @@ import java.util.List; @Immutable @ThreadSafe public class PackageValue implements NotComparableSkyValue { - public static final ObjectCodec<PackageValue> CODEC = new PackageValue_AutoCodec(); - private final Package pkg; public PackageValue(Package pkg) { 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 ef2e04b24e..0dcbe302e5 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 @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.pkgcache.FilteringPolicies; import com.google.devtools.build.lib.pkgcache.FilteringPolicy; import com.google.devtools.build.lib.skyframe.RecursivePkgValue.RecursivePkgKey; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; @@ -75,9 +74,6 @@ public final class PrepareDepsOfTargetsUnderDirectoryValue implements SkyValue { */ @AutoCodec public static final class PrepareDepsOfTargetsUnderDirectoryKey implements Serializable { - public static final ObjectCodec<PrepareDepsOfTargetsUnderDirectoryKey> CODEC = - new PrepareDepsOfTargetsUnderDirectoryValue_PrepareDepsOfTargetsUnderDirectoryKey_AutoCodec(); - private final RecursivePkgKey recursivePkgKey; private final FilteringPolicy 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 59b1201831..d71cfcbba9 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 @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; @@ -38,6 +37,7 @@ import java.util.Objects; @Immutable @ThreadSafe public class RecursivePkgValue implements SkyValue { + @AutoCodec static final RecursivePkgValue EMPTY = new RecursivePkgValue(NestedSetBuilder.<String>emptySet(Order.STABLE_ORDER)); @@ -80,9 +80,6 @@ public class RecursivePkgValue implements SkyValue { @AutoCodec @ThreadSafe public static final class RecursivePkgKey implements Serializable { - public static final ObjectCodec<RecursivePkgKey> CODEC = - new RecursivePkgValue_RecursivePkgKey_AutoCodec(); - private final RepositoryName repositoryName; private final RootedPath rootedPath; private final ImmutableSet<PathFragment> excludedPaths; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsValue.java index 538a99059a..1f6023d5dd 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsValue.java @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Interner; import com.google.devtools.build.lib.analysis.platform.DeclaredToolchainInfo; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; @@ -39,11 +38,8 @@ public abstract class RegisteredToolchainsValue implements SkyValue { /** A {@link SkyKey} for {@code RegisteredToolchainsValue}. */ @AutoCodec - @AutoCodec.VisibleForSerialization - // TODO(shahan): Reduce visibility and remove CODEC field once unneeded. - public static class Key implements SkyKey { + static class Key implements SkyKey { private static final Interner<Key> interners = BlazeInterners.newWeakInterner(); - public static final ObjectCodec<Key> CODEC = new RegisteredToolchainsValue_Key_AutoCodec(); private final BuildConfigurationValue.Key configurationKey; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletionValue.java index 9765dd112b..a62196bc1b 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetCompletionValue.java @@ -18,7 +18,6 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.TopLevelArtifactContext; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; @@ -65,13 +64,9 @@ public class TargetCompletionValue implements SkyValue { /** {@link SkyKey} for {@link TargetCompletionValue}. */ @AutoCodec @AutoValue - @AutoCodec.VisibleForSerialization - public abstract static class TargetCompletionKey implements SkyKey { - public static final ObjectCodec<TargetCompletionKey> CODEC = - new TargetCompletionValue_TargetCompletionKey_AutoCodec(); - + abstract static class TargetCompletionKey implements SkyKey { @AutoCodec.Instantiator - public static TargetCompletionKey create( + static TargetCompletionKey create( ConfiguredTargetKey configuredTargetKey, TopLevelArtifactContext topLevelArtifactContext, boolean willTest) { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java index cc7e84db78..6e24906e52 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseValue.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.pkgcache.LoadingResult; import com.google.devtools.build.lib.pkgcache.TestFilter; import com.google.devtools.build.lib.skyframe.serialization.NotSerializableRuntimeException; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -158,9 +157,6 @@ public final class TargetPatternPhaseValue implements SkyValue { @VisibleForSerialization @AutoCodec public static final class TargetPatternPhaseKey implements SkyKey, Serializable { - public static final ObjectCodec<TargetPatternPhaseKey> CODEC = - new TargetPatternPhaseValue_TargetPatternPhaseKey_AutoCodec(); - private final ImmutableList<String> targetPatterns; private final String offset; private final boolean compileOneDependency; diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java index a4a41cb1ea..d32af1a9b0 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestSuiteExpansionValue.java @@ -23,7 +23,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.skyframe.serialization.NotSerializableRuntimeException; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.skyframe.SkyFunctionName; import com.google.devtools.build.skyframe.SkyKey; @@ -79,9 +78,6 @@ public final class TestSuiteExpansionValue implements SkyValue { @AutoCodec @ThreadSafe static final class TestSuiteExpansionKey implements SkyKey { - public static final ObjectCodec<TestSuiteExpansionKey> CODEC = - new TestSuiteExpansionValue_TestSuiteExpansionKey_AutoCodec(); - private final ImmutableSortedSet<Label> targets; public TestSuiteExpansionKey(ImmutableSortedSet<Label> targets) { diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java index ee45a822c1..d165c6cb6e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/SerializationTester.java @@ -62,8 +62,12 @@ public class SerializationTester { private int repetitions = 1; public SerializationTester(Object... subjects) { - Preconditions.checkArgument(subjects.length > 0); - this.subjects = ImmutableList.copyOf(subjects); + this(ImmutableList.copyOf(subjects)); + } + + public SerializationTester(ImmutableList<Object> subjects) { + Preconditions.checkArgument(!subjects.isEmpty()); + this.subjects = subjects; this.dependenciesBuilder = ImmutableMap.builder(); } @@ -73,7 +77,8 @@ public class SerializationTester { } @SuppressWarnings("rawtypes") - public SerializationTester setVerificationFunction(VerificationFunction verificationFunction) { + public <T> SerializationTester setVerificationFunction( + VerificationFunction<T> verificationFunction) { this.verificationFunction = verificationFunction; return this; } |