Merge branch '2.17' into 2.18

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -9,6 +9,12 @@ Project: jackson-dataformat-xml
 - Remove unnecessary synchronization around `LRUMap` in `XmlRootNameLookup`
  (contributed by @pjfanning)
 
+2.17.2 (not yet released)
+
+#657: Nesting depth in `XmlReadContext` is not incremented/decremented on
+  JsonToken.START_OBJECT/JsonToken.END_OBJECT
+ (reported by @AlexUg)
+
 2.17.1 (04-May-2024)
 
 #646: Deserializing fails when using builder classes with `Iterable` Collection setters

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlReadContext.java

@@ -66,6 +66,7 @@ public XmlReadContext(XmlReadContext parent, int type, int lineNr, int colNr)
         _lineNr = lineNr;
         _columnNr = colNr;
         _index = -1;
+        _nestingDepth = parent == null ? 0 : parent._nestingDepth + 1;
     }
 
     protected final void reset(int type, int lineNr, int colNr)
@@ -77,6 +78,7 @@ protected final void reset(int type, int lineNr, int colNr)
         _currentName = null;
         _currentValue = null;
         _namesToWrap = null;
+        // _nestingDepth fine as is, same level for reuse
     }
 
     @Override

src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParserTest.java

@@ -30,13 +30,19 @@ public void testSimplest() throws Exception
         // -> "{\"leaf\":\"abc\"}"
 
         try (JsonParser p = _xmlMapper.createParser(XML)) {
+            assertEquals(0, p.getParsingContext().getNestingDepth());
             assertToken(JsonToken.START_OBJECT, p.nextToken());
+            assertEquals(1, p.getParsingContext().getNestingDepth());
             assertToken(JsonToken.FIELD_NAME, p.nextToken());
             assertEquals("leaf", p.currentName());
+            assertEquals(1, p.getParsingContext().getNestingDepth());
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             assertEquals("abc", p.getText());
+            assertEquals(1, p.getParsingContext().getNestingDepth());
             assertToken(JsonToken.END_OBJECT, p.nextToken());
+            assertEquals(0, p.getParsingContext().getNestingDepth());
             assertNull(p.nextToken());
+            assertEquals(0, p.getParsingContext().getNestingDepth());
         }
     }