Fix #700

FasterXML · Jul 20, 2021 · 11930a8 · 11930a8
1 parent 295ed9d
commit 11930a8
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -34,6 +34,8 @@ JSON library.
  (reported by Fabian M)
 #694: Improve exception/JsonLocation handling for binary content: don't
   show content, include byte offset
+#700: Unable to ignore properties when deserializing. TokenFilter seems broken
+ (reported by xiazuojie@github)
 - Add `mvnw` wrapper
 
 2.12.4 (06-Jul-2021)

diff --git a/src/main/java/com/fasterxml/jackson/core/JsonParser.java b/src/main/java/com/fasterxml/jackson/core/JsonParser.java
@@ -1403,7 +1403,7 @@ public boolean isNaN() throws IOException {
      * @param name Name to use as the current name; may be null.
      */
     public abstract void overrideCurrentName(String name);
-    
+
     /*
     /**********************************************************
     /* Public API, access to token information, text

diff --git a/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java b/src/main/java/com/fasterxml/jackson/core/filter/FilteringParserDelegate.java
@@ -184,7 +184,7 @@ public int getMatchCount() {
     public JsonStreamContext getParsingContext() {
         return _filterContext();
     }
-    
+
     // !!! TODO: Verify it works as expected: copied from standard JSON parser impl
     @Override
     public String getCurrentName() throws IOException {
@@ -196,6 +196,17 @@ public String getCurrentName() throws IOException {
         return ctxt.getCurrentName();
     }
 
+    // 2.13: IMPORTANT! Must override along with older getCurrentName()
+    @Override
+    public String currentName() throws IOException {
+        JsonStreamContext ctxt = _filterContext();
+        if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
+            JsonStreamContext parent = ctxt.getParent();
+            return (parent == null) ? null : parent.getCurrentName();
+        }
+        return ctxt.getCurrentName();
+    }
+
     /*
     /**********************************************************
     /* Public API, token state overrides
@@ -215,10 +226,9 @@ public void clearCurrentToken() {
 
     @Override
     public void overrideCurrentName(String name) {
-        /* 14-Apr-2015, tatu: Not sure whether this can be supported, and if so,
-         *    what to do with it... Delegation won't work for sure, so let's for
-         *    now throw an exception
-         */
+        // 14-Apr-2015, tatu: Not sure whether this can be supported, and if so,
+        //    what to do with it... Delegation won't work for sure, so let's for
+        //    now throw an exception
         throw new UnsupportedOperationException("Can not currently override name during filtering read");
     }
 
@@ -940,5 +950,4 @@ protected JsonStreamContext _filterContext() {
         }
         return _headContext;
     }
-
 }
diff --git a/.../failing/BasicParserFiltering700Test.java → ...n/core/filter/ParserFiltering700Test.java b/.../failing/BasicParserFiltering700Test.java → ...n/core/filter/ParserFiltering700Test.java
@@ -1,12 +1,10 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.core.filter;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.core.filter.FilteringParserDelegate;
-import com.fasterxml.jackson.core.filter.TokenFilter;
 import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
 
 @SuppressWarnings("resource")
-public class BasicParserFiltering700Test extends BaseTest
+public class ParserFiltering700Test extends BaseTest
 {
     static class NoTypeFilter extends TokenFilter {
         @Override
@@ -29,14 +27,14 @@ protected boolean _includeScalar() {
     /**********************************************************************
      */
 
-    private final JsonFactory JSON_F = new JsonFactory();
+    private final JsonFactory JSON_F = newStreamFactory();
 
     // [core#700], simplified
     public void testSkippingRootLevel() throws Exception
     {
         final String json = a2q("{'@type':'yyy','value':12}");
         // should become: {"value":12}
-        JsonParser p0 = JSON_F.createParser(json);
+        JsonParser p0 = _createParser(JSON_F, json);
         JsonParser p = new FilteringParserDelegate(p0,
                 new NoTypeFilter(),
                 Inclusion.INCLUDE_ALL_AND_PATH,
@@ -61,7 +59,7 @@ public void testSkippingOneNested() throws Exception
     {
         final String json = a2q("{'value':{'@type':'yyy','a':12}}");
         // should become: {"value":{"a":12}}
-        JsonParser p0 = JSON_F.createParser(json);
+        JsonParser p0 = _createParser(JSON_F, json);
         JsonParser p = new FilteringParserDelegate(p0,
                 new NoTypeFilter(),
                 Inclusion.INCLUDE_ALL_AND_PATH,
@@ -92,7 +90,7 @@ public void testSkippingForSingleWithPath() throws Exception
         final String json = a2q("{'@type':'xxx','value':{'@type':'yyy','a':99}}");
         // should become: {"value":{"a":99}}
 
-        JsonParser p0 = JSON_F.createParser(json);
+        JsonParser p0 = _createParser(JSON_F, json);
         JsonParser p = new FilteringParserDelegate(p0,
                 new NoTypeFilter(),
                 Inclusion.INCLUDE_ALL_AND_PATH,
@@ -116,4 +114,8 @@ public void testSkippingForSingleWithPath() throws Exception
 
         p.close();
     }
+
+    private JsonParser _createParser(TokenStreamFactory f, String json) throws Exception {
+        return f.createParser(json);
+    }
 }