Merge branch '2.11'

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -39,6 +39,8 @@ Project: jackson-databind
  (reported by Fabian L)
 #2560: Check `WRAP_EXCEPTIONS` in `CollectionDeserializer.handleNonArray()`
  (reported by Stefan W)
+#2564: Fix `IllegalArgumentException` on empty input collection for `ArrayBlockingQueue`
+ (repoted, fix suggested by yamert89@github)
 #2567: Incorrect target type for arrays when providing nulls and nulls are disabled
  (reported by João G)
 

src/main/java/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.java

@@ -92,11 +92,13 @@ public Collection<Object> deserialize(JsonParser p, DeserializationContext ctxt,
         }
         // Ok: must point to START_ARRAY (or equivalent)
         if (!p.isExpectedStartArrayToken()) {
-            return handleNonArray(p, ctxt, new ArrayBlockingQueue<Object>(1));
+            return handleNonArray(p, ctxt, new ArrayBlockingQueue<>(1));
         }
-        result0 = super.deserialize(p, ctxt, new ArrayList<Object>());
-        if (result0.isEmpty()) return new ArrayBlockingQueue<Object>(1, false);
-        return new ArrayBlockingQueue<Object>(result0.size(), false, result0);
+        result0 = super.deserialize(p, ctxt, new ArrayList<>());
+        if (result0.isEmpty()) {
+            return new ArrayBlockingQueue<>(1, false);
+        }
+        return new ArrayBlockingQueue<>(result0.size(), false, result0);
     }
 
     @Override

src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapRelatedTypesDeserTest.java

@@ -8,7 +8,7 @@
 public class MapRelatedTypesDeserTest
     extends BaseMapTest
 {
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     /*
     /**********************************************************

src/test/java/com/fasterxml/jackson/databind/deser/jdk/TestEmptyArrayBlockingQueueDeser.java

@@ -0,0 +1,35 @@
+package com.fasterxml.jackson.databind.deser.jdk;
+
+import java.util.Collection;
+import java.util.concurrent.ArrayBlockingQueue;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+
+public class TestEmptyArrayBlockingQueueDeser extends BaseMapTest
+{
+    static class RemoteEntity{
+        private Collection<Double> values = new ArrayBlockingQueue<>(20);
+
+        public Collection<Double> getValues() {
+            return values;
+        }
+    }
+
+    static class Entity{
+        private ArrayBlockingQueue<Double> values;
+
+        public Collection<Double> getValues() {
+            return values;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    public void testEmptyBlockingQueue() throws Exception
+    {
+        String json = MAPPER.writeValueAsString(new RemoteEntity());
+        Entity entity = MAPPER.readValue(json, Entity.class);
+        assertEquals(0, entity.values.size());
+    }
+}