json-iterator#50 fix deserialize with byte[]

taowen · taowen · commit a641d578865c · 2017-05-06T00:02:42.000+08:00
diff --git a/src/main/java/com/jsoniter/JsonIterator.java b/src/main/java/com/jsoniter/JsonIterator.java
@@ -366,47 +366,20 @@ protected JsonIterator initialValue() {
     };
 
     public static final <T> T deserialize(String input, Class<T> clazz) {
-        JsonIterator iter = tlsIter.get();
-        byte[] bytes = input.getBytes();
-        iter.reset(bytes);
-        try {
-            T val = iter.read(clazz);
-            if (iter.head != bytes.length) {
-                System.out.println(iter.head);
-                System.out.println(new String(bytes));
-                System.out.println(new String(bytes).substring(75));
-                throw iter.reportError("deserialize", "trailing garbage found");
-            }
-            return val;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw iter.reportError("deserialize", "premature end");
-        } catch (IOException e) {
-            throw new JsonException(e);
-        }
+        return deserialize(input.getBytes(), clazz);
     }
 
     public static final <T> T deserialize(String input, TypeLiteral<T> typeLiteral) {
-        JsonIterator iter = tlsIter.get();
-        iter.reset(input.getBytes());
-        try {
-            T val = iter.read(typeLiteral);
-            if (IterImpl.nextToken(iter) != 0) {
-                throw iter.reportError("deserialize", "trailing garbage found");
-            }
-            return val;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            throw iter.reportError("deserialize", "premature end");
-        } catch (IOException e) {
-            throw new JsonException(e);
-        }
+        return deserialize(input.getBytes(), typeLiteral);
     }
 
     public static final <T> T deserialize(byte[] input, Class<T> clazz) {
+        int lastNotSpacePos = findLastNotSpacePos(input);
         JsonIterator iter = tlsIter.get();
-        iter.reset(input);
+        iter.reset(input, 0, lastNotSpacePos);
         try {
             T val = iter.read(clazz);
-            if (IterImpl.nextToken(iter) != 0) {
+            if (iter.head != lastNotSpacePos) {
                 throw iter.reportError("deserialize", "trailing garbage found");
             }
             return val;
@@ -418,11 +391,12 @@ public static final <T> T deserialize(byte[] input, Class<T> clazz) {
     }
 
     public static final <T> T deserialize(byte[] input, TypeLiteral<T> typeLiteral) {
+        int lastNotSpacePos = findLastNotSpacePos(input);
         JsonIterator iter = tlsIter.get();
-        iter.reset(input);
+        iter.reset(input, 0, lastNotSpacePos);
         try {
             T val = iter.read(typeLiteral);
-            if (IterImpl.nextToken(iter) != 0) {
+            if (iter.head != lastNotSpacePos) {
                 throw iter.reportError("deserialize", "trailing garbage found");
             }
             return val;
@@ -438,11 +412,12 @@ public static final Any deserialize(String input) {
     }
 
     public static final Any deserialize(byte[] input) {
+        int lastNotSpacePos = findLastNotSpacePos(input);
         JsonIterator iter = tlsIter.get();
-        iter.reset(input);
+        iter.reset(input, 0, lastNotSpacePos);
         try {
             Any val = iter.readAny();
-            if (iter.head != input.length) {
+            if (iter.head != lastNotSpacePos) {
                 throw iter.reportError("deserialize", "trailing garbage found");
             }
             return val;
@@ -453,6 +428,16 @@ public static final Any deserialize(byte[] input) {
         }
     }
 
+    private static int findLastNotSpacePos(byte[] input) {
+        for(int i = input.length - 1; i >= 0; i--) {
+            byte c = input[i];
+            if (c != ' ' && c != '\t' && c != '\n' && c != '\r') {
+                return i + 1;
+            }
+        }
+        return 0;
+    }
+
     public static void setMode(DecodingMode mode) {
         Codegen.setMode(mode);
     }
diff --git a/src/test/java/com/jsoniter/TestDemo.java b/src/test/java/com/jsoniter/TestDemo.java
@@ -166,4 +166,9 @@ public void test_utf8() {
         TestObject obj = JsonIterator.deserialize(input, TestObject.class);
         assertEquals(0, obj.commentCount);
     }
+
+    public void test_deserialize() {
+        String str = "{\"port\":13110}  ";
+        JsonIterator.deserialize(str.getBytes(), HashMap.class);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -166,4 +166,9 @@ public void test_utf8() {`
`166`	`166`	`TestObject obj = JsonIterator.deserialize(input, TestObject.class);`
`167`	`167`	`assertEquals(0, obj.commentCount);`
`168`	`168`	`}`
	`169`	`+`
	`170`	`+ public void test_deserialize() {`
	`171`	`+ String str = "{\"port\":13110} ";`
	`172`	`+ JsonIterator.deserialize(str.getBytes(), HashMap.class);`
	`173`	`+ }`
`169`	`174`	`}`