Bit of tweaking for #1631 to try to prevent accidental application. Also renamed feature as MapperFeature.CREATOR_MODE_DEFAULT_PROPERTIES

Author: cowtowncoder

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

@@ -215,13 +215,20 @@ public enum MapperFeature implements ConfigFeature
     INFER_CREATOR_FROM_CONSTRUCTOR_PROPERTIES(true),
 
     /**
-     * Feature that determines handling of creators.
-     * When enabled, in a case where JsonCreator mode can't be resolved it will be
-     * resolved as {@link JsonCreator.Mode.PROPERTIES} instead.
+     * Feature that determines whether single-argument creator without explicit
+     * mode definition should be assumed to be "property-based" creator (expect JSON
+     * Obejct, bind named property that matches argument name) or not.
+     * If not, default logic usually chooses "delegating" mode instead (input value directly bound
+     * to nominal type of the argument, ignoring its name, if any).
+     * If feature is enabled, type is assumed to be "property-based"; if disabled,
+     * heuristics will be used to try to determine better match, usually leading
+     * to choice of "delegating" mode.
+     *<p>
+     * Feature is disabled by default for backwards compatibility.
      *
      * @since 2.9
      */
-    SET_PROPERTY_CREATOR_AS_DEFAULT(false),
+    CREATOR_MODE_DEFAULT_PROPERTIES(false),
 
     /*
     /******************************************************

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -5,6 +5,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.annotation.JsonCreator.Mode;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.*;
@@ -1303,7 +1304,12 @@ public JsonCreator.Mode findCreatorBinding(Annotated a) {
     public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated a) {
         JsonCreator ann = _findAnnotation(a, JsonCreator.class);
         if (ann != null) {
-            return ann.mode();
+            JsonCreator.Mode mode = ann.mode();
+            if ((mode == Mode.DEFAULT)
+                    && config.isEnabled(MapperFeature.CREATOR_MODE_DEFAULT_PROPERTIES)) {
+                mode = JsonCreator.Mode.PROPERTIES;
+            }
+            return mode;
         }
 
         if (_cfgConstructorPropertiesImpliesCreator
@@ -1320,11 +1326,6 @@ public JsonCreator.Mode findCreatorAnnotation(MapperConfig<?> config, Annotated
                 }
             }
         }
-
-        if(config.isEnabled(MapperFeature.SET_PROPERTY_CREATOR_AS_DEFAULT)) {
-            return JsonCreator.Mode.PROPERTIES;
-        }
-
         return null;
     }
 

src/test/java/com/fasterxml/jackson/databind/creators/ArrayDelegatorCreatorForCollectionTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/ArrayDelegatorCreatorForCollectionTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.util.Collections;
 import java.util.Set;

src/test/java/com/fasterxml/jackson/databind/creators/BigCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/BigCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/CreatorPropertiesTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.beans.ConstructorProperties;
 

src/test/java/com/fasterxml/jackson/databind/creators/CreatorWithObjectIdTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorWithObjectIdTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.beans.ConstructorProperties;
 

src/test/java/com/fasterxml/jackson/databind/creators/DelegatingCreatorImplicitNames1001Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingCreatorImplicitNames1001Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;

src/test/java/com/fasterxml/jackson/databind/creators/DelegatingExternalProperty1003Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/DelegatingExternalProperty1003Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/DisablingCreatorsTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/DisablingCreatorsTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/test/java/com/fasterxml/jackson/databind/creators/EnumCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/EnumCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.math.BigDecimal;
 import java.util.*;

src/test/java/com/fasterxml/jackson/databind/creators/FailOnNullCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/FailOnNullCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/test/java/com/fasterxml/jackson/databind/creators/ImplicitNameMatch792Test.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/ImplicitNameMatch792Test.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;

src/test/java/com/fasterxml/jackson/databind/creators/ImplicitParamsForCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/ImplicitParamsForCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;

src/test/java/com/fasterxml/jackson/databind/creators/InnerClassCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/InnerClassCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/test/java/com/fasterxml/jackson/databind/creators/MultiArgConstructorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/MultiArgConstructorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

src/test/java/com/fasterxml/jackson/databind/creators/RequiredCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/RequiredCreatorTest.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/SingleArgCreatorTest.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/SingleArgCreatorTest.java

@@ -1,4 +1,6 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
+
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
@@ -139,6 +141,16 @@ public static SingleArgWithImplicit from(XY v) {
         public XY getFoobar() { return _value; }
     }
 
+    // [databind#1631]
+    static class SingleArg1631 {
+        Object value;
+
+        @JsonCreator // but no mode!
+        public SingleArg1631(Object arg) {
+            value = arg;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -207,5 +219,25 @@ public void testSingleImplicitDelegating() throws Exception
         assertEquals(1, v.x);
         assertEquals(2, v.y);
     }
-}
 
+    // [databind#1631]
+    public void testSingleArgAsPropertiesViaFeature() throws Exception
+    {
+        // First things first: should default to delegating, in absence of anything else:
+        SingleArg1631 result = MAPPER.readValue(quote("zap"), SingleArg1631.class);
+        assertEquals("zap", result.value);
+        
+        // and should bind to Map if given JSON Object (since nominal type Object)
+        final String json = aposToQuotes("{'ctor':'ding'}");
+        result = MAPPER.readValue(json, SingleArg1631.class);
+        assertTrue(result.value instanceof Map<?,?>);
+
+        // But change of defaults should work wonders:
+        final ObjectMapper mapper = new ObjectMapper();
+        mapper.enable(MapperFeature.CREATOR_MODE_DEFAULT_PROPERTIES);
+        mapper.setAnnotationIntrospector(new MyParamIntrospector("ctor"));
+        
+        result = mapper.readValue(json, SingleArg1631.class);
+        assertEquals("ding", result.value);
+    }
+}

src/test/java/com/fasterxml/jackson/databind/creators/TestConstructFromMap.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestConstructFromMap.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.math.BigDecimal;
 import java.util.*;

src/test/java/com/fasterxml/jackson/databind/creators/TestCreatorNullValue.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorNullValue.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 import java.util.UUID;

src/test/java/com/fasterxml/jackson/databind/creators/TestCreatorWithNamingStrategy556.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorWithNamingStrategy556.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.*;

src/test/java/com/fasterxml/jackson/databind/creators/TestCreatorWithPolymorphic113.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorWithPolymorphic113.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestCreators.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestCreators2.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators2.java

@@ -1,5 +1,5 @@
 
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 import java.util.List;

src/test/java/com/fasterxml/jackson/databind/creators/TestCreators421.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators421.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/test/java/com/fasterxml/jackson/databind/creators/TestCreators541.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators541.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.util.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestCreatorsDelegating.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorsDelegating.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestCreatorsWithIdentity.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorsWithIdentity.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestCustomValueInstDefaults.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCustomValueInstDefaults.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestPolymorphicCreators.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestPolymorphicCreators.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 

src/test/java/com/fasterxml/jackson/databind/creators/TestPolymorphicDelegating.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestPolymorphicDelegating.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;

src/test/java/com/fasterxml/jackson/databind/creators/TestValueInstantiator.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/creators/TestValueInstantiator.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.creators;
+package com.fasterxml.jackson.databind.deser.creators;
 
 import java.io.IOException;
 import java.util.ArrayList;