Add a test related to core/700, fix a minor problem in Map deserialization for "untyped"

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/deser/std/UntypedObjectDeserializer.java

@@ -492,7 +492,6 @@ protected Object mapArray(JsonParser p, DeserializationContext ctxt,
     protected Object mapObject(JsonParser p, DeserializationContext ctxt) throws IOException
     {
         String key1;
-
         JsonToken t = p.currentToken();
 
         if (t == JsonToken.START_OBJECT) {
@@ -802,7 +801,6 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object into
             if (_nonMerging) {
                 return deserialize(p, ctxt);
             }
-
             switch (p.currentTokenId()) {
             case JsonTokenId.ID_END_OBJECT:
             case JsonTokenId.ID_END_ARRAY:
@@ -920,7 +918,8 @@ protected Object[] mapArrayToArray(JsonParser p, DeserializationContext ctxt) th
         protected Object mapObject(JsonParser p, DeserializationContext ctxt) throws IOException
         {
             // will point to FIELD_NAME at this point, guaranteed
-            String key1 = p.getText();
+            // 19-Jul-2021, tatu: Was incorrectly using "getText()" before 2.13, fixed for 2.13.0
+            String key1 = p.currentName();
             p.nextToken();
             Object value1 = deserialize(p, ctxt);
 

src/test/java/com/fasterxml/jackson/databind/deser/filter/ParserFilterViaMapTest.java

@@ -0,0 +1,41 @@
+package com.fasterxml.jackson.databind.deser.filter;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.filter.FilteringParserDelegate;
+import com.fasterxml.jackson.core.filter.TokenFilter;
+import com.fasterxml.jackson.databind.*;
+
+public class ParserFilterViaMapTest extends BaseMapTest
+{
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    static class NoTypeFilter extends TokenFilter {
+        @Override
+        public TokenFilter includeProperty(String name) {
+            if ("@type".equals(name)) {
+                return null;
+            }
+            return this;
+        }
+    }
+
+    // From [core#700], to verify at databind level
+    // (and actually found a bug in doing so -- fixed for 2.13.0)
+    public void testSimplePropertyExcludeFilter() throws Exception
+    {
+        final String json = "{\"@type\":\"xxx\",\"a\":{\"@type\":\"yyy\",\"b\":11}}";
+        try (JsonParser p = new FilteringParserDelegate(
+                MAPPER.createParser(json),
+                new NoTypeFilter(),
+                TokenFilter.Inclusion.INCLUDE_ALL_AND_PATH,
+                true)) {
+            Map<?,?> map = MAPPER.readValue(p, Map.class);
+            Map<String, Object> EXP = Collections.singletonMap("a",
+                    Collections.singletonMap("b", Integer.valueOf(11)));
+            assertEquals(EXP, map);
+        }
+    }
+}