Fix deserialization bug when deserializing unrecognized struct fields.

Karl Rieb · Karl Rieb · commit fe3563b4958e · 2016-08-01T14:00:07.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,7 @@
+2.1.1
+---------------------------------------------
+- Fix "Required field ... missing" deserialization bug caused by certain backwards-compatible response changes from the server.
+
 2.1.0 (2016-07-29)
 ---------------------------------------------
 - Update to latest API specs:
diff --git a/src/main/java/com/dropbox/core/stone/StoneSerializer.java b/src/main/java/com/dropbox/core/stone/StoneSerializer.java
@@ -116,7 +116,8 @@ protected static void expectEndArray(JsonParser p) throws IOException, JsonParse
 
     protected static void skipValue(JsonParser p) throws IOException, JsonParseException {
         if (p.getCurrentToken().isStructStart()) {
-            p.skipChildren();
+            p.skipChildren(); // will leave parser at end token (e.g. '}' or ']')
+            p.nextToken();
         } else if (p.getCurrentToken().isScalarValue()) {
             p.nextToken();
         } else {
diff --git a/src/test/java/com/dropbox/core/stone/test/DataTypeSerializationTest.java b/src/test/java/com/dropbox/core/stone/test/DataTypeSerializationTest.java
@@ -67,6 +67,13 @@ public void testUnknownStructFields() throws Exception {
         Dimensions actual = Dimensions.Serializer.INSTANCE.deserialize(json);
 
         assertEquals(actual, expected);
+
+        // sometimes the order can matter. Add an unknown struct field early to see if we skip it properly
+        json = "{\"height\":768,\"foo\":{\"bar\":[1, 2, 3],\"baz\":false},\"alpha\":0.5,\"width\":1024}";
+        expected = new Dimensions(1024, 768);
+        actual = Dimensions.Serializer.INSTANCE.deserialize(json);
+
+        assertEquals(actual, expected);
     }
 
     @Test
