Fix #1122, #1197

Author: cowtowncoder

release-notes/VERSION

@@ -6,6 +6,7 @@ Project: jackson-databind
 
 2.7.4 (not yet released)
 
+#1122: Jackson 2.7 and Lombok: 'Conflicting/ambiguous property name definitions'
 #1178: `@JsonSerialize(contentAs=superType)` behavior disallowed in 2.7
 #1186: SimpleAbstractTypeResolver breaks generic parameters
  (reported by tobiash@github)
@@ -15,6 +16,7 @@ Project: jackson-databind
 #1194: Incorrect signature for generic type via `JavaType.getGenericSignature
 #1195: `JsonMappingException` not Serializable due to 2.7 reference to source (parser)
  (reported by mjustin@github)
+#1197: `SNAKE_CASE` doesn't work when using Lombok's `@AllArgsConstructor`
 #1198: Problem with `@JsonTypeInfo.As.EXTERNAL_PROPERTY`, `defaultImpl`, missing type id, NPE
 #1203: `@JsonTypeInfo` does not work correctly for ReferenceTypes like `AtomicReference`
 - Improve handling of custom content (de)serializers for `AtomicReference`

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

@@ -80,7 +80,29 @@ public class JacksonAnnotationIntrospector
      * @since 2.7
      */
     protected transient LRUMap<Class<?>,Boolean> _annotationsInside = new LRUMap<Class<?>,Boolean>(48, 48);
-    
+
+    /*
+    /**********************************************************
+    /* Local configuration settings
+    /**********************************************************
+     */
+
+    /**
+     * See {@link #setConstructorPropertiesImpliesCreator(boolean)} for
+     * explanation.
+     *<p>
+     * Defaults to true.
+     * 
+     * @since 2.7.4
+     */
+    protected boolean _cfgConstructorPropertiesImpliesCreator = true;
+
+    /*
+    /**********************************************************
+    /* Life-cycle
+    /**********************************************************
+     */
+
     public JacksonAnnotationIntrospector() { }
 
     @Override
@@ -95,6 +117,28 @@ protected Object readResolve() {
         return this;
     }
 
+    /*
+    /**********************************************************
+    /* Configuration
+    /**********************************************************
+     */
+
+    /**
+     * Method for changing behavior of {@link java.beans.ConstructorProperties}:
+     * if set to `true`, existence DOES indicate that the given constructor should
+     * be considered a creator; `false` that it should NOT be considered a creator
+     * without explicit use of <code>JsonCreator</code> annotation.
+     *<p>
+     * Default setting is `true`
+     *
+     * @since 2.7.4
+     */
+    public JacksonAnnotationIntrospector setConstructorPropertiesImpliesCreator(boolean b)
+    {
+        _cfgConstructorPropertiesImpliesCreator = b;
+        return this;
+    }
+    
     /*
     /**********************************************************
     /* General annotation properties
@@ -294,10 +338,9 @@ public VisibilityChecker<?> findAutoDetectVisibility(AnnotatedClass ac,
      */
 
     @Override
-    public String findImplicitPropertyName(AnnotatedMember param) {
-        // not known by default (until JDK8) for creators; default 
-        //
-        return null;
+    public String findImplicitPropertyName(AnnotatedMember m) {
+        PropertyName n = _findConstructorName(m);
+        return (n == null) ? null : n.getSimpleName();
     }
 
     @Override
@@ -866,10 +909,6 @@ public PropertyName findNameForSerialization(Annotated a)
         if (pann != null) {
             return PropertyName.construct(pann.value());
         }
-        PropertyName ctorName = _findConstructorName(a);
-        if (ctorName != null) {
-            return ctorName;
-        }
         if (_hasOneOf(a, ANNOTATIONS_TO_INFER_SER)) {
             return PropertyName.USE_DEFAULT;
         }
@@ -1019,10 +1058,6 @@ public PropertyName findNameForDeserialization(Annotated a)
         if (pann != null) {
             return PropertyName.construct(pann.value());
         }
-        PropertyName ctorName = _findConstructorName(a);
-        if (ctorName != null) {
-            return ctorName;
-        }
         if (_hasOneOf(a, ANNOTATIONS_TO_INFER_DESER)) {
             return PropertyName.USE_DEFAULT;
         }
@@ -1059,11 +1094,15 @@ public boolean hasCreatorAnnotation(Annotated a)
          if (ann != null) {
              return (ann.mode() != JsonCreator.Mode.DISABLED);
          }
-         if (a instanceof AnnotatedConstructor) {
-             if (_jdk7Helper != null) {
-                 Boolean b = _jdk7Helper.hasCreatorAnnotation(a);
-                 if (b != null) {
-                     return b.booleanValue();
+         // 19-Apr-2016, tatu: As per [databind#1197], [databind#1122] (and some related),
+         //    may or may not consider it a creator
+         if (_cfgConstructorPropertiesImpliesCreator ) {
+             if (a instanceof AnnotatedConstructor) {
+                 if (_jdk7Helper != null) {
+                     Boolean b = _jdk7Helper.hasCreatorAnnotation(a);
+                     if (b != null) {
+                         return b.booleanValue();
+                     }
                  }
              }
          }

src/test/java/com/fasterxml/jackson/databind/creators/CreatorPropertiesTest.java

@@ -2,6 +2,7 @@
 
 import java.beans.ConstructorProperties;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.*;
 
 public class CreatorPropertiesTest extends BaseMapTest
@@ -22,6 +23,29 @@ public Issue905Bean(int a, int b) {
         }
     }
 
+    // for [databind#1122]
+    static class Ambiguity {
+
+        @JsonProperty("bar")
+        private int foo;
+
+        protected Ambiguity() {}
+
+        @ConstructorProperties({ "foo" })
+        public Ambiguity(int foo) {
+            this.foo = foo;
+        }
+
+        public int getFoo() {
+            return foo;
+        }
+
+        @Override
+        public String toString() {
+            return "Ambiguity [foo=" + foo + "]";
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods
@@ -38,4 +62,13 @@ public void testCreatorPropertiesAnnotation() throws Exception
         assertEquals(2, b._x);
         assertEquals(3, b._y);
     }
+
+    // [databind#1122]
+    public void testPossibleNamingConflict() throws Exception
+    {
+        String json = "{\"bar\":3}";
+        Ambiguity amb = MAPPER.readValue(json, Ambiguity.class);
+        assertNotNull(amb);
+        assertEquals(3, amb.getFoo());
+    }
 }