Merge pull request #2 from mattcross/master

komamitsu · komamitsu · commit 6ad50a5b7979 · 2014-09-30T23:19:45.000+09:00
fixes jackson-dataformat-msgpack issue #1
diff --git a/src/main/java/org/msgpack/jackson/dataformat/msgpack/MessagePackParser.java b/src/main/java/org/msgpack/jackson/dataformat/msgpack/MessagePackParser.java
@@ -108,6 +108,13 @@ public JsonToken nextToken() throws IOException, JsonParseException {
                 stack.pop();
                 _currToken = _parsingContext.inObject() ? JsonToken.END_OBJECT : JsonToken.END_ARRAY;
                 _parsingContext = _parsingContext.getParent();
+
+                //If the message unpacker has no more tokens just unwind the stack until it's empty.
+                if(!messageUnpacker.hasNext()) {
+                    if (!stack.isEmpty() && !stack.getFirst().isEmpty()) {
+                        stack.getFirst().consume();
+                    }
+                }
                 return _currToken;
             }
         }
@@ -116,6 +123,7 @@ public JsonToken nextToken() throws IOException, JsonParseException {
             if (!_parsingContext.inObject() && !_parsingContext.inArray()) {
                 throw new IllegalStateException("Not in Object nor Array");
             }
+
             _currToken = _parsingContext.inObject() ? JsonToken.END_OBJECT : JsonToken.END_ARRAY;
             _parsingContext = _parsingContext.getParent();
             messageUnpacker.close();
diff --git a/src/test/java/org/msgpack/jackson/dataformat/msgpack/MessagePackDataformatForPojoTest.java b/src/test/java/org/msgpack/jackson/dataformat/msgpack/MessagePackDataformatForPojoTest.java
@@ -27,6 +27,22 @@ public void testNormal() throws IOException {
         assertEquals(normalPojo.suit, Suit.HEART);
     }
 
+    @Test
+    public void testNestedList() throws IOException {
+        byte[] bytes = objectMapper.writeValueAsBytes(nestedListPojo);
+        NestedListPojo value = objectMapper.readValue(bytes, NestedListPojo.class);
+        assertEquals(nestedListPojo.s, value.s);
+        assertTrue(Arrays.equals(nestedListPojo.strs.toArray(), value.strs.toArray()));
+    }
+
+    @Test
+    public void testNestedListComplex() throws IOException {
+        byte[] bytes = objectMapper.writeValueAsBytes(nestedListComplexPojo);
+        NestedListComplexPojo value = objectMapper.readValue(bytes, NestedListComplexPojo.class);
+        assertEquals(nestedListPojo.s, value.s);
+        assertEquals(nestedListComplexPojo.foos.get(0).t, value.foos.get(0).t);
+    }
+
     @Test
     public void testUsingCustomConstructor() throws IOException {
         UsingCustomConstructorPojo orig = new UsingCustomConstructorPojo("komamitsu", 55);
diff --git a/src/test/java/org/msgpack/jackson/dataformat/msgpack/MessagePackDataformatTestBase.java b/src/test/java/org/msgpack/jackson/dataformat/msgpack/MessagePackDataformatTestBase.java
@@ -11,13 +11,19 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class MessagePackDataformatTestBase {
     protected MessagePackFactory factory;
     protected ByteArrayOutputStream out;
     protected ByteArrayInputStream in;
     protected ObjectMapper objectMapper;
     protected NormalPojo normalPojo;
+    protected NestedListPojo nestedListPojo;
+    protected NestedListComplexPojo nestedListComplexPojo;
+    protected TinyPojo tinyPojo;
 
     @Before
     public void setup() {
@@ -35,6 +41,17 @@ public void setup() {
         normalPojo.b = new byte[] {0x01, 0x02, (byte) 0xFE, (byte) 0xFF};
         normalPojo.bi = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
         normalPojo.suit = Suit.HEART;
+
+        nestedListPojo = new NestedListPojo();
+        nestedListPojo.s = "a string";
+        nestedListPojo.strs = Arrays.asList(new String[] {"string", "another string", "another string"});
+
+        tinyPojo = new TinyPojo();
+        tinyPojo.t = "t string";
+        nestedListComplexPojo = new NestedListComplexPojo();
+        nestedListComplexPojo.s = "a string";
+        nestedListComplexPojo.foos = new ArrayList<TinyPojo>();
+        nestedListComplexPojo.foos.add(tinyPojo);
     }
 
     @After
@@ -60,6 +77,20 @@ public enum Suit {
         SPADE, HEART, DIAMOND, CLUB;
     }
 
+    public static class NestedListPojo {
+        public String s;
+        public List<String> strs;
+    }
+
+    public static class TinyPojo {
+        public String t;
+    }
+
+    public static class NestedListComplexPojo {
+        public String s;
+        public List<TinyPojo> foos;
+    }
+
     public static class NormalPojo {
         String s;
         public int i;
