Deletes CODEC fields now that they are no longer needed.
PiperOrigin-RevId: 187397314
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java b/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java
index 3d4058d..0c2a9df 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectDescriptor.java
@@ -16,7 +16,6 @@
import com.google.common.collect.ImmutableMultimap;
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.protobuf.TextFormat;
import java.util.Map.Entry;
@@ -30,8 +29,6 @@
@Immutable
@AutoCodec
public final class AspectDescriptor {
- public static final ObjectCodec<AspectDescriptor> CODEC = new AspectDescriptor_AutoCodec();
-
private final AspectClass aspectClass;
private final AspectParameters aspectParameters;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AspectParameters.java b/src/main/java/com/google/devtools/build/lib/packages/AspectParameters.java
index fe4dcd1..8a6e872 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AspectParameters.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AspectParameters.java
@@ -18,7 +18,6 @@
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
import java.util.Objects;
@@ -28,8 +27,6 @@
*/
@AutoCodec
public final class AspectParameters {
- public static final ObjectCodec<AspectParameters> CODEC = new AspectParameters_AutoCodec();
-
private final ImmutableMultimap<String, String> attributes;
private AspectParameters(Multimap<String, String> attributes) {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/License.java b/src/main/java/com/google/devtools/build/lib/packages/License.java
index de63c5e..3a35baa 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/License.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/License.java
@@ -27,7 +27,6 @@
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.EventHandler;
import com.google.devtools.build.lib.events.Location;
-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 java.util.Collection;
@@ -41,8 +40,6 @@
@ThreadSafe
@AutoCodec
public final class License {
- public static final ObjectCodec<License> CODEC = new License_AutoCodec();
-
private final ImmutableSet<LicenseType> licenseTypes;
private final ImmutableSet<Label> exceptions;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java
index 7a8b121..9db519e 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Package.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -71,8 +71,6 @@
*/
@SuppressWarnings("JavaLangClash")
public class Package {
- public static final ObjectCodec<Package> CODEC = new PackageCodec();
-
/**
* Common superclass for all name-conflict exceptions.
*/
@@ -1581,7 +1579,8 @@
}
/** Package codec implementation. */
- private static final class PackageCodec implements ObjectCodec<Package> {
+ @VisibleForTesting
+ static final class PackageCodec implements ObjectCodec<Package> {
@Override
public Class<Package> getEncodedClass() {
return Package.class;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageSpecification.java b/src/main/java/com/google/devtools/build/lib/packages/PackageSpecification.java
index f01efeb..ec71a36 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageSpecification.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageSpecification.java
@@ -20,7 +20,6 @@
import com.google.devtools.build.lib.cmdline.PackageIdentifier;
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.vfs.PathFragment;
@@ -165,9 +164,6 @@
@AutoCodec
@VisibleForSerialization
static class SinglePackage extends PackageSpecification {
- public static final ObjectCodec<SinglePackage> CODEC =
- new PackageSpecification_SinglePackage_AutoCodec();
-
private PackageIdentifier singlePackageName;
@VisibleForSerialization
@@ -211,9 +207,6 @@
@AutoCodec
@VisibleForSerialization
static class AllPackagesBeneath extends PackageSpecification {
- public static final ObjectCodec<AllPackagesBeneath> CODEC =
- new PackageSpecification_AllPackagesBeneath_AutoCodec();
-
private PackageIdentifier prefix;
@VisibleForSerialization
@@ -262,9 +255,6 @@
@AutoCodec
@VisibleForSerialization
static class NegativePackageSpecification extends PackageSpecification {
- public static final ObjectCodec<NegativePackageSpecification> CODEC =
- new PackageSpecification_NegativePackageSpecification_AutoCodec();
-
private final PackageSpecification delegate;
NegativePackageSpecification(PackageSpecification delegate) {
@@ -309,9 +299,6 @@
@AutoCodec
@VisibleForSerialization
static class AllPackages extends PackageSpecification {
- public static final ObjectCodec<AllPackages> CODEC =
- new PackageSpecification_AllPackages_AutoCodec();
-
private static final PackageSpecification EVERYTHING = new AllPackages();
@Override
@@ -354,9 +341,6 @@
@Immutable
@AutoCodec
public static final class PackageGroupContents {
- public static final ObjectCodec<PackageGroupContents> CODEC =
- new PackageSpecification_PackageGroupContents_AutoCodec();
-
private final ImmutableList<PackageSpecification> packageSpecifications;
@VisibleForSerialization
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java b/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
index 2ba805c..810280b 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspectClass.java
@@ -16,7 +16,6 @@
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;
@@ -24,8 +23,6 @@
@AutoCodec
@Immutable
public final class SkylarkAspectClass implements AspectClass {
- public static final ObjectCodec<SkylarkAspectClass> CODEC = new SkylarkAspectClass_AutoCodec();
-
private final Label extensionLabel;
private final String exportedName;
