Fixed #1388

Author: cowtowncoder

release-notes/VERSION

@@ -6,6 +6,9 @@ Project: jackson-databind
 
 2.8.6 (not yet released)
 
+#1388: `@JsonIdentityInfo`: id has to be the first key in deserialization when
+  deserializing with `@JsonCreator`
+ (reported by moodysalem@github)
 #1425: `JsonNode.binaryValue()` ignores illegal character if it's the last one
  (reported by binoternary@github)
 #1453: `UntypedObjectDeserializer` does not retain `float` type (over `double`)

src/main/java/com/fasterxml/jackson/databind/deser/impl/PropertyValueBuffer.java

@@ -107,9 +107,8 @@ public final boolean hasParameter(SettableBeanProperty prop)
     {
         if (_paramsSeenBig == null) {
             return ((_paramsSeen >> prop.getCreatorIndex()) & 1) == 1;
-        } else {
-            return _paramsSeenBig.get(prop.getCreatorIndex());
         }
+        return _paramsSeenBig.get(prop.getCreatorIndex());
     }
 
     /**
@@ -250,6 +249,9 @@ public Object handleIdValue(final DeserializationContext ctxt, Object bean) thro
     public boolean isComplete() { return _paramsNeeded <= 0; }
 
     /**
+     * Method called to buffer value for given property, as well as check whether
+     * we now have values for all (creator) properties that we expect to get values for.
+     *
      * @return True if we have received all creator parameters
      * 
      * @since 2.6
@@ -265,14 +267,15 @@ public boolean assignParameter(SettableBeanProperty prop, Object value)
             if (old != newValue) {
                 _paramsSeen = newValue;
                 if (--_paramsNeeded <= 0) {
-                    return true;
+                    // 29-Nov-2016, tatu: But! May still require Object Id value
+                    return (_objectIdReader == null) || (_idValue != null);
                 }
             }
         } else {
             if (!_paramsSeenBig.get(ix)) {
                 _paramsSeenBig.set(ix);
                 if (--_paramsNeeded <= 0) {
-                    return true;
+                    // 29-Nov-2016, tatu: But! May still require Object Id value
                 }
             }
         }

src/test/java/com/fasterxml/jackson/failing/JsonIdentiyInfo1388Test.java renamed to src/test/java/com/fasterxml/jackson/databind/objectid/ObjectIdReordering1388Test.java

@@ -1,12 +1,12 @@
-package com.fasterxml.jackson.failing;
+package com.fasterxml.jackson.databind.objectid;
 
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 
-public class JsonIdentiyInfo1388Test extends BaseMapTest
+public class ObjectIdReordering1388Test extends BaseMapTest
 {
     @JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class)
     public static class NamedThing {
@@ -50,28 +50,33 @@ public void testDeserializationFinalClassJSOG() throws Exception
 
         final TypeReference<?> namedThingListType = new TypeReference<List<NamedThing>>() { };
 
-        final String jsog = mapper.writeValueAsString(Arrays.asList(thing, thing, thing));
         {
+            final String jsog = mapper.writeValueAsString(Arrays.asList(thing, thing, thing));
             final List<NamedThing> list = mapper.readValue(jsog, namedThingListType);
             _assertAllSame(list);
+            // this is the jsog representation of the list of 3 of the same item
+            assertTrue(jsog.equals("[{\"@id\":1,\"id\":\"a59aa02c-fe3c-43f8-9b5a-5fe01878a818\",\"name\":\"Hello\"},1,1]"));
         }
 
-        // this is the jsog representation of the list of 3 of the same item
-        assertTrue(jsog.equals("[{\"@id\":1,\"id\":\"a59aa02c-fe3c-43f8-9b5a-5fe01878a818\",\"name\":\"Hello\"},1,1]"));
-
         // now move it around it have forward references
-        final String forwardReferences = "[1,1,{\"@id\":1,\"id\":\"a59aa02c-fe3c-43f8-9b5a-5fe01878a818\",\"name\":\"Hello\"}]";
         // this works
         {
-            final List<NamedThing> forward = mapper.readValue(forwardReferences, namedThingListType);
+            final String json = "[1,1,{\"@id\":1,\"id\":\"a59aa02c-fe3c-43f8-9b5a-5fe01878a818\",\"name\":\"Hello\"}]";
+            final List<NamedThing> forward = mapper.readValue(json, namedThingListType);
+            _assertAllSame(forward);
+        }
+
+        // next, move @id to between properties
+        {
+            final String json = aposToQuotes("[{'id':'a59aa02c-fe3c-43f8-9b5a-5fe01878a818','@id':1,'name':'Hello'}, 1, 1]");
+            final List<NamedThing> forward = mapper.readValue(json, namedThingListType);
             _assertAllSame(forward);
         }
 
-        // now move the @id to be not the first key in the object
-        final String notFirstKey = "[1,1,{\"id\":\"a59aa02c-fe3c-43f8-9b5a-5fe01878a818\",\"name\":\"Hello\",\"@id\":1}]";
-        // this fails
+        // and last, move @id to be not the first key in the object
         {
-            final List<NamedThing> forward = mapper.readValue(notFirstKey, namedThingListType);
+            final String json = aposToQuotes("[{'id':'a59aa02c-fe3c-43f8-9b5a-5fe01878a818','name':'Hello','@id':1}, 1, 1]");
+            final List<NamedThing> forward = mapper.readValue(json, namedThingListType);
             _assertAllSame(forward);
         }
     }