Merge branch '3.0' into 3.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -18,8 +18,11 @@ a pure JSON library.
 
 #363: UTF-8 decoding should fail on Surrogate characters (0xD800 - 0xDFFF)
  (fix by @cowtowncoder, w/ Claude code)
-#1180: `JsonLocation` off for unrecognized tokens
+#708: `FilteringParserDelegate` cannot deserialize empty list
+ (reported by @xiazuojie)
  (fix by @cowtowncoder, w/ Claude code)
+#1180: `JsonLocation` off for unrecognized tokens
+(fix by @cowtowncoder, w/ Claude code)
 #1470: Add method `copyCurrentStructureExact()` to `JsonGenerator`
  (contributed by Lars H)
 #1477: Add `JsonGenerator.has(StreamWriteCapability)` convenience method

src/main/java/tools/jackson/core/filter/FilteringParserDelegate.java

@@ -619,7 +619,7 @@ protected final JsonToken _nextToken2() throws JacksonException
                     boolean returnEnd = _headContext.isStartHandled();
                     f = _headContext.getFilter();
                     if ((f != null) && (f != TokenFilter.INCLUDE_ALL)) {
-                        boolean includeEmpty = f.includeEmptyArray(_headContext.hasCurrentName());
+                        boolean includeEmpty = f.includeEmptyObject(_headContext.hasCurrentName());
                         f.filterFinishObject();
                         if (includeEmpty) {
                             return _nextBuffered(_headContext);

src/test/java/tools/jackson/core/unittest/tofix/ParserFilterEmpty708Test.java renamed to src/test/java/tools/jackson/core/unittest/filter/ParserFilterEmpty708Test.java

@@ -1,4 +1,4 @@
-package tools.jackson.core.unittest.tofix;
+package tools.jackson.core.unittest.filter;
 
 import org.junit.jupiter.api.Test;
 
@@ -10,7 +10,6 @@
 import tools.jackson.core.filter.TokenFilter;
 import tools.jackson.core.filter.TokenFilter.Inclusion;
 import tools.jackson.core.json.JsonFactory;
-import tools.jackson.core.testutil.failure.JacksonTestFailureExpected;
 import tools.jackson.core.unittest.*;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -22,7 +21,17 @@ class ParserFilterEmpty708Test extends JacksonCoreTestBase
     static class IncludeAllFilter extends TokenFilter {
         @Override
         public TokenFilter includeProperty(String name) {
-            return this;
+            return TokenFilter.INCLUDE_ALL;
+        }
+
+        @Override
+        public boolean includeEmptyArray(boolean contentsFiltered) {
+            return true;
+        }
+
+        @Override
+        public boolean includeEmptyObject(boolean contentsFiltered) {
+            return true;
         }
     }
 
@@ -35,12 +44,10 @@ public TokenFilter includeProperty(String name) {
     private final JsonFactory JSON_F = newStreamFactory();
 
     // [core#708]
-    @JacksonTestFailureExpected
     @Test
     void emptyArray() throws Exception
     {
         final String json = "[ ]";
-        // should become: {"value":12}
         JsonParser p0 = _createParser(JSON_F, json);
         JsonParser p = new FilteringParserDelegate(p0,
                 new IncludeAllFilter(),
@@ -55,12 +62,10 @@ void emptyArray() throws Exception
     }
 
     // [core#708]
-    @JacksonTestFailureExpected
     @Test
     void emptyObject() throws Exception
     {
         final String json = "{ }";
-        // should become: {"value":12}
         JsonParser p0 = _createParser(JSON_F, json);
         JsonParser p = new FilteringParserDelegate(p0,
                 new IncludeAllFilter(),

src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenErrorTest.java

@@ -16,7 +16,7 @@ class AsyncTokenErrorTest extends AsyncTestBase
     private final JsonFactory JSON_F = newStreamFactory();
 
     @Test
-    void invalidKeywordsStartOk() throws Exception
+    void invalidKeywordsAfterMatching1st() throws Exception
     {
         _doTestInvalidKeyword("nul");
         _doTestInvalidKeyword("nulla");
@@ -29,28 +29,28 @@ void invalidKeywordsStartOk() throws Exception
         _doTestInvalidKeyword("trueenough");
     }
 
-    @JacksonTestFailureExpected
     @Test
-    void invalidKeywordsStartFail() throws Exception
+    void invalidKeywordsAfterNonMatching1st() throws Exception
     {
         _doTestInvalidKeyword("Null");
         _doTestInvalidKeyword("False");
         _doTestInvalidKeyword("C");
+        _doTestInvalidKeyword("xy");
     }
 
     private void _doTestInvalidKeyword(String value)
     {
+        final String EXP_MAIN = "Unrecognized token '"+value+"'";
+        final String EXP_ALT = "Unexpected character ('"+value.charAt(0)+"' (code";
+        
         String doc = "{ \"key1\" : "+value+" }";
-        // Note that depending on parser impl, we may
-        // get the exception early or late...
         try (AsyncReaderWrapper p = _createParser(doc)) {
             assertToken(JsonToken.START_OBJECT, p.nextToken());
             assertToken(JsonToken.PROPERTY_NAME, p.nextToken());
             p.nextToken();
             fail("Expected an exception for malformed value keyword");
         } catch (StreamReadException jex) {
-            verifyException(jex, "Unrecognized token");
-            verifyException(jex, value);
+            verifyException(jex, EXP_MAIN, EXP_ALT);
         }
 
         // Try as root-level value as well:
@@ -59,11 +59,10 @@ private void _doTestInvalidKeyword(String value)
             p.nextToken();
             fail("Expected an exception for malformed value keyword");
         } catch (StreamReadException jex) {
-            verifyException(jex, "Unrecognized token");
-            verifyException(jex, value);
+            verifyException(jex, EXP_MAIN, EXP_ALT);
         }
     }
-
+    
     @JacksonTestFailureExpected
     @Test
     void mangledRootInts() throws Exception