Merge branch '2.7' into 2.8

Author: cowtowncoder

release-notes/CREDITS

@@ -492,6 +492,10 @@ Josh Caplan (jecaplan@github)
     of non-ignored `processor` property (added in 2.7)
    (2.7.8)
 
+Diego de Estrada (diegode@github)
+  * Contributed fix for #1367: No Object Id found for an instance when using `@ConstructorProperties`
+   (2.7.9)
+
 Kevin Hogeland (khogeland@github)
   * Reported #1501: `ArrayIndexOutOfBoundsException` on non-static inner class constructor
    (2.7.9)

release-notes/VERSION

@@ -148,6 +148,8 @@ Project: jackson-databind
 
 2.7.9 (not released yet)
 
+#1367: No Object Id found for an instance when using `@ConstructorProperties`
+ (reported by kajo-bellabeat@github; fix by diegode@github)
 #1432: Off by 1 bug in PropertyValueBuffer
  (reported by Kevin D)
 #1439: NPE when using with filter id, serializing `java.util.Map` types

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java

@@ -389,6 +389,10 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
         for (; t == JsonToken.FIELD_NAME; t = p.nextToken()) {
             String propName = p.getCurrentName();
             p.nextToken(); // to point to value
+            // Object Id property?
+            if (buffer.readIdProperty(propName)) {
+                continue;
+            }
             // creator property?
             SettableBeanProperty creatorProp = creator.findCreatorProperty(propName);
             if (creatorProp != null) {
@@ -421,10 +425,6 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                 }
                 continue;
             }
-            // Object Id property?
-            if (buffer.readIdProperty(propName)) {
-                continue;
-            }
             // regular property? needs buffering
             SettableBeanProperty prop = _beanProperties.find(propName);
             if (prop != null) {

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

@@ -0,0 +1,50 @@
+package com.fasterxml.jackson.databind.creators;
+
+import java.beans.ConstructorProperties;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.fasterxml.jackson.databind.*;
+
+// for [databind#1367]
+public class CreatorWithObjectIdTest
+    extends BaseMapTest
+{
+    @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id")
+//            resolver = SimpleObjectIdResolver.class)
+    public static class A {
+        String id;
+        String name;
+
+        public A() { }
+
+        @ConstructorProperties({"id", "name"})
+        public A(String id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        public String getId() {
+            return id;
+        }
+        public void setId(String id) {
+            this.id = id;
+        }
+        public String getName() {
+            return name;
+        }
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    public void testObjectIdWithCreator() throws Exception
+    {
+        A a = new A("123", "A");
+
+        ObjectMapper om = new ObjectMapper();
+        String json = om.writeValueAsString(a);
+        A deser = om.readValue(json, A.class);
+        assertEquals(a.name, deser.name);
+    }
+}