Fix #73: nested protoc type defs (#656)

Author: cowtowncoder

protobuf/src/main/java/tools/jackson/dataformat/protobuf/schema/TypeResolver.java

@@ -223,7 +223,31 @@ private ProtobufField _findAndResolve(FieldElement nativeField, String typeStr)
         if (nativeMt != null) {
             return new ProtobufField(nativeField, resolve(this, nativeMt));
         }
-        return null;
+        // [dataformats-binary#73] Handle dot-notation references to nested message types
+        // (e.g. "OuterType.InnerType")
+        return _findDottedType(nativeField, typeStr);
+    }
+
+    /**
+     * Try to resolve a dot-notation type reference (e.g. {@code "OuterType.InnerType"})
+     * by navigating the message type hierarchy declared at this scope level.
+     */
+    private ProtobufField _findDottedType(FieldElement nativeField, String typeStr)
+    {
+        int dotIx = typeStr.indexOf('.');
+        if (dotIx <= 0) {
+            return null;
+        }
+        String outerName = typeStr.substring(0, dotIx);
+        String innerPath = typeStr.substring(dotIx + 1);
+        MessageElement outerMsg = _declaredMessageTypes.get(outerName);
+        if (outerMsg == null) {
+            return null;
+        }
+        // Create a resolver in the context of the outer type and recursively
+        // resolve the remaining path (handles arbitrary nesting depth)
+        TypeResolver outerResolver = TypeResolver.construct(this, outerName, outerMsg.nestedElements());
+        return outerResolver._findAndResolve(nativeField, innerPath);
     }
 
     private StringBuilder _knownEnums(StringBuilder sb) {

protobuf/src/test/java/module-info.java

@@ -20,5 +20,4 @@
     opens tools.jackson.dataformat.protobuf.schema;
     opens tools.jackson.dataformat.protobuf.testutil;
     opens tools.jackson.dataformat.protobuf.testutil.failure;
-    opens tools.jackson.dataformat.protobuf.tofix;
 }

…obuf/tofix/GenerateNestedType73Test.java …protobuf/schema/NestedTypeRef73Test.javaprotobuf/src/test/java/tools/jackson/dataformat/protobuf/tofix/GenerateNestedType73Test.java renamed to protobuf/src/test/java/tools/jackson/dataformat/protobuf/schema/NestedTypeRef73Test.java protobuf/src/test/java/tools/jackson/dataformat/protobuf/tofix/GenerateNestedType73Test.java renamed to protobuf/src/test/java/tools/jackson/dataformat/protobuf/schema/NestedTypeRef73Test.java

@@ -1,30 +1,22 @@
-package tools.jackson.dataformat.protobuf.tofix;
+package tools.jackson.dataformat.protobuf.schema;
 
 import java.io.StringReader;
 
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.dataformat.protobuf.ProtobufMapper;
 import tools.jackson.dataformat.protobuf.ProtobufTestBase;
-import tools.jackson.dataformat.protobuf.schema.ProtobufSchema;
-import tools.jackson.dataformat.protobuf.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class GenerateNestedType73Test extends ProtobufTestBase
+// [dataformats-binary#73]
+public class NestedTypeRef73Test extends ProtobufTestBase
 {
-    /*
-    /**********************************************************
-    /* Test methods
-    /**********************************************************
-     */
-
     final ProtobufMapper MAPPER = new ProtobufMapper();
 
-    // [dataformats-binary#68]
-    @JacksonTestFailureExpected
+    // [dataformats-binary#73]: dot-notation reference to a nested message type
     @Test
-    public void testNestedTypes() throws Exception
+    public void testNestedTypeRefViaRootType() throws Exception
     {
         final String SCHEMA_STR =
 "        package mypackage;\n"

release-notes/CREDITS

@@ -18,6 +18,11 @@ Fawzi Essam (@iifawzi)
 * Contributed #591: Change `CBOR` Features defaults for 3.0
  (3.0.0)
 
+Kenji Noguchi (@knoguchi)
+
+* Reported #73: (protobuf) Cannot resolve inner types in protoc definitions
+ (3.1.0)
+
 Andy Wilkinson (@wilkinsona)
 
 * Requested #619: (avro, cbor, ion, smile) Add `isEnabled()` methods for format-specific features

release-notes/VERSION

@@ -16,6 +16,8 @@ implementations)
 
 3.1.0 (not yet released)
 
+#73: (protobuf) Cannot resolve inner types in protoc definitions
+ (reported by Kenji N)
 #649: (cbor, smile) `StreamReadConstraints.maxDocumentLength` not checked
   when creating parser with fixed buffer