Change visibility of PTV Matchers to allow use of custom matchers

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/jsontype/BasicPolymorphicTypeValidator.java

@@ -37,15 +37,15 @@ public class BasicPolymorphicTypeValidator
      * General matcher interface (predicate) for validating class values
      * (base type or resolved subtype)
      */
-    protected abstract static class TypeMatcher {
+    public abstract static class TypeMatcher { // note: public since 2.11
         public abstract boolean match(Class<?> clazz);
     }
 
     /**
      * General matcher interface (predicate) for validating unresolved
      * subclass class name.
      */
-    protected abstract static class NameMatcher {
+    public abstract static class NameMatcher { // note: public since 2.11
         public abstract boolean match(String clazzName);
     }
 
@@ -64,6 +64,11 @@ protected abstract static class NameMatcher {
      * rules are checked.
      */
     public static class Builder {
+        /**
+         * Optional set of base types (exact match) that are NOT accepted
+         * as base types for polymorphic properties. May be used to prevent "unsafe"
+         * base types like {@link java.lang.Object} or {@link java.io.Serializable}.
+         */
         protected Set<Class<?>> _invalidBaseTypes;
 
         /**
@@ -151,6 +156,21 @@ public boolean match(Class<?> clazz) {
             });
         }
 
+        /**
+         * Method for appending custom matcher called with base type: if matcher returns
+         * {@code true}, all possible subtypes will be accepted; if {@code false}, other
+         * matchers are applied.
+         * 
+         * @param matcher Custom matcher to apply to base type
+         *
+         * @return This Builder to allow call chaining
+         *
+         * @since 2.11
+         */
+        public Builder allowIfBaseType(final TypeMatcher matcher) {
+            return _appendBaseMatcher(matcher);
+        }
+        
         /**
          * Method for appending matcher that will mark any polymorphic properties with exact
          * specific class to be invalid.
@@ -238,6 +258,21 @@ public boolean match(String clazzName) {
             });
         }
 
+        /**
+         * Method for appending custom matcher called with resolved subtype: if matcher returns
+         * {@code true}, type will be accepted; if {@code false}, other
+         * matchers are applied.
+         * 
+         * @param matcher Custom matcher to apply to resolved subtype
+         *
+         * @return This Builder to allow call chaining
+         *
+         * @since 2.11
+         */
+        public Builder allowIfSubType(final TypeMatcher matcher) {
+            return _appendSubClassMatcher(matcher);
+        }
+
         /**
          * Method for appending matcher that will allow all subtypes that are Java arrays
          * (regardless of element type). Note that this does NOT validate element type

src/test/java/com/fasterxml/jackson/databind/jsontype/vld/CustomPTVMatchersTest.java

@@ -0,0 +1,52 @@
+package com.fasterxml.jackson.databind.jsontype.vld;
+
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
+import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
+import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
+import com.fasterxml.jackson.databind.jsontype.vld.BasicPTVWithArraysTest.Base2534;
+import com.fasterxml.jackson.databind.jsontype.vld.BasicPTVWithArraysTest.Good2534;
+import com.fasterxml.jackson.databind.jsontype.vld.BasicPTVWithArraysTest.ObjectWrapper;
+
+public class CustomPTVMatchersTest extends BaseMapTest
+{
+    static abstract class CustomBase {
+        public int x = 3;
+    }
+
+    static class CustomGood extends CustomBase {
+        protected CustomGood() { }
+        public CustomGood(int x) {
+            super();
+            this.x = x;
+        }
+    }
+
+    static class CustomBad extends CustomBase {
+        protected CustomBad() { }
+        public CustomBad(int x) {
+            super();
+            this.x = x;
+        }
+    }
+
+    static final class ObjectWrapper {
+        public Object value;
+
+        protected ObjectWrapper() { }
+        public ObjectWrapper(Object v) { value = v; }
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    public void testCustomBaseMatchers() throws Exception
+    {
+        // TO BE COMPLETED
+    }
+}