Push down Package serialization io logic

Rearrange Package serialization logic to hide ProtocolBuffer implementation
details and make it easier to transition to a more "streamed" approach.

Also moved the public members of PackageSerializer to the top of the class
for visibility.

--
MOS_MIGRATED_REVID=94905360

1 files changed, 4 insertions, 10 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 91c328d8c7..1f5dc2a429 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
@@ -233,25 +233,19 @@ public class Package implements Serializable {
   }
 
   private void writeObject(ObjectOutputStream out) {
-    com.google.devtools.build.lib.query2.proto.proto2api.Build.Package pb =
-        PackageSerializer.serializePackage(this);
     try {
-      pb.writeDelimitedTo(out);
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
+      PackageSerializer.serializePackage(this, out);
+    } catch (IOException ioe) {
+      throw new IllegalStateException(ioe);
     }
   }
 
   private void readObject(ObjectInputStream in) throws IOException {
-    com.google.devtools.build.lib.query2.proto.proto2api.Build.Package pb =
-        com.google.devtools.build.lib.query2.proto.proto2api.Build.Package.parseDelimitedFrom(in);
-    Package pkg;
     try {
-      pkg = new PackageDeserializer(null, null).deserialize(pb);
+      deserializedPkg = new PackageDeserializer(null, null).deserialize(in);
     } catch (PackageDeserializationException e) {
       throw new IllegalStateException(e);
     }
-    deserializedPkg = pkg;
   }
 
   protected Object readResolve() {