diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis')
30 files changed, 8 insertions, 123 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java index 7445761c9f..02d7a2f8a1 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BlazeDirectories.java @@ -18,7 +18,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.hash.HashCode; import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -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.Path; @@ -46,8 +45,6 @@ import java.util.Objects; @AutoCodec @Immutable public final class BlazeDirectories { - public static final ObjectCodec<BlazeDirectories> CODEC = new BlazeDirectories_AutoCodec(); - // Include directory name, relative to execRoot/blaze-out/configuration. public static final String RELATIVE_INCLUDE_DIR = StringCanonicalizer.intern("include"); @VisibleForTesting static final String DEFAULT_EXEC_ROOT = "default-exec-root"; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionArtifactsProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionArtifactsProvider.java index 4c86c6a819..1dd90cff3d 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionArtifactsProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ExtraActionArtifactsProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; 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.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; @@ -27,9 +26,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec. @Immutable @AutoCodec public final class ExtraActionArtifactsProvider implements TransitiveInfoProvider { - public static final ObjectCodec<ExtraActionArtifactsProvider> CODEC = - new ExtraActionArtifactsProvider_AutoCodec(); - public static final ExtraActionArtifactsProvider EMPTY = new ExtraActionArtifactsProvider( NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java index d1e28db822..b4035c0ba7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; 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.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -38,8 +37,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory; ) @AutoCodec public final class FileProvider implements TransitiveInfoProvider { - public static final ObjectCodec<FileProvider> CODEC = new FileProvider_AutoCodec(); - public static final FileProvider EMPTY = new FileProvider(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java index 09c5c48f7d..8a72fd069f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; 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.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -33,8 +32,6 @@ import javax.annotation.Nullable; @SkylarkModule(name = "FilesToRunProvider", doc = "", category = SkylarkModuleCategory.PROVIDER) @AutoCodec public final class FilesToRunProvider implements TransitiveInfoProvider { - public static final ObjectCodec<FilesToRunProvider> CODEC = new FilesToRunProvider_AutoCodec(); - /** The name of the field in Skylark used to access this class. */ public static final String SKYLARK_NAME = "files_to_run"; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java b/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java index 56c22f1f6f..61ea948c1e 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/LanguageDependentFragment.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.Objects; @@ -36,9 +35,6 @@ import java.util.Objects; @Immutable @AutoCodec public final class LanguageDependentFragment implements TransitiveInfoProvider { - public static final ObjectCodec<LanguageDependentFragment> CODEC = new - LanguageDependentFragment_AutoCodec(); - /** * A language that can be supported by a multi-language configured target. * @@ -47,9 +43,6 @@ public final class LanguageDependentFragment implements TransitiveInfoProvider { */ @AutoCodec public static final class LibraryLanguage { - public static final ObjectCodec<LibraryLanguage> CODEC = - new LanguageDependentFragment_LibraryLanguage_AutoCodec(); - private final String displayName; @AutoCodec.Instantiator diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LicensesProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/LicensesProvider.java index 57272bda9f..d8bb39c754 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/LicensesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/LicensesProvider.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.packages.License; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.Objects; @@ -46,9 +45,6 @@ public interface LicensesProvider extends TransitiveInfoProvider { /** License association for a particular target. */ @AutoCodec final class TargetLicense { - public static final ObjectCodec<TargetLicense> CODEC = - new LicensesProvider_TargetLicense_AutoCodec(); - private final Label label; private final License license; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LicensesProviderImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/LicensesProviderImpl.java index 7229aec1c8..bab0beae80 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/LicensesProviderImpl.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/LicensesProviderImpl.java @@ -24,16 +24,12 @@ import com.google.devtools.build.lib.packages.Attribute; import com.google.devtools.build.lib.packages.AttributeMap; import com.google.devtools.build.lib.packages.License; import com.google.devtools.build.lib.packages.Rule; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** A {@link ConfiguredTarget} that has licensed targets in its transitive closure. */ @Immutable @AutoCodec public final class LicensesProviderImpl implements LicensesProvider { - public static final ObjectCodec<LicensesProviderImpl> CODEC = - new LicensesProviderImpl_AutoCodec(); - public static final LicensesProvider EMPTY = new LicensesProviderImpl(NestedSetBuilder.<TargetLicense>emptySet(Order.LINK_ORDER), null); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/MiddlemanProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/MiddlemanProvider.java index 452c26bfae..dd07880ecf 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/MiddlemanProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/MiddlemanProvider.java @@ -16,15 +16,12 @@ package com.google.devtools.build.lib.analysis; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** A provider class that supplies an aggregating middleman to the targets that depend on it. */ @Immutable @AutoCodec public final class MiddlemanProvider implements TransitiveInfoProvider { - public static final ObjectCodec<MiddlemanProvider> CODEC = new MiddlemanProvider_AutoCodec(); - private final NestedSet<Artifact> middlemanArtifact; @AutoCodec.Instantiator diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java index 9561c91229..7990d37d56 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java @@ -31,7 +31,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; -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.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; @@ -62,8 +61,6 @@ import javax.annotation.Nullable; @AutoCodec public final class OutputGroupInfo extends NativeInfo implements SkylarkIndexable, Iterable<String> { - public static ObjectCodec<OutputGroupInfo> CODEC = new OutputGroupInfo_AutoCodec(); - public static final String SKYLARK_NAME = "output_groups"; public static NativeProvider<OutputGroupInfo> SKYLARK_CONSTRUCTOR = new Constructor(); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java index fb051b542a..fefc871457 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformConfiguration.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.Label; 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.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -34,9 +33,6 @@ import java.util.List; category = SkylarkModuleCategory.CONFIGURATION_FRAGMENT ) public class PlatformConfiguration extends BuildConfiguration.Fragment { - public static final ObjectCodec<PlatformConfiguration> CODEC = - new PlatformConfiguration_AutoCodec(); - private final Label hostPlatform; private final ImmutableList<Label> extraExecutionPlatforms; private final ImmutableList<Label> targetPlatforms; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java index 51bfd8a15d..688e418fc4 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java @@ -19,7 +19,6 @@ import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.analysis.config.BuildConfiguration.LabelListConverter; import com.google.devtools.build.lib.analysis.config.FragmentOptions; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; @@ -29,8 +28,6 @@ import java.util.List; /** Command-line options for platform-related configuration. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public class PlatformOptions extends FragmentOptions { - public static final ObjectCodec<PlatformOptions> CODEC = new PlatformOptions_AutoCodec(); - @Option( name = "host_platform", oldName = "experimental_host_platform", diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java index a1f02fa415..78cb3c08ec 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java @@ -31,7 +31,6 @@ import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.events.EventKind; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.BuildType; -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.lib.skylarkinterface.SkylarkCallable; @@ -80,9 +79,8 @@ public final class Runfiles { } }; - @VisibleForSerialization - static class DummyEmptyFilesSupplier implements EmptyFilesSupplier { - @AutoCodec public static final DummyEmptyFilesSupplier INSTANCE = new DummyEmptyFilesSupplier(); + private static class DummyEmptyFilesSupplier implements EmptyFilesSupplier { + private DummyEmptyFilesSupplier() {} @Override public Iterable<PathFragment> getExtraPaths(Set<PathFragment> manifestPaths) { @@ -90,8 +88,8 @@ public final class Runfiles { } } - private static final EmptyFilesSupplier DUMMY_EMPTY_FILES_SUPPLIER = - DummyEmptyFilesSupplier.INSTANCE; + @AutoCodec @AutoCodec.VisibleForSerialization + static final EmptyFilesSupplier DUMMY_EMPTY_FILES_SUPPLIER = new DummyEmptyFilesSupplier(); private static final Function<Artifact, PathFragment> GET_ROOT_RELATIVE_PATH = new Function<Artifact, PathFragment>() { @@ -141,8 +139,6 @@ public final class Runfiles { @AutoCodec @VisibleForSerialization static final class SymlinkEntry implements SkylarkValue { - public static final ObjectCodec<SymlinkEntry> CODEC = new Runfiles_SymlinkEntry_AutoCodec(); - private final PathFragment path; private final Artifact artifact; @@ -272,9 +268,6 @@ public final class Runfiles { */ @AutoCodec public static class PruningManifest { - public static final ObjectCodec<PruningManifest> CODEC = - new Runfiles_PruningManifest_AutoCodec(); - private final NestedSet<Artifact> candidateRunfiles; private final Artifact manifestFile; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesProvider.java index 07abf15ac8..0a10859841 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesProvider.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.analysis; import com.google.common.base.Function; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -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; @@ -29,8 +28,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec. @Immutable @AutoCodec public final class RunfilesProvider implements TransitiveInfoProvider { - public static final ObjectCodec<RunfilesProvider> CODEC = new RunfilesProvider_AutoCodec(); - private final Runfiles defaultRunfiles; private final Runfiles dataRunfiles; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java index a077039f26..02a9119e66 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/RunfilesSupport.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTa import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.TargetUtils; -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.lib.syntax.Type; @@ -73,8 +72,6 @@ import javax.annotation.Nullable; @Immutable @AutoCodec public final class RunfilesSupport { - public static final ObjectCodec<RunfilesSupport> CODEC = new RunfilesSupport_AutoCodec(); - private static final String RUNFILES_DIR_EXT = ".runfiles"; private final Runfiles runfiles; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java b/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java index 9b25f7a997..5f3d650c64 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ServerDirectories.java @@ -19,7 +19,6 @@ import com.google.common.base.Strings; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -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.Path; import java.util.Objects; @@ -32,8 +31,6 @@ import javax.annotation.Nullable; @AutoCodec @Immutable public final class ServerDirectories { - public static final ObjectCodec<ServerDirectories> CODEC = new ServerDirectories_AutoCodec(); - /** Top-level user output directory; used, e.g., as default location for caches. */ private final Path outputUserRoot; /** Where Blaze gets unpacked. */ diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java index 99db61de8c..8a32b7b5af 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TemplateVariableInfo.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; -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.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @@ -28,9 +27,6 @@ import com.google.devtools.build.lib.skylarkinterface.SkylarkModule; @Immutable @AutoCodec public final class TemplateVariableInfo extends NativeInfo { - public static final ObjectCodec<TemplateVariableInfo> CODEC = - new TemplateVariableInfo_AutoCodec(); - public static final String SKYLARK_NAME = "TemplateVariableInfo"; public static final NativeProvider<TemplateVariableInfo> PROVIDER = diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactContext.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactContext.java index b67636c084..f6192f03b6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactContext.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.analysis; import com.google.common.collect.ImmutableSortedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.Objects; import java.util.Set; @@ -25,9 +24,6 @@ import java.util.Set; @Immutable @AutoCodec public final class TopLevelArtifactContext { - public static final ObjectCodec<TopLevelArtifactContext> CODEC = - new TopLevelArtifactContext_AutoCodec(); - private final boolean runTestsExclusively; private final ImmutableSortedSet<String> outputGroups; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/VisibilityProviderImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/VisibilityProviderImpl.java index 270c92b4cb..a47093b46f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/VisibilityProviderImpl.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/VisibilityProviderImpl.java @@ -17,15 +17,12 @@ package com.google.devtools.build.lib.analysis; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** Visibility provider implementation. */ @Immutable @AutoCodec public final class VisibilityProviderImpl implements VisibilityProvider { - public static ObjectCodec<VisibilityProviderImpl> CODEC = new VisibilityProviderImpl_AutoCodec(); - private final NestedSet<PackageGroupContents> visibility; public VisibilityProviderImpl(NestedSet<PackageGroupContents> visibility) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoFactory.java index 635c1b51dd..e5f0141887 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/buildinfo/BuildInfoFactory.java @@ -17,7 +17,6 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ArtifactRoot; import com.google.devtools.build.lib.analysis.config.BuildConfiguration; import com.google.devtools.build.lib.cmdline.RepositoryName; -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 java.io.Serializable; @@ -58,8 +57,6 @@ public interface BuildInfoFactory extends Serializable { */ @AutoCodec final class BuildInfoKey { - public static final ObjectCodec<BuildInfoKey> CODEC = - new BuildInfoFactory_BuildInfoKey_AutoCodec(); private final String name; public BuildInfoKey(String name) { diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index 64ba290c29..f9f3c40bc6 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -119,8 +119,6 @@ import javax.annotation.Nullable; + "depend on it and not targets that it depends on." ) public class BuildConfiguration implements BuildConfigurationInterface { - public static final ObjectCodec<BuildConfiguration> CODEC = new BuildConfigurationCodec(); - /** * Sorts fragments by class name. This produces a stable order which, e.g., facilitates consistent * output from buildMnemonic. @@ -415,8 +413,6 @@ public class BuildConfiguration implements BuildConfigurationInterface { */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public static class Options extends FragmentOptions implements Cloneable { - public static final ObjectCodec<Options> CODEC = new BuildConfiguration_Options_AutoCodec(); - @Option( name = "experimental_separate_genfiles_directory", defaultValue = "true", @@ -2112,19 +2108,19 @@ public class BuildConfiguration implements BuildConfigurationInterface { BuildConfiguration obj, CodedOutputStream codedOut) throws SerializationException, IOException { - BlazeDirectories.CODEC.serialize(context, obj.directories, codedOut); + context.serialize(obj.directories, codedOut); codedOut.writeInt32NoTag(obj.fragments.size()); for (Fragment fragment : obj.fragments.values()) { context.serialize(fragment, codedOut); } - BuildOptions.CODEC.serialize(context, obj.buildOptions, codedOut); + context.serialize(obj.buildOptions, codedOut); StringCodecs.asciiOptimized().serialize(context, obj.repositoryName, codedOut); } @Override public BuildConfiguration deserialize(DeserializationContext context, CodedInputStream codedIn) throws SerializationException, IOException { - BlazeDirectories blazeDirectories = BlazeDirectories.CODEC.deserialize(context, codedIn); + BlazeDirectories blazeDirectories = context.deserialize(codedIn); int length = codedIn.readInt32(); ImmutableSortedMap.Builder<Class<? extends Fragment>, Fragment> builder = new ImmutableSortedMap.Builder<>(lexicalFragmentSorter); @@ -2132,7 +2128,7 @@ public class BuildConfiguration implements BuildConfigurationInterface { Fragment fragment = context.deserialize(codedIn); builder.put(fragment.getClass(), fragment); } - BuildOptions options = BuildOptions.CODEC.deserialize(context, codedIn); + BuildOptions options = context.deserialize(codedIn); String repositoryName = StringCodecs.asciiOptimized().deserialize(context, codedIn); return new BuildConfiguration(blazeDirectories, builder.build(), options, repositoryName); } diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java index df99dc6aa0..7383fdfe08 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java @@ -55,8 +55,6 @@ import javax.annotation.Nullable; * Stores the command-line options from a set of configuration fragments. */ public final class BuildOptions implements Cloneable, Serializable { - public static final ObjectCodec<BuildOptions> CODEC = new BuildOptionsCodec(); - private static final Comparator<Class<? extends FragmentOptions>> lexicalFragmentOptionsComparator = Comparator.comparing(Class::getName); diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigMatchingProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigMatchingProvider.java index 832f39f605..a9b23bc458 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigMatchingProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigMatchingProvider.java @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import java.util.Map; import java.util.Set; @@ -34,9 +33,6 @@ import java.util.Set; @Immutable @AutoCodec public final class ConfigMatchingProvider implements TransitiveInfoProvider { - public static final ObjectCodec<ConfigMatchingProvider> CODEC = - new ConfigMatchingProvider_AutoCodec(); - private final Label label; private final ImmutableMultimap<String, String> settingsMap; private final Map<Label, String> flagSettingsMap; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java index 078d8ccd80..217389d807 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/PerLabelOptions.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.analysis.config; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.cmdline.Label; -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.RegexFilter; import com.google.devtools.build.lib.util.RegexFilter.RegexFilterConverter; @@ -34,8 +33,6 @@ import java.util.Objects; */ @AutoCodec public class PerLabelOptions implements Serializable { - public static final ObjectCodec<PerLabelOptions> CODEC = new PerLabelOptions_AutoCodec(); - /** The filter used to match labels */ private final RegexFilter regexFilter; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java index a09a1ce8df..51f1d84f2f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnderConverter.java @@ -18,7 +18,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.shell.ShellUtils; import com.google.devtools.build.lib.shell.ShellUtils.TokenizationException; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.common.options.Converter; import com.google.devtools.common.options.OptionsParsingException; @@ -58,9 +57,6 @@ public class RunUnderConverter implements Converter<RunUnder> { @AutoCodec static final class RunUnderLabel implements RunUnder { - public static final ObjectCodec<RunUnderLabel> CODEC = - new RunUnderConverter_RunUnderLabel_AutoCodec(); - private final String input; private final Label runUnderLabel; private final ImmutableList<String> runUnderList; @@ -119,9 +115,6 @@ public class RunUnderConverter implements Converter<RunUnder> { @AutoCodec static final class RunUnderCommand implements RunUnder { - public static final ObjectCodec<RunUnderCommand> CODEC = - new RunUnderConverter_RunUnderCommand_AutoCodec(); - private final String input; private final String runUnderCommand; private final ImmutableList<String> runUnderList; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java index c2661ad986..16fa28af09 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintSettingInfo.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; -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.lib.skylarkinterface.SkylarkCallable; @@ -39,9 +38,6 @@ import com.google.devtools.build.lib.syntax.SkylarkType; @Immutable @AutoCodec public class ConstraintSettingInfo extends NativeInfo { - public static final ObjectCodec<ConstraintSettingInfo> CODEC = - new ConstraintSettingInfo_AutoCodec(); - /** Name used in Skylark for accessing this provider. */ public static final String SKYLARK_NAME = "ConstraintSettingInfo"; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java index 3a00932a55..febe3e7e84 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ConstraintValueInfo.java @@ -20,7 +20,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; -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.lib.skylarkinterface.SkylarkCallable; @@ -39,8 +38,6 @@ import com.google.devtools.build.lib.syntax.SkylarkType; @Immutable @AutoCodec public class ConstraintValueInfo extends NativeInfo { - public static final ObjectCodec<ConstraintValueInfo> CODEC = new ConstraintValueInfo_AutoCodec(); - /** Name used in Skylark for accessing this provider. */ public static final String SKYLARK_NAME = "ConstraintValueInfo"; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java index 8d0b4d7f39..b72b8894c9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/DeclaredToolchainInfo.java @@ -18,7 +18,6 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; /** @@ -30,9 +29,6 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; @AutoValue @AutoCodec public abstract class DeclaredToolchainInfo implements TransitiveInfoProvider { - public static final ObjectCodec<DeclaredToolchainInfo> CODEC = - new DeclaredToolchainInfo_AutoCodec(); - /** * The type of the toolchain being declared. This will be a label of a toolchain_type() target. */ diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java index 90c8217a0c..c70690b7e2 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformInfo.java @@ -29,7 +29,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.NativeInfo; import com.google.devtools.build.lib.packages.NativeProvider; -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.lib.skylarkinterface.SkylarkCallable; @@ -54,8 +53,6 @@ import javax.annotation.Nullable; @Immutable @AutoCodec public class PlatformInfo extends NativeInfo { - public static final ObjectCodec<PlatformInfo> CODEC = new PlatformInfo_AutoCodec(); - /** Name used in Skylark for accessing this provider. */ public static final String SKYLARK_NAME = "PlatformInfo"; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesProviderImpl.java b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesProviderImpl.java index ab8f51ef0b..46cbc7f316 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesProviderImpl.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/InstrumentedFilesProviderImpl.java @@ -17,16 +17,12 @@ import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -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.Pair; /** An implementation class for the InstrumentedFilesProvider interface. */ @AutoCodec public final class InstrumentedFilesProviderImpl implements InstrumentedFilesProvider { - public static ObjectCodec<InstrumentedFilesProviderImpl> CODEC = - new InstrumentedFilesProviderImpl_AutoCodec(); - public static final InstrumentedFilesProvider EMPTY = new InstrumentedFilesProviderImpl( NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java index e210a1effd..1aa0706b65 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java @@ -27,7 +27,6 @@ import com.google.devtools.build.lib.analysis.config.PerLabelOptions; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; -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.RegexFilter; import com.google.devtools.common.options.Option; @@ -41,14 +40,9 @@ import java.util.List; /** Test-related options. */ @AutoCodec public class TestConfiguration extends Fragment { - public static final ObjectCodec<TestConfiguration> CODEC = new TestConfiguration_AutoCodec(); - /** Command-line options. */ @AutoCodec(strategy = AutoCodec.Strategy.PUBLIC_FIELDS) public static class TestOptions extends FragmentOptions { - public static final ObjectCodec<TestOptions> CODEC = - new TestConfiguration_TestOptions_AutoCodec(); - @Option( name = "test_filter", allowMultiple = false, |