Fixed FasterXML#2840 (wasn't using passed-in PolymorphicTypeValidator)

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -1144,3 +1144,7 @@ Joshua Shannon (retrodaredevil@github)
 Daniel Hrabovcak (TheSpiritXIII@github)
   * Reported #2796: `TypeFactory.constructType()` does not take `TypeBindings` correctly
   (2.11.2)
+
+Daniel Wu (DanielYWoo@github)
+  * Reported #2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
+  (2.11.3)

release-notes/VERSION-2.x

@@ -4,6 +4,12 @@ Project: jackson-databind
 === Releases === 
 ------------------------------------------------------------------------
 
+2.11.3 (not yet released)
+
+#2840: `ObjectMapper.activateDefaultTypingAsProperty()` is not using
+  parameter `PolymorphicTypeValidator`
+ (reported by Daniel W)
+
 2.11.2 (02-Aug-2020)
 
 #2783: Parser/Generator features not set when using `ObjectMapper.createParser()`,

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -1962,8 +1962,7 @@ public ObjectMapper activateDefaultTypingAsProperty(PolymorphicTypeValidator ptv
             DefaultTyping applicability, String propertyName)
     {
         TypeResolverBuilder<?> typer = _constructDefaultTypeResolverBuilder(applicability,
-                getPolymorphicTypeValidator());
-
+                ptv);
         // we'll always use full class name, when using defaulting
         typer = typer.init(JsonTypeInfo.Id.CLASS, null);
         typer = typer.inclusion(JsonTypeInfo.As.PROPERTY);

src/test/java/com/fasterxml/jackson/databind/jsontype/deftyping/TestDefaultForObject.java

@@ -2,11 +2,15 @@
 
 import java.util.*;
 
-
 import com.fasterxml.jackson.core.*;
+
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.cfg.MapperConfig;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 
@@ -78,11 +82,20 @@ static class DiscussBean extends DomainBean {
         public String subject;
     }
 
-    static public class DomainBeanWrapper {
+    static class DomainBeanWrapper {
         public String name;
         public Object myBean;
     }
 
+    @SuppressWarnings("serial")
+    static class BlockAllPTV extends PolymorphicTypeValidator.Base
+    {
+        @Override
+        public Validity validateBaseType(MapperConfig<?> config, JavaType baseType) {
+            return Validity.DENIED;
+        }
+    }
+
     /*
     /**********************************************************
     /* Unit tests
@@ -130,6 +143,23 @@ public void testBeanAsObjectUsingAsProperty() throws Exception
         assertEquals(StringBean.class, result.getClass());
         assertEquals("abc", ((StringBean) result).name);
     }
+
+    // [databind#2840]: ensure "as-property" uses PTV passed
+    public void testAsPropertyWithPTV() throws Exception {
+        ObjectMapper m = JsonMapper.builder()
+                .activateDefaultTypingAsProperty(new BlockAllPTV(),
+                        ObjectMapper.DefaultTyping.NON_FINAL,
+                        "@classy")
+                .build();
+        String json = m.writeValueAsString(new StringBean("abc"));
+        try {
+            /*Object result =*/ m.readValue(json, Object.class);
+            fail("Should not pass");
+        } catch (InvalidDefinitionException e) {
+            verifyException(e, "Configured `PolymorphicTypeValidator`");
+            verifyException(e, "denied resolution of all subtypes of ");
+        }
+    }
 
     /**
      * Unit test that verifies that an abstract bean is stored with type information