From 20f35b448b5d9d04ba366d74d6bf4c7100d91b63 Mon Sep 17 00:00:00 2001 From: shahan Date: Wed, 28 Feb 2018 15:57:33 -0800 Subject: Deletes CODEC fields now that they are no longer needed. PiperOrigin-RevId: 187397314 --- .../build/lib/actions/ActionLookupData.java | 2 - .../devtools/build/lib/actions/ActionOwner.java | 3 - .../devtools/build/lib/actions/Artifact.java | 10 --- .../devtools/build/lib/actions/ArtifactRoot.java | 4 -- .../devtools/build/lib/actions/CommandLine.java | 13 ---- .../build/lib/actions/MiddlemanAction.java | 3 - .../build/lib/analysis/BlazeDirectories.java | 3 - .../lib/analysis/ExtraActionArtifactsProvider.java | 4 -- .../devtools/build/lib/analysis/FileProvider.java | 3 - .../build/lib/analysis/FilesToRunProvider.java | 3 - .../lib/analysis/LanguageDependentFragment.java | 7 -- .../build/lib/analysis/LicensesProvider.java | 4 -- .../build/lib/analysis/LicensesProviderImpl.java | 4 -- .../build/lib/analysis/MiddlemanProvider.java | 3 - .../build/lib/analysis/OutputGroupInfo.java | 3 - .../build/lib/analysis/PlatformConfiguration.java | 4 -- .../build/lib/analysis/PlatformOptions.java | 3 - .../devtools/build/lib/analysis/Runfiles.java | 15 ++-- .../build/lib/analysis/RunfilesProvider.java | 3 - .../build/lib/analysis/RunfilesSupport.java | 3 - .../build/lib/analysis/ServerDirectories.java | 3 - .../build/lib/analysis/TemplateVariableInfo.java | 4 -- .../lib/analysis/TopLevelArtifactContext.java | 4 -- .../build/lib/analysis/VisibilityProviderImpl.java | 3 - .../lib/analysis/buildinfo/BuildInfoFactory.java | 3 - .../lib/analysis/config/BuildConfiguration.java | 12 ++-- .../build/lib/analysis/config/BuildOptions.java | 2 - .../analysis/config/ConfigMatchingProvider.java | 4 -- .../build/lib/analysis/config/PerLabelOptions.java | 3 - .../lib/analysis/config/RunUnderConverter.java | 7 -- .../analysis/platform/ConstraintSettingInfo.java | 4 -- .../lib/analysis/platform/ConstraintValueInfo.java | 3 - .../analysis/platform/DeclaredToolchainInfo.java | 4 -- .../build/lib/analysis/platform/PlatformInfo.java | 3 - .../test/InstrumentedFilesProviderImpl.java | 4 -- .../build/lib/analysis/test/TestConfiguration.java | 6 -- .../build/lib/bazel/rules/BazelConfiguration.java | 5 -- .../lib/bazel/rules/cpp/BazelCppSemantics.java | 8 +-- .../lib/bazel/rules/java/BazelJavaSemantics.java | 8 +-- .../rules/python/BazelPythonConfiguration.java | 7 -- .../google/devtools/build/lib/cmdline/Label.java | 13 ++-- .../devtools/build/lib/cmdline/LabelCodec.java | 53 -------------- .../build/lib/cmdline/PackageIdentifier.java | 7 +- .../build/lib/cmdline/PackageIdentifierCodec.java | 51 -------------- .../build/lib/packages/AspectDescriptor.java | 3 - .../build/lib/packages/AspectParameters.java | 3 - .../devtools/build/lib/packages/License.java | 3 - .../devtools/build/lib/packages/Package.java | 5 +- .../build/lib/packages/PackageSpecification.java | 16 ----- .../build/lib/packages/SkylarkAspectClass.java | 3 - .../devtools/build/lib/pkgcache/TestFilter.java | 3 - .../lib/rules/android/AndroidConfiguration.java | 6 -- .../android/AndroidLocalTestConfiguration.java | 7 -- .../lib/rules/android/ResourceFilterFactory.java | 4 -- .../lib/rules/apple/AppleCommandLineOptions.java | 7 +- .../build/lib/rules/apple/AppleConfiguration.java | 7 -- .../build/lib/rules/apple/ApplePlatform.java | 3 - .../rules/apple/swift/SwiftCommandLineOptions.java | 4 -- .../lib/rules/apple/swift/SwiftConfiguration.java | 3 - .../config/ConfigFeatureFlagConfiguration.java | 7 -- .../devtools/build/lib/rules/cpp/CcCommon.java | 3 - .../build/lib/rules/cpp/CcCompilationInfo.java | 12 ---- .../cpp/CcExecutionDynamicLibrariesProvider.java | 4 -- .../devtools/build/lib/rules/cpp/CcLinkParams.java | 5 -- .../build/lib/rules/cpp/CcLinkParamsInfo.java | 6 -- .../lib/rules/cpp/CcNativeLibraryProvider.java | 4 -- .../build/lib/rules/cpp/CcToolchainFeatures.java | 81 ++-------------------- .../build/lib/rules/cpp/CompileCommandLine.java | 3 - .../build/lib/rules/cpp/CppCompileAction.java | 5 -- .../build/lib/rules/cpp/CppConfiguration.java | 3 - .../build/lib/rules/cpp/CppDebugFileProvider.java | 4 -- .../lib/rules/cpp/CppDebugPackageProvider.java | 4 -- .../devtools/build/lib/rules/cpp/CppHelper.java | 4 -- .../devtools/build/lib/rules/cpp/CppModuleMap.java | 3 - .../devtools/build/lib/rules/cpp/CppOptions.java | 3 - .../build/lib/rules/cpp/CppRunfilesProvider.java | 2 - .../build/lib/rules/cpp/CppToolchainInfo.java | 3 - .../rules/cpp/CrosstoolConfigurationLoader.java | 4 -- .../lib/rules/cpp/ExtraLinkTimeLibraries.java | 4 -- .../build/lib/rules/cpp/FdoSupportProvider.java | 3 - .../build/lib/rules/cpp/FdoSupportValue.java | 2 - .../devtools/build/lib/rules/cpp/FlagList.java | 5 -- .../devtools/build/lib/rules/cpp/LinkerInputs.java | 10 --- .../build/lib/rules/cpp/LipoContextProvider.java | 3 - .../build/lib/rules/cpp/LtoBackendArtifacts.java | 3 - .../lib/rules/cpp/TransitiveLipoInfoProvider.java | 4 -- .../lib/rules/filegroup/FilegroupPathProvider.java | 4 -- .../build/lib/rules/java/JavaConfiguration.java | 3 - .../devtools/build/lib/rules/java/JavaOptions.java | 3 - .../build/lib/rules/java/JavaRuntimeInfo.java | 3 - .../lib/rules/java/JavaRuntimeToolchainInfo.java | 3 - .../build/lib/rules/objc/HeaderThinning.java | 3 - .../lib/rules/objc/J2ObjcCommandLineOptions.java | 4 -- .../build/lib/rules/objc/J2ObjcConfiguration.java | 3 - .../lib/rules/objc/ObjcCommandLineOptions.java | 4 -- .../build/lib/rules/objc/ObjcConfiguration.java | 3 - .../build/lib/rules/proto/ProtoConfiguration.java | 5 -- .../lib/rules/python/PythonConfiguration.java | 3 - .../build/lib/rules/python/PythonOptions.java | 3 - .../build/lib/rules/python/PythonUtils.java | 4 -- .../lib/skyframe/ActionTemplateExpansionValue.java | 3 - .../build/lib/skyframe/ArtifactSkyKey.java | 2 - .../devtools/build/lib/skyframe/AspectValue.java | 4 -- .../lib/skyframe/BuildConfigurationValue.java | 9 +-- .../lib/skyframe/BuildInfoCollectionValue.java | 3 - .../lib/skyframe/ConfigurationFragmentValue.java | 9 +-- .../build/lib/skyframe/ConfiguredTargetKey.java | 5 -- .../build/lib/skyframe/GlobDescriptor.java | 3 - .../devtools/build/lib/skyframe/PackageValue.java | 3 - .../PrepareDepsOfTargetsUnderDirectoryValue.java | 4 -- .../build/lib/skyframe/RecursivePkgValue.java | 5 +- .../lib/skyframe/RegisteredToolchainsValue.java | 6 +- .../build/lib/skyframe/TargetCompletionValue.java | 9 +-- .../lib/skyframe/TargetPatternPhaseValue.java | 4 -- .../lib/skyframe/TestSuiteExpansionValue.java | 4 -- .../testutils/SerializationTester.java | 11 ++- .../google/devtools/build/lib/syntax/Lexer.java | 3 - .../devtools/build/lib/syntax/LineNumberTable.java | 3 - .../devtools/build/lib/syntax/SkylarkImports.java | 13 ---- .../devtools/build/lib/util/RegexFilter.java | 3 - .../com/google/devtools/build/lib/vfs/Path.java | 2 - .../devtools/build/lib/vfs/PathFragment.java | 2 - .../com/google/devtools/build/lib/vfs/Root.java | 2 - .../google/devtools/build/lib/vfs/RootedPath.java | 4 -- .../devtools/build/lib/actions/ArtifactTest.java | 7 +- .../build/lib/actions/util/LabelArtifactOwner.java | 4 -- .../build/lib/analysis/BlazeDirectoriesTest.java | 7 +- .../build/lib/analysis/LateBoundSplitUtil.java | 6 -- .../build/lib/analysis/TestConfigFragments.java | 7 -- .../analysis/config/BuildConfigurationTest.java | 9 ++- .../build/lib/exec/MiddlemanActionTest.java | 22 +++--- .../apple/AppleConfigurationSerializationTest.java | 29 ++++---- .../build/lib/rules/config/ConfigSettingTest.java | 12 ---- .../lib/rules/cpp/CcToolchainFeaturesTest.java | 7 +- .../build/lib/rules/cpp/MockCppSemantics.java | 8 +-- .../build/lib/skyframe/GlobDescriptorTest.java | 13 ++-- .../build/lib/skyframe/TreeArtifactBuildTest.java | 7 +- .../lib/skyframe/serialization/LabelCodecTest.java | 14 ++-- .../serialization/PackageIdentifierCodecTest.java | 15 ++-- .../build/lib/syntax/LineNumberTableTest.java | 7 +- .../devtools/build/lib/util/RegexFilterTest.java | 7 +- .../devtools/build/lib/vfs/PathFragmentTest.java | 7 +- .../google/devtools/build/lib/vfs/RootTest.java | 8 +-- 143 files changed, 126 insertions(+), 823 deletions(-) delete mode 100644 src/main/java/com/google/devtools/build/lib/cmdline/LabelCodec.java delete mode 100644 src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifierCodec.java (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java index 9059267903..00aa65797f 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionLookupData.java @@ -18,7 +18,6 @@ import com.google.common.collect.Interner; import com.google.devtools.build.lib.actions.ActionLookupValue.ActionLookupKey; 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 com.google.devtools.build.skyframe.SkyKey; @@ -28,7 +27,6 @@ import com.google.devtools.build.skyframe.SkyKey; public class ActionLookupData implements SkyKey { private static final Interner INTERNER = BlazeInterners.newWeakInterner(); public static final SkyFunctionName NAME = SkyFunctionName.create("ACTION_EXECUTION"); - public static final ObjectCodec CODEC = new ActionLookupData_AutoCodec(); private final ActionLookupKey actionLookupKey; private final int actionIndex; diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java index caa1859d77..77c67a8121 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ActionOwner.java @@ -21,7 +21,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.packages.AspectDescriptor; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import javax.annotation.Nullable; @@ -36,8 +35,6 @@ import javax.annotation.Nullable; @AutoCodec @Immutable public abstract class ActionOwner { - public static final ObjectCodec CODEC = new ActionOwner_AutoCodec(); - /** An action owner for special cases. Usage is strongly discouraged. */ public static final ActionOwner SYSTEM_ACTION_OWNER = ActionOwner.create( diff --git a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java index 918c6b998c..f0eca50638 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/Artifact.java +++ b/src/main/java/com/google/devtools/build/lib/actions/Artifact.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.actions.ActionAnalysisMetadata.MiddlemanTyp import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.shell.ShellUtils; -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; @@ -118,8 +117,6 @@ public class Artifact Comparable, CommandLineItem { - public static final ObjectCodec CODEC = new Artifact_AutoCodec(); - /** Compares artifact according to their exec paths. Sorts null values first. */ @SuppressWarnings("ReferenceEquality") // "a == b" is an optimization public static final Comparator EXEC_PATH_COMPARATOR = @@ -448,10 +445,6 @@ public class Artifact @VisibleForTesting @AutoCodec public static final class SpecialArtifact extends Artifact { - - public static final ObjectCodec CODEC = - new Artifact_SpecialArtifact_AutoCodec(); - private final SpecialArtifactType type; @VisibleForSerialization @@ -509,9 +502,6 @@ public class Artifact @Immutable @AutoCodec public static final class TreeFileArtifact extends Artifact { - public static final ObjectCodec CODEC = - new Artifact_TreeFileArtifact_AutoCodec(); - private final SpecialArtifact parentTreeArtifact; private final PathFragment parentRelativePath; diff --git a/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java b/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java index 0e32c867f9..a3abeb5131 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ArtifactRoot.java @@ -17,7 +17,6 @@ package com.google.devtools.build.lib.actions; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.cmdline.RepositoryName; 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; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -57,9 +56,6 @@ import java.util.Objects; @Immutable @AutoCodec public final class ArtifactRoot implements Comparable, Serializable, SkylarkValue { - - public static final ObjectCodec CODEC = new ArtifactRoot_AutoCodec(); - // This must always be consistent with Package.getSourceRoot; otherwise computing source roots // from exec paths does not work, which can break the action cache for input-discovering actions. public static ArtifactRoot computeSourceRoot(Root packageRoot, RepositoryName repository) { diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java index 558644be51..114e7b0bb0 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java +++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java @@ -19,7 +19,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander; import com.google.devtools.build.lib.collect.CollectionUtils; -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.util.Fingerprint; @@ -29,9 +28,6 @@ public abstract class CommandLine { @AutoCodec @VisibleForSerialization static class EmptyCommandLine extends CommandLine { - public static final ObjectCodec CODEC = - new CommandLine_EmptyCommandLine_AutoCodec(); - @Override public Iterable arguments() throws CommandLineExpansionException { return ImmutableList.of(); @@ -66,9 +62,6 @@ public abstract class CommandLine { @AutoCodec @VisibleForSerialization static class SimpleCommandLine extends CommandLine { - public static final ObjectCodec CODEC = - new CommandLine_SimpleCommandLine_AutoCodec(); - private Iterable args; SimpleCommandLine(Iterable args) { @@ -90,9 +83,6 @@ public abstract class CommandLine { @AutoCodec @VisibleForSerialization static class PrefixedCommandLine extends CommandLine { - public static final ObjectCodec CODEC = - new CommandLine_PrefixedCommandLine_AutoCodec(); - private ImmutableList executableArgs; private CommandLine commandLine; @@ -129,9 +119,6 @@ public abstract class CommandLine { @AutoCodec @VisibleForSerialization static class SuffixedCommandLine extends CommandLine { - public static final ObjectCodec CODEC = - new CommandLine_SuffixedCommandLine_AutoCodec(); - private ImmutableList executableArgs; private CommandLine commandLine; diff --git a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java index 70a659948e..15c500766c 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java +++ b/src/main/java/com/google/devtools/build/lib/actions/MiddlemanAction.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; 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 com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.util.Fingerprint; @@ -31,8 +30,6 @@ import com.google.devtools.build.lib.util.Fingerprint; @Immutable @AutoCodec public final class MiddlemanAction extends AbstractAction { - public static final ObjectCodec CODEC = new MiddlemanAction_AutoCodec(); - public static final String MIDDLEMAN_MNEMONIC = "Middleman"; private final String description; private final MiddlemanType middlemanType; 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 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 CODEC = - new ExtraActionArtifactsProvider_AutoCodec(); - public static final ExtraActionArtifactsProvider EMPTY = new ExtraActionArtifactsProvider( NestedSetBuilder.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 CODEC = new FileProvider_AutoCodec(); - public static final FileProvider EMPTY = new FileProvider(NestedSetBuilder.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 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 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 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 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 CODEC = - new LicensesProviderImpl_AutoCodec(); - public static final LicensesProvider EMPTY = new LicensesProviderImpl(NestedSetBuilder.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 CODEC = new MiddlemanProvider_AutoCodec(); - private final NestedSet 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 { - public static ObjectCodec CODEC = new OutputGroupInfo_AutoCodec(); - public static final String SKYLARK_NAME = "output_groups"; public static NativeProvider 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 CODEC = - new PlatformConfiguration_AutoCodec(); - private final Label hostPlatform; private final ImmutableList