Updates serialize() to be more consistent with java.io.Serializable

Author: Dino Oliva

core/java/com/google/instrumentation/stats/StatsContext.java

@@ -13,6 +13,7 @@
 
 package com.google.instrumentation.stats;
 
+import java.io.IOException;
 import java.io.OutputStream;
 
 /**
@@ -55,9 +56,8 @@ public final StatsContext with(
    * the {@link StatsContext} protobuf representation.
    *
    * @param output the {@link OutputStream} to add the serialized form of this {@link StatsContext}.
-   * @return the given {@link OutputStream}
    */
-  public abstract OutputStream serialize(OutputStream output);
+  public abstract void serialize(OutputStream output) throws IOException;
 
   /**
    * Builder for {@link StatsContext}.

core/javatests/com/google/instrumentation/stats/StatsContextTest.java

@@ -18,6 +18,7 @@
 import com.google.common.testing.EqualsTester;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -142,7 +143,11 @@ public void testToString() {
 
   private static void testSerialization(StatsContext expected) {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
-    expected.serialize(output);
+    try {
+      expected.serialize(output);
+    } catch (IOException exn) {
+      // ignore
+    }
     ByteBuffer input = ByteBuffer.wrap(output.toByteArray());
     StatsContext actual = Stats.getStatsContextFactory().deserialize(input);
     assertThat(actual).isEqualTo(expected);

core_impl/java/com/google/instrumentation/stats/StatsContextImpl.java

@@ -13,6 +13,7 @@
 
 package com.google.instrumentation.stats;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.util.HashMap;
 
@@ -42,8 +43,8 @@ public StatsContextImpl record(MeasurementMap stats) {
    * <p>The encoded tags are of the form: {@code <tag prefix> + 'key' + <tag delim> + 'value'}*
    */
   @Override
-  public OutputStream serialize(OutputStream output) {
-    return StatsSerializer.serialize(this, output);
+  public void serialize(OutputStream output) throws IOException {
+    StatsSerializer.serialize(this, output);
   }
 
   @Override

core_impl/java/com/google/instrumentation/stats/StatsSerializer.java

@@ -33,7 +33,7 @@ final class StatsSerializer {
 
   // Serializes a StatsContext by transforming it into a StatsContextProto. The
   // encoded tags are of the form: (<tag prefix> + 'key' + <tag delim> + 'value')*
-  static OutputStream serialize(StatsContextImpl context, OutputStream output) {
+  static void serialize(StatsContextImpl context, OutputStream output) throws IOException {
     StringBuilder builder = new StringBuilder();
     for (Entry<String, String> tag : context.tags.entrySet()) {
       builder
@@ -42,13 +42,7 @@ static OutputStream serialize(StatsContextImpl context, OutputStream output) {
           .append(TAG_DELIM)
           .append(tag.getValue());
     }
-    try {
-      StatsContextProto.StatsContext.newBuilder().setTags(builder.toString()).build()
-          .writeTo(output);
-    } catch (IOException exn) {
-      // ignored
-    }
-    return output;
+    StatsContextProto.StatsContext.newBuilder().setTags(builder.toString()).build().writeTo(output);
   }
 
   // Deserializes based on an serialized StatsContextProto. The encoded tags are of the form: