Remove InputStream references, added decode to buffer with type refer…

…ence Signed-off-by: Paulo Lopes <pmlopes@gmail.com>
eclipse-vertx · May 11, 2017 · 4c8dcba · 4c8dcba
1 parent 8888d0c
commit 4c8dcba
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/src/main/java/io/vertx/core/json/Json.java b/src/main/java/io/vertx/core/json/Json.java
@@ -22,10 +22,10 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
 import io.vertx.core.buffer.Buffer;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.Base64;
@@ -74,7 +74,9 @@ public static String encode(Object obj) throws EncodeException {
 
   public static Buffer encodeToBuffer(Object obj) throws EncodeException {
     try {
-      return Buffer.buffer(mapper.writeValueAsBytes(obj));
+      Buffer buf = Buffer.buffer();
+      mapper.writeValue(new ByteBufOutputStream(buf.getByteBuf()), obj);
+      return buf;
     } catch (Exception e) {
       throw new EncodeException("Failed to encode as JSON: " + e.getMessage());
     }
@@ -104,13 +106,17 @@ public static <T> T decodeValue(String str, TypeReference<T> type) throws Decode
     }
   }
 
-  public static <T> T decodeValue(Buffer buf, Class<T> clazz) throws DecodeException {
-    return decodeValue(new ByteBufInputStream(buf.getByteBuf()), clazz);
+  public static <T> T decodeValue(Buffer buf, TypeReference<T> type) throws DecodeException {
+    try {
+      return mapper.readValue(new ByteBufInputStream(buf.getByteBuf()), type);
+    } catch (Exception e) {
+      throw new DecodeException("Failed to decode:" + e.getMessage(), e);
+    }
   }
 
-  public static <T> T decodeValue(InputStream stream, Class<T> clazz) throws DecodeException {
+  public static <T> T decodeValue(Buffer buf, Class<T> clazz) throws DecodeException {
     try {
-      return mapper.readValue(stream, clazz);
+      return mapper.readValue(new ByteBufInputStream(buf.getByteBuf()), clazz);
     } catch (Exception e) {
       throw new DecodeException("Failed to decode:" + e.getMessage(), e);
     }

diff --git a/src/main/java/io/vertx/core/json/JsonArray.java b/src/main/java/io/vertx/core/json/JsonArray.java
@@ -19,7 +19,6 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.shareddata.impl.ClusterSerializable;
 
-import java.io.InputStream;
 import java.time.Instant;
 import java.util.*;
 import java.util.stream.Stream;
@@ -664,10 +663,6 @@ private void fromBuffer(Buffer buf) {
     list = Json.decodeValue(buf, List.class);
   }
 
-  private void fromStream(InputStream stream) {
-    list = Json.decodeValue(stream, List.class);
-  }
-
   private class Iter implements Iterator<Object> {
 
     final Iterator<Object> listIter;

diff --git a/src/main/java/io/vertx/core/json/JsonObject.java b/src/main/java/io/vertx/core/json/JsonObject.java
@@ -20,7 +20,6 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.shareddata.impl.ClusterSerializable;
 
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.*;
@@ -955,10 +954,6 @@ private void fromBuffer(Buffer buf) {
     map = Json.decodeValue(buf, Map.class);
   }
 
-  private void fromStream(InputStream stream) {
-    map = Json.decodeValue(stream, Map.class);
-  }
-
   private class Iter implements Iterator<Map.Entry<String, Object>> {
 
     final Iterator<Map.Entry<String, Object>> mapIter;

diff --git a/src/test/java/io/vertx/test/core/JsonMapperTest.java b/src/test/java/io/vertx/test/core/JsonMapperTest.java
@@ -106,8 +106,14 @@ public void testGenericDecoding() {
     original.value = "test";
 
     String json = Json.encode(Collections.singletonList(original));
+    List<Pojo> correct;
 
-    List<Pojo> correct = Json.decodeValue(json, new TypeReference<List<Pojo>>() {});
+    correct = Json.decodeValue(json, new TypeReference<List<Pojo>>() {});
+    assertTrue(((List)correct).get(0) instanceof Pojo);
+    assertEquals(original.value, correct.get(0).value);
+
+    // same must apply if instead of string we use a buffer
+    correct = Json.decodeValue(Buffer.buffer(json, "UTF8"), new TypeReference<List<Pojo>>() {});
     assertTrue(((List)correct).get(0) instanceof Pojo);
     assertEquals(original.value, correct.get(0).value);