Merge branch '2.9' into 2.10

Author: cowtowncoder

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

@@ -23,7 +23,7 @@ public class ReadSimpleTest extends ProtobufTestBase
             +" repeated string values = 2 [packed=true];\n"
             +"}\n"
     ;
-    
+
     final protected static String PROTOC_NAMED_STRINGS =
             "message NamedStrings {\n"
             +" required string name = 2;\n"

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/failing/ReadCyclicSchema140Test.java

@@ -0,0 +1,39 @@
+package com.fasterxml.jackson.dataformat.protobuf.failing;
+
+import java.util.List;
+
+import com.fasterxml.jackson.dataformat.protobuf.ProtobufTestBase;
+import com.fasterxml.jackson.dataformat.protobuf.schema.*;
+
+public class ReadCyclicSchema140Test extends ProtobufTestBase
+{
+    final protected static String PROTOC_CYCLIC =
+            "message Front {\n"
+            +" optional string id = 1;\n"
+            +" optional Back id = 2;\n"
+            +"}\n"
+            +"message Back {\n"
+            +" optional string id = 1;\n"
+            +" optional string extra = 2;\n"
+            +" optional Front id = 3;\n"
+            +"}\n"
+    ;
+
+    public void testCyclicDefinition() throws Exception
+    {
+        ProtobufSchema schema = ProtobufSchemaLoader.std.parse(PROTOC_CYCLIC);
+        assertNotNull(schema);
+        List<String> all = schema.getMessageTypes();
+        assertEquals(2, all.size());
+        assertEquals("Front", all.get(0));
+        assertEquals("Back", all.get(0));
+        ProtobufMessage msg = schema.getRootType();
+        assertEquals(3, msg.getFieldCount());
+        ProtobufField f = msg.field("id");
+        assertNotNull(f);
+        assertEquals("id", f.name);
+
+        _verifyMessageFieldLinking(schema.getRootType());
+    }
+
+}