Fix #135

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/StringableTest.java

@@ -14,7 +14,6 @@
 import lombok.Data;
 import org.apache.avro.reflect.AvroSchema;
 import org.apache.avro.reflect.Stringable;
-import org.apache.avro.specific.SpecificData;
 import org.junit.Test;
 
 import com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil;
@@ -26,8 +25,8 @@
 /**
  * Tests support for using classes marked {@link Stringable @Stringable} as map keys. These classes must have a constructor which accepts a
  * single string as an argument, and their {@link #toString()} must return a serialized version of the object that can be passed back into
- * the constructor to recreate it. In addition, Avro considers the following classes {@link SpecificData#stringableClasses} stringable by
- * default}:
+ * the constructor to recreate it. In addition, Avro considers the following classes
+ * stringable (see {code SpecificData.stringableClasses()}) by default:
  * <ul>
  * <li>{@link File}</li>
  * <li>{@link BigInteger}</li>

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java

@@ -660,8 +660,9 @@ public JsonToken nextToken() throws IOException
             }
 
         case STATE_MESSAGE_END: // occurs if we end with array
+            close(); // sets state to STATE_CLOSED
             return (_currToken = JsonToken.END_OBJECT);
-            
+
         case STATE_CLOSED:
             return null;
 

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/RoundtripNestedMessageTest.java

@@ -2,8 +2,10 @@
 
 import java.io.IOException;
 
-import org.junit.Assert;
-import org.junit.Test;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 
 import com.fasterxml.jackson.dataformat.protobuf.ProtobufMapper;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
@@ -95,11 +97,25 @@ public void setA(String a) {
         }
     }
 
-    @Test
+    // [dataformats-binary#135]: endless END_OBJECT at end of doc
+    @JsonPropertyOrder({ "name", "age", "emails", "boss" })
+    static class Employee135 {
+        public int age;
+ 
+        public String[] emails;
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    private final ProtobufMapper MAPPER = new ProtobufMapper();
+
     public void testNestedRoundtrip() throws IOException
     {
        TestObject testClass = new TestObject();
-       ProtobufMapper om = new ProtobufMapper();
        ProtobufSchema s = ProtobufSchemaLoader.std.parse(PROTO);
        testClass.a = VALUE_A;
        testClass.b = new TestSub();
@@ -109,14 +125,53 @@ public void testNestedRoundtrip() throws IOException
        testClass.b.d = new TestSubSub();
        testClass.b.d.a = VALUE_SUB_A;
 
-       byte[] proto = om.writer(s)
+       byte[] proto = MAPPER.writer(s)
                .writeValueAsBytes(testClass);
-        TestObject res = om.readerFor(TestObject.class).with(s)
+        TestObject res = MAPPER.readerFor(TestObject.class).with(s)
                .readValue(proto);
 
-       Assert.assertEquals(VALUE_A, res.a);
-       Assert.assertEquals(VALUE_C, res.b.c);
-       Assert.assertEquals(VALUE_B, res.b.b);
-       Assert.assertEquals(VALUE_SUB_A, res.b.d.a);
+       assertEquals(VALUE_A, res.a);
+       assertEquals(VALUE_C, res.b.c);
+       assertEquals(VALUE_B, res.b.b);
+       assertEquals(VALUE_SUB_A, res.b.d.a);
+    }
+
+    // [dataformats-binary#135]: endless END_OBJECT at end of doc
+    public void testIssue135() throws Exception
+    {
+        String protobuf_str = "message Employee {\n"
+                + " required int32 age = 1;\n"
+                + " repeated string emails = 3;\n"
+                + "}\n";
+        final ProtobufSchema schema = MAPPER.schemaLoader().parse(protobuf_str);
+
+        Employee135 empl = new Employee135();
+        empl.age = 30;
+        empl.emails = new String[]{"[email protected]"};
+
+        byte[] protobufData = MAPPER.writer(schema)
+                .writeValueAsBytes(empl);
+
+        JsonParser p = new ProtobufFactory().createParser(protobufData);
+        p.setSchema(schema);
+
+        assertToken(JsonToken.START_OBJECT, p.nextToken());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        assertEquals("age", p.currentName());
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(30, p.getIntValue());
+
+        assertToken(JsonToken.FIELD_NAME, p.nextToken());
+        assertEquals("emails", p.currentName());
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        assertToken(JsonToken.VALUE_STRING, p.nextToken());
+        assertEquals("[email protected]", p.getText());
+        assertToken(JsonToken.END_ARRAY, p.nextToken());
+        
+        assertToken(JsonToken.END_OBJECT, p.nextToken());
+
+        assertNull(p.nextToken());
+        p.close();
     }
 }

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/WriteBinaryTest.java

@@ -26,7 +26,7 @@ public Binary(int id, byte[] data, int trailer) {
             this.trailer = trailer;
         }
     }
-    
+
     /*
     /**********************************************************
     /* Test methods

release-notes/CREDITS

@@ -60,5 +60,11 @@ philipa@github
  (2.9.3)
 
 Jacek Lach (JacekLach@github)
+
 * Reported #124: Invalid value returned for negative int32 where the absolute value is > 2^31 - 1
  (2.9.3)
+
+Leo Wang (wanglingsong@github)
+
+* Reported #135: Infinite sequence of `END_OBJECT` tokens returned at end of streaming read
+ (2.9.6)

release-notes/VERSION

@@ -9,6 +9,11 @@ Modules:
 === Releases ===
 ------------------------------------------------------------------------
 
+2.9.6 (not yet released)
+
+#135: Infinite sequence of `END_OBJECT` tokens returned at end of streaming read
+ (reported by Leo W)
+
 2.9.5 (26-Feb-2018)
 
 #128 (protobuf) Fix skip unknown WireType.FIXED_64BIT value bug