Merge branch '2.8'

Author: cowtowncoder

release-notes/CREDITS

@@ -496,6 +496,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

@@ -57,8 +57,12 @@ Project: jackson-databind
 
 #935: `@JsonProperty(access = Access.READ_ONLY)` - unexpected behaviour
 #1317: '@JsonIgnore' annotation not working with creator properties, serialization
+#1367: No Object Id found for an instance when using `@ConstructorProperties`
 #1505: @JsonEnumDefaultValue should take precedence over FAIL_ON_NUMBERS_FOR_ENUMS
  (suggested by Stephan S)
+#1506: Missing `KeyDeserializer` for `CharSequence`
+#1513: `MapSerializer._orderEntries()` throws NPE when operating on `ConcurrentHashMap`
+ (reported by Sovietaced@github)
 - Simplified processing of class annotations (for `AnnotatedClass`) to try to
   solve rare concurrency problems with "root name" annotations.
 
@@ -197,6 +201,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) {
@@ -426,10 +430,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/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

@@ -1004,8 +1004,11 @@ protected Map<?,?> _orderEntries(Map<?,?> input, JsonGenerator gen,
         if (input instanceof SortedMap<?,?>) {
             return input;
         }
-        // [databind#1411]: TreeMap does not like null key...
-        if (input.containsKey(null)) {
+        // [databind#1411]: TreeMap does not like null key... (although note that
+        //   check above should prevent this code from being called in that case)
+        // [databind#153]: but, apparently, some custom Maps do manage hit this
+        //   problem.
+        if (_hasNullKey(input)) {
             TreeMap<Object,Object> result = new TreeMap<Object,Object>();
             for (Map.Entry<?,?> entry : input.entrySet()) {
                 Object key = entry.getKey();
@@ -1020,6 +1023,22 @@ protected Map<?,?> _orderEntries(Map<?,?> input, JsonGenerator gen,
         return new TreeMap<Object,Object>(input);
     }
 
+    /**
+     * @since 2.8.7
+     */
+    protected boolean _hasNullKey(Map<?,?> input) {
+        // 19-Feb-2017, tatu: As per [databind#1513] there are many cases where `null`
+        //   keys are not allowed, and even attempt to check for presence can cause
+        //   problems. Without resorting to external sorting (and internal API change),
+        //   or custom sortable Map implementation (more code) we can try black- or
+        //   white-listing (that is; either skip known problem cases; or only apply for
+        //   known good cases).
+        //   While my first instinct was to do black-listing (remove Hashtable and ConcurrentHashMap),
+        //   all in all it is probably better to just white list `HashMap` (and its sub-classes).
+        
+        return (input instanceof HashMap) && input.containsKey(null);
+    }
+    
     protected void _writeNullKeyedEntry(JsonGenerator gen, SerializerProvider provider,
             Object value) throws IOException
     {

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

@@ -1,12 +1,13 @@
-package com.fasterxml.jackson.failing;
+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.*;
 
-public class ObjectIdWithCreator1367Test
+// for [databind#1367]
+public class CreatorWithObjectIdTest
     extends BaseMapTest
 {
     @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "id")
@@ -37,7 +38,7 @@ public void setName(String name) {
         }
     }
 
-    public void testObjectIdWithCreator1367() throws Exception
+    public void testObjectIdWithCreator() throws Exception
     {
         A a = new A("123", "A");
 

src/test/java/com/fasterxml/jackson/databind/ser/TestMapSerialization.java

@@ -3,6 +3,7 @@
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
@@ -284,4 +285,29 @@ public void testNullJsonInTypedMap691() throws Exception {
         String json = mapper.writeValueAsString(map);
         assertEquals("{\"@class\":\"java.util.HashMap\",\"NULL\":null}", json);
     }
+
+    // [databind#1513]
+    public void testConcurrentMaps() throws Exception
+    {
+        final ObjectWriter w = MAPPER.writer(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
+
+        Map<String,String> input = new ConcurrentSkipListMap<String,String>();
+        input.put("x", "y");
+        input.put("a", "b");
+        String json = w.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'a':'b','x':'y'}"), json);
+
+        input = new ConcurrentHashMap<String,String>();
+        input.put("x", "y");
+        input.put("a", "b");
+        json = w.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'a':'b','x':'y'}"), json);
+
+        // One more: while not technically concurrent map at all, exhibits same issue
+        input = new Hashtable<String,String>();
+        input.put("x", "y");
+        input.put("a", "b");
+        json = w.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'a':'b','x':'y'}"), json);
+    }
 }