Updates deserialize to take an InputStream (to match serialize).

Author: Dino Oliva

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

@@ -13,8 +13,8 @@
 
 package com.google.instrumentation.stats;
 
-import java.nio.ByteBuffer;
-import javax.annotation.Nullable;
+import java.io.InputStream;
+import java.io.IOException;
 
 /**
  * Factory class for {@link StatsContext}.
@@ -26,11 +26,10 @@ public abstract class StatsContextFactory {
    * <p>Should be the inverse of {@link StatsContext#serialize(java.io.OutputStream)}. The
    * serialized representation should be based on the {@link StatsContext} protobuf representation.
    *
-   * @param buffer on-the-wire representation of a {@link StatsContext}
-   * @return a {@link StatsContext} deserialized from {@code buffer}
+   * @param input on-the-wire representation of a {@link StatsContext}
+   * @return a {@link StatsContext} deserialized from {@code input}
    */
-  @Nullable
-  public abstract StatsContext deserialize(ByteBuffer buffer);
+  public abstract StatsContext deserialize(InputStream input) throws IOException;
 
   /**
    * Returns the default {@link StatsContext}.

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

@@ -15,7 +15,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import java.nio.ByteBuffer;
+import java.io.ByteArrayInputStream;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -26,8 +26,8 @@
 @RunWith(JUnit4.class)
 public class StatsContextFactoryTest {
   @Test
-  public void testDeserializeEmpty() {
-    assertThat(Stats.getStatsContextFactory().deserialize(ByteBuffer.wrap(new byte[0])))
+  public void testDeserializeEmpty() throws Exception {
+    assertThat(Stats.getStatsContextFactory().deserialize(new ByteArrayInputStream(new byte[0])))
         .isEqualTo(Stats.getStatsContextFactory().getDefault());
   }
 }

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

@@ -17,9 +17,9 @@
 
 import com.google.common.testing.EqualsTester;
 
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -108,7 +108,7 @@ public void testRecordAllMeasurements() {
   }
 
   @Test
-  public void testSerialize() {
+  public void testSerialize() throws Exception {
     testSerialization(DEFAULT.builder().build());
     testSerialization(DEFAULT.with(K1, V1));
     testSerialization(DEFAULT.with(K1, V1, K2, V2, K3, V3));
@@ -141,14 +141,10 @@ public void testToString() {
     assertThat(DEFAULT.with(K1, V10).toString()).isNotEqualTo(DEFAULT.with(K1, V1).toString());
   }
 
-  private static void testSerialization(StatsContext expected) {
+  private static void testSerialization(StatsContext expected) throws Exception {
     ByteArrayOutputStream output = new ByteArrayOutputStream();
-    try {
-      expected.serialize(output);
-    } catch (IOException exn) {
-      // ignore
-    }
-    ByteBuffer input = ByteBuffer.wrap(output.toByteArray());
+    expected.serialize(output);
+    ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
     StatsContext actual = Stats.getStatsContextFactory().deserialize(input);
     assertThat(actual).isEqualTo(expected);
   }

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

@@ -13,9 +13,9 @@
 
 package com.google.instrumentation.stats;
 
-import java.nio.ByteBuffer;
+import java.io.InputStream;
+import java.io.IOException;
 import java.util.HashMap;
-import javax.annotation.Nullable;
 
 /**
  * Native Implementation of {@link StatsContextFactory}.
@@ -31,9 +31,8 @@ public StatsContextFactoryImpl() {}
    * <p>The encoded tags are of the form: {@code <tag prefix> + 'key' + <tag delim> + 'value'}*
    */
   @Override
-  @Nullable
-  public StatsContextImpl deserialize(ByteBuffer buffer) {
-    return StatsSerializer.deserialize(buffer);
+  public StatsContextImpl deserialize(InputStream input) throws IOException {
+    return StatsSerializer.deserialize(input);
   }
 
   @Override

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

@@ -14,14 +14,12 @@
 package com.google.instrumentation.stats;
 
 import com.google.instrumentation.stats.proto.StatsContextProto;
-import com.google.protobuf.InvalidProtocolBufferException;
 
+import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map.Entry;
-import javax.annotation.Nullable;
 
 /**
  * Native implementation {@link StatsContext} serialization.
@@ -47,17 +45,9 @@ static void serialize(StatsContextImpl context, OutputStream output) throws IOEx
 
   // Deserializes based on an serialized StatsContextProto. The encoded tags are of the form:
   // (<tag prefix> + 'key' + <tag delim> + 'value')*
-  @Nullable
-  static StatsContextImpl deserialize(ByteBuffer input) {
-    try {
-      StatsContextProto.StatsContext context =
-          StatsContextProto.StatsContext.parser().parseFrom(input.array());
-      return new StatsContextImpl(tagsFromString(context.getTags()));
-    } catch (IllegalArgumentException e) {
-      return null;
-    } catch (InvalidProtocolBufferException e) {
-      return null;
-    }
+  static StatsContextImpl deserialize(InputStream input) throws IOException {
+    StatsContextProto.StatsContext context = StatsContextProto.StatsContext.parseFrom(input);
+    return new StatsContextImpl(tagsFromString(context.getTags()));
   }
 
   private static HashMap<String, String> tagsFromString(String encoded) {