commit fae34b9ee464186c628c313eebced9e89d8146f6
author shahan <shahan@google.com> Tue Feb 13 10:08:47 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Feb 13 10:10:14 2018 -0800
tree 55d6392acc16aa3c87ada027bf0d92c366c551cc
parent a3339c8ca2e824757afe698f591770f4232af530

Replaces InjectingObjectCodec with dependencies threaded through (Des|S)erializationContext.

PiperOrigin-RevId: 185547740

src/main/java/com/google/devtools/build/lib/packages/Package.java

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 1d7ee3a..648343c 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
@@ -35,7 +35,7 @@
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.AttributeMap.AcceptsLabelAttribute;
 import com.google.devtools.build.lib.packages.License.DistributionType;
-import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec;
+import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
 import com.google.devtools.build.lib.skyframe.serialization.SerializationException;
 import com.google.devtools.build.lib.syntax.SkylarkSemantics;
 import com.google.devtools.build.lib.util.SpellChecker;
@@ -68,8 +68,7 @@
  */
 @SuppressWarnings("JavaLangClash")
 public class Package {
-  public static final InjectingObjectCodec<Package, PackageCodecDependencies> CODEC =
-      new PackageCodec();
+  public static final ObjectCodec<Package> CODEC = new PackageCodec();
 
   /**
    * Common superclass for all name-conflict exceptions.
@@ -1575,8 +1574,7 @@
   }
 
   /** Package codec implementation. */
-  private static final class PackageCodec
-      implements InjectingObjectCodec<Package, PackageCodecDependencies> {
+  private static final class PackageCodec implements ObjectCodec<Package> {
     @Override
     public Class<Package> getEncodedClass() {
       return Package.class;
@@ -1584,20 +1582,20 @@
 
     @Override
     public void serialize(
-        PackageCodecDependencies codecDeps,
         com.google.devtools.build.lib.skyframe.serialization.SerializationContext context,
         Package input,
         CodedOutputStream codedOut)
         throws IOException, SerializationException {
+      PackageCodecDependencies codecDeps = context.getDependency(PackageCodecDependencies.class);
       codecDeps.getPackageSerializer().serialize(input, codedOut);
     }
 
     @Override
     public Package deserialize(
-        PackageCodecDependencies codecDeps,
         com.google.devtools.build.lib.skyframe.serialization.DeserializationContext context,
         CodedInputStream codedIn)
         throws SerializationException, IOException {
+      PackageCodecDependencies codecDeps = context.getDependency(PackageCodecDependencies.class);
       try {
         return codecDeps.getPackageDeserializer().deserialize(codedIn);
       } catch (PackageDeserializationException e) {