diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/Package.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/Package.java | 12 |
1 files changed, 5 insertions, 7 deletions
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 1d7ee3a792..648343c6da 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.ExtendedEventHandler.Postable; 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 @@ import javax.annotation.Nullable; */ @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 @@ public class Package { } /** 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 @@ public class Package { @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) { |