Merge branch '2.18' into 2.19

Author: cowtowncoder

.github/workflows/main.yml

@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    runs-on: 'ubuntu-24.04'
     strategy:
       fail-fast: false
       matrix:

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

@@ -967,7 +967,12 @@ private JsonToken _skipUnknownField(int tag, int wireType) throws IOException
                 continue;
             }
             _parsingContext.setCurrentName(_currentField.name);
-            _state = STATE_ROOT_VALUE;
+            // 30-Apr-2025, tatu: [dataformats-binary#584] may be called for root and nested
+            if (_state == STATE_NESTED_KEY) {
+                _state = STATE_NESTED_VALUE;
+            } else {
+                _state = STATE_ROOT_VALUE;
+            }
             // otherwise quickly validate compatibility
             if (!_currentField.isValidFor(wireType)) {
                 _reportIncompatibleType(_currentField, wireType);

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

@@ -8,9 +8,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class ReadNestedUnknownFieldsTest extends ProtobufTestBase
 {
@@ -128,7 +131,7 @@ public static class Embed {
 
     private final ProtobufMapper MAPPER = new ProtobufMapper();
 
-    // [dataformats-binary#108]
+    // [dataformats-binary#108], [dataformats-binary#584]
     @Test
     public void testMultipleUnknown() throws Exception
     {
@@ -138,15 +141,36 @@ public void testMultipleUnknown() throws Exception
         nestedTwoField.setNested2(2);
         moreNestedField.setF1(nestedTwoField);
 
-        byte[] in = MAPPER.writerFor(MoreNestedField.class)
+        byte[] doc = MAPPER.writerFor(MoreNestedField.class)
                 .with(MAPPER.generateSchemaFor(MoreNestedField.class))
                 .writeValueAsBytes(moreNestedField);
+        final ProtobufSchema schema = MAPPER.generateSchemaFor(LessNestedField.class);
+        final ObjectReader protoR = MAPPER.readerFor(LessNestedField.class)
+                .with(schema)
+                // important: skip through unknown
+                .with(JsonParser.Feature.IGNORE_UNDEFINED);
+
+        // 30-Apr-2025, tatu: [dataformats-binary#584]: First, iterate over tokens
+        try (JsonParser p = protoR.createParser(doc)) {
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            assertEquals("f1", p.currentName());
+            assertToken(JsonToken.START_OBJECT, p.nextToken());
+            assertToken(JsonToken.FIELD_NAME, p.nextToken());
+            assertEquals("nested2", p.currentName());
+            assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+            assertEquals(2, p.getIntValue());
+            assertToken(JsonToken.END_OBJECT, p.nextToken());
+            assertToken(JsonToken.END_OBJECT, p.nextToken());
+            assertNull(p.nextToken());
+        }
 
+        // and only then test databinding
         LessNestedField lesser = MAPPER.readerFor(LessNestedField.class)
                 .with(MAPPER.generateSchemaFor(LessNestedField.class))
                 // important: skip through unknown
                 .with(JsonParser.Feature.IGNORE_UNDEFINED)
-                .readValue(in);
+                .readValue(doc);
 
         assertEquals(moreNestedField.getF1().getNested2(), lesser.getF1().getNested2());
     }

release-notes/VERSION-2.x

@@ -48,6 +48,7 @@ Active maintainers:
 #569: (ion) `IonParser` fails to parse some `long` values saying
   they are out of range when they are not
  (reported, fix suggested by @seadbrane)
+#584: (protobuf) Missing `JsonToken.END_OBJECT` for nested Protobuf Objects
 - (ion) Upgrade `ion-java` to 1.11.10 (from 1.11.9)
 
 2.18.3 (28-Feb-2025)