Fix #4530: make ConstructorDetector accessible on serialiation side too (#4531)

Author: cowtowncoder

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

@@ -914,6 +914,7 @@ public final JsonNodeFactory getNodeFactory() {
     /**
      * @since 2.12
      */
+    @Override // since 2.18
     public ConstructorDetector getConstructorDetector() {
         if (_ctorDetector == null) {
             return ConstructorDetector.DEFAULT;

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

@@ -2305,6 +2305,8 @@ public ObjectMapper setNodeFactory(JsonNodeFactory f) {
      */
     public ObjectMapper setConstructorDetector(ConstructorDetector cd) {
         _deserializationConfig = _deserializationConfig.with(cd);
+        // since 2.18
+        _serializationConfig = _serializationConfig.with(cd);
         return this;
     }
 

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

@@ -60,6 +60,11 @@ public final class SerializationConfig
      */
     protected final PrettyPrinter _defaultPrettyPrinter;
 
+    /**
+     * @since 2.18 (only in DeserializationConfig from 2.12)
+     */
+    protected final ConstructorDetector _ctorDetector;
+
     /*
     /**********************************************************
     /* Serialization features
@@ -120,6 +125,7 @@ public SerializationConfig(BaseSettings base,
         _serFeatures = SER_FEATURE_DEFAULTS;
         _filterProvider = null;
         _defaultPrettyPrinter = DEFAULT_PRETTY_PRINTER;
+        _ctorDetector = null;
         _generatorFeatures = 0;
         _generatorFeaturesToChange = 0;
         _formatWriteFeatures = 0;
@@ -151,6 +157,7 @@ protected SerializationConfig(SerializationConfig src,
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -170,6 +177,7 @@ private SerializationConfig(SerializationConfig src, SubtypeResolver str)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -185,6 +193,7 @@ private SerializationConfig(SerializationConfig src,
         _serFeatures = serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = generatorFeatures;
         _generatorFeaturesToChange = generatorFeatureMask;
         _formatWriteFeatures = formatFeatures;
@@ -197,6 +206,7 @@ private SerializationConfig(SerializationConfig src, BaseSettings base)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -209,6 +219,7 @@ private SerializationConfig(SerializationConfig src, FilterProvider filters)
         _serFeatures = src._serFeatures;
         _filterProvider = filters;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -221,6 +232,7 @@ private SerializationConfig(SerializationConfig src, Class<?> view)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -233,6 +245,7 @@ private SerializationConfig(SerializationConfig src, PropertyName rootName)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -248,6 +261,7 @@ protected SerializationConfig(SerializationConfig src, ContextAttributes attrs)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -263,6 +277,7 @@ protected SerializationConfig(SerializationConfig src, SimpleMixInResolver mixin
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -278,6 +293,7 @@ protected SerializationConfig(SerializationConfig src, PrettyPrinter defaultPP)
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = defaultPP;
+        _ctorDetector = src._ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -293,6 +309,23 @@ protected SerializationConfig(SerializationConfig src, DatatypeFeatures dtFeatur
         _serFeatures = src._serFeatures;
         _filterProvider = src._filterProvider;
         _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = src._ctorDetector;
+        _generatorFeatures = src._generatorFeatures;
+        _generatorFeaturesToChange = src._generatorFeaturesToChange;
+        _formatWriteFeatures = src._formatWriteFeatures;
+        _formatWriteFeaturesToChange = src._formatWriteFeaturesToChange;
+    }
+
+    /**
+     * @since 2.18
+     */
+    protected SerializationConfig(SerializationConfig src, ConstructorDetector ctorDetector)
+    {
+        super(src);
+        _serFeatures = src._serFeatures;
+        _filterProvider = src._filterProvider;
+        _defaultPrettyPrinter = src._defaultPrettyPrinter;
+        _ctorDetector = ctorDetector;
         _generatorFeatures = src._generatorFeatures;
         _generatorFeaturesToChange = src._generatorFeaturesToChange;
         _formatWriteFeatures = src._formatWriteFeatures;
@@ -724,6 +757,16 @@ public SerializationConfig withDefaultPrettyPrinter(PrettyPrinter pp) {
         return (_defaultPrettyPrinter == pp) ? this:  new SerializationConfig(this, pp);
     }
 
+    /**
+     * @since 2.18
+     */
+    public SerializationConfig with(ConstructorDetector ctorDetector) {
+        if (_ctorDetector == ctorDetector) {
+            return this;
+        }
+        return new SerializationConfig(this, ctorDetector);
+    }
+
     /*
     /**********************************************************
     /* Factories for objects configured here
@@ -892,6 +935,14 @@ public PrettyPrinter getDefaultPrettyPrinter() {
         return _defaultPrettyPrinter;
     }
 
+    @Override // since 2.18
+    public ConstructorDetector getConstructorDetector() {
+        if (_ctorDetector == null) {
+            return ConstructorDetector.DEFAULT;
+        }
+        return _ctorDetector;
+    }
+
     /*
     /**********************************************************
     /* Introspection methods

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java

@@ -691,6 +691,11 @@ public CacheProvider getCacheProvider() {
         return _base.getCacheProvider();
     }
 
+    /**
+     * @since 2.18 (in DeserializationConfig-only since 2.12)
+     */
+    public abstract ConstructorDetector getConstructorDetector();
+
     /*
     /**********************************************************
     /* Methods for instantiating handlers