Tweak PTV matchers to pass config/context

Author: cowtowncoder

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

@@ -38,15 +38,15 @@ public class BasicPolymorphicTypeValidator
      * (base type or resolved subtype)
      */
     public abstract static class TypeMatcher { // note: public since 2.11
-        public abstract boolean match(Class<?> clazz);
+        public abstract boolean match(MapperConfig<?> config, Class<?> clazz);
     }
 
     /**
      * General matcher interface (predicate) for validating unresolved
      * subclass class name.
      */
     public abstract static class NameMatcher { // note: public since 2.11
-        public abstract boolean match(String clazzName);
+        public abstract boolean match(MapperConfig<?> config, String clazzName);
     }
 
     /*
@@ -104,7 +104,7 @@ protected Builder() { }
         public Builder allowIfBaseType(final Class<?> baseOfBase) {
             return _appendBaseMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return baseOfBase.isAssignableFrom(clazz);
                 }
             });
@@ -130,7 +130,7 @@ public boolean match(Class<?> clazz) {
         public Builder allowIfBaseType(final Pattern patternForBase) {
             return _appendBaseMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return patternForBase.matcher(clazz.getName()).matches();
                 }
             });
@@ -150,7 +150,7 @@ public boolean match(Class<?> clazz) {
         public Builder allowIfBaseType(final String prefixForBase) {
             return _appendBaseMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return clazz.getName().startsWith(prefixForBase);
                 }
             });
@@ -207,7 +207,7 @@ public Builder denyForExactBaseType(final Class<?> baseTypeToDeny) {
         public Builder allowIfSubType(final Class<?> subTypeBase) {
             return _appendSubClassMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return subTypeBase.isAssignableFrom(clazz);
                 }
             });
@@ -232,7 +232,7 @@ public boolean match(Class<?> clazz) {
         public Builder allowIfSubType(final Pattern patternForSubType) {
             return _appendSubNameMatcher(new NameMatcher() {
                 @Override
-                public boolean match(String clazzName) {
+                public boolean match(MapperConfig<?> config, String clazzName) {
                     return patternForSubType.matcher(clazzName).matches();
                 }
             });
@@ -252,7 +252,7 @@ public boolean match(String clazzName) {
         public Builder allowIfSubType(final String prefixForSubType) {
             return _appendSubNameMatcher(new NameMatcher() {
                 @Override
-                public boolean match(String clazzName) {
+                public boolean match(MapperConfig<?> config, String clazzName) {
                     return clazzName.startsWith(prefixForSubType);
                 }
             });
@@ -290,7 +290,7 @@ public Builder allowIfSubType(final TypeMatcher matcher) {
         public Builder allowIfSubTypeIsArray() {
             return _appendSubClassMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return clazz.isArray();
                 }
             });
@@ -320,7 +320,7 @@ public boolean match(Class<?> clazz) {
         public Builder allowSubTypesWithExplicitDeserializer() {
             return _appendSubClassMatcher(new TypeMatcher() {
                 @Override
-                public boolean match(Class<?> clazz) {
+                public boolean match(MapperConfig<?> config, Class<?> clazz) {
                     return clazz.isArray();
                 }
             });
@@ -414,7 +414,7 @@ public Validity validateBaseType(MapperConfig<?> ctxt, JavaType baseType) {
         }
         if (_baseTypeMatchers != null) {
             for (TypeMatcher m : _baseTypeMatchers) {
-                if (m.match(rawBase)) {
+                if (m.match(ctxt, rawBase)) {
                     return Validity.ALLOWED;
                 }
             }
@@ -430,7 +430,7 @@ public Validity validateSubClassName(MapperConfig<?> ctxt, JavaType baseType,
 //System.err.println("validateSubClassName('"+subClassName+"')");
         if (_subTypeNameMatchers != null)  {
             for (NameMatcher m : _subTypeNameMatchers) {
-                if (m.match(subClassName)) {
+                if (m.match(ctxt, subClassName)) {
                     return Validity.ALLOWED;
                 }
             }
@@ -447,7 +447,7 @@ public Validity validateSubType(MapperConfig<?> ctxt, JavaType baseType, JavaTyp
         if (_subClassMatchers != null)  {
             final Class<?> subClass = subType.getRawClass();
             for (TypeMatcher m : _subClassMatchers) {
-                if (m.match(subClass)) {
+                if (m.match(ctxt, subClass)) {
                     return Validity.ALLOWED;
                 }
             }

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

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;
+import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
 import com.fasterxml.jackson.databind.jsontype.BasicPolymorphicTypeValidator;
 import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
@@ -49,7 +50,7 @@ public void testCustomBaseMatchers() throws Exception
         PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
                 .allowIfBaseType(new BasicPolymorphicTypeValidator.TypeMatcher() {
                     @Override
-                    public boolean match(Class<?> base) {
+                    public boolean match(MapperConfig<?> ctxt, Class<?> base) {
                         // Allow types within our packages
                         return base.getName().startsWith("com.fasterxml.");
                     }
@@ -81,7 +82,7 @@ public void testCustomSubtypeMatchers() throws Exception
         PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
                 .allowIfSubType(new BasicPolymorphicTypeValidator.TypeMatcher() {
                     @Override
-                    public boolean match(Class<?> clazz) {
+                    public boolean match(MapperConfig<?> ctxt, Class<?> clazz) {
                         // Allow anything that looks "Good" :)
                         return clazz.getSimpleName().endsWith("Good");
                     }