Merge branch '2.x' into 3.x

Author: cowtowncoder

src/main/java/tools/jackson/databind/deser/jdk/EnumSetDeserializer.java

@@ -110,12 +110,9 @@ protected EnumSetDeserializer withResolved(ValueDeserializer<?> deser,
     @Override
     public boolean isCachable() {
         // One caveat: content deserializer should prevent caching
-        if (_enumType.getValueHandler() != null) {
-            return false;
-        }
-        return true;
+        return _enumType.getValueHandler() == null;
     }
-    
+
     @Override // since 2.12
     public LogicalType logicalType() {
         return LogicalType.Collection;

src/main/java/tools/jackson/databind/deser/jdk/ObjectArrayDeserializer.java

@@ -193,7 +193,6 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
         Object[] chunk = buffer.resetAndStart();
         int ix = 0;
         JsonToken t;
-        final TypeDeserializer typeDeser = _elementTypeDeserializer;
 
         try {
             while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
@@ -205,10 +204,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
                         continue;
                     }
                     value = _nullProvider.getNullValue(ctxt);
-                } else if (typeDeser == null) {
-                    value = _elementDeserializer.deserialize(p, ctxt);
                 } else {
-                    value = _elementDeserializer.deserializeWithType(p, ctxt, typeDeser);
+                    value = _deserializeNoNullChecks(p, ctxt);
                 }
                 if (ix >= chunk.length) {
                     chunk = buffer.appendCompletedChunk(chunk);
@@ -263,7 +260,6 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt,
         int ix = intoValue.length;
         Object[] chunk = buffer.resetAndStart(intoValue, ix);
         JsonToken t;
-        final TypeDeserializer typeDeser = _elementTypeDeserializer;
 
         try {
             while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
@@ -274,10 +270,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt,
                         continue;
                     }
                     value = _nullProvider.getNullValue(ctxt);
-                } else if (typeDeser == null) {
-                    value = _elementDeserializer.deserialize(p, ctxt);
                 } else {
-                    value = _elementDeserializer.deserializeWithType(p, ctxt, typeDeser);
+                    value = _deserializeNoNullChecks(p, ctxt);
                 }
                 if (ix >= chunk.length) {
                     chunk = buffer.appendCompletedChunk(chunk);
@@ -315,7 +309,7 @@ protected Byte[] deserializeFromBase64(JsonParser p, DeserializationContext ctxt
         // But then need to convert to wrappers
         Byte[] result = new Byte[b.length];
         for (int i = 0, len = b.length; i < len; ++i) {
-            result[i] = Byte.valueOf(b[i]);
+            result[i] = b[i];
         }
         return result;
     }
@@ -371,11 +365,7 @@ protected Object handleNonArray(JsonParser p, DeserializationContext ctxt)
                 // if coercion failed, we can still add it to a list
             }
 
-            if (_elementTypeDeserializer == null) {
-                value = _elementDeserializer.deserialize(p, ctxt);
-            } else {
-                value = _elementDeserializer.deserializeWithType(p, ctxt, _elementTypeDeserializer);
-            }
+            value = _deserializeNoNullChecks(p, ctxt);
         }
         // Ok: bit tricky, since we may want T[], not just Object[]
         Object[] result;
@@ -388,5 +378,20 @@ protected Object handleNonArray(JsonParser p, DeserializationContext ctxt)
         result[0] = value;
         return result;
     }
+
+    /**
+     * Deserialize the content of the map.
+     * If _elementTypeDeserializer is null, use _elementDeserializer.deserialize; if non-null,
+     * use _elementDeserializer.deserializeWithType to deserialize value.
+     * This method only performs deserialization and does not consider _skipNullValues, _nullProvider, etc.
+     */
+    protected Object _deserializeNoNullChecks(JsonParser p, DeserializationContext ctxt)
+        throws JacksonException
+    {
+        if (_elementTypeDeserializer == null) {
+            return _elementDeserializer.deserialize(p, ctxt);
+        }
+        return _elementDeserializer.deserializeWithType(p, ctxt, _elementTypeDeserializer);
+    }
 }
 

src/main/java/tools/jackson/databind/deser/jdk/StringArrayDeserializer.java

@@ -37,25 +37,25 @@ public final class StringArrayDeserializer
     /**
      * Value serializer to use, if not the standard one (which is inlined)
      */
-    protected ValueDeserializer<String> _elementDeserializer;
+    private final ValueDeserializer<String> _elementDeserializer;
 
     /**
      * Handler we need for dealing with null values as elements
      */
-    protected final NullValueProvider _nullProvider;
+    private final NullValueProvider _nullProvider;
 
     /**
      * Specific override for this instance (from proper, or global per-type overrides)
      * to indicate whether single value may be taken to mean an unwrapped one-element array
      * or not. If null, left to global defaults.
      */
-    protected final Boolean _unwrapSingle;
+    private final Boolean _unwrapSingle;
 
     /**
      * Marker flag set if the <code>_nullProvider</code> indicates that all null
      * content values should be skipped (instead of being possibly converted).
      */
-    protected final boolean _skipNullValues;
+    private final boolean _skipNullValues;
 
     public StringArrayDeserializer() {
         this(null, null, null);

src/main/java/tools/jackson/databind/deser/jdk/StringCollectionDeserializer.java

@@ -32,20 +32,20 @@ public final class StringCollectionDeserializer
      * Value deserializer to use, if NOT the standard one
      * (if it is, will be null).
      */
-    protected final ValueDeserializer<String> _valueDeserializer;
+    private final ValueDeserializer<String> _valueDeserializer;
 
     // // Instance construction settings:
 
     /**
      * Instantiator used in case custom handling is needed for creation.
      */
-    protected final ValueInstantiator _valueInstantiator;
+    private final ValueInstantiator _valueInstantiator;
 
     /**
      * Deserializer that is used iff delegate-based creator is
      * to be used for deserializing from JSON Object.
      */
-    protected final ValueDeserializer<Object> _delegateDeserializer;
+    private final ValueDeserializer<Object> _delegateDeserializer;
 
     // NOTE: no PropertyBasedCreator, as JSON Arrays have no properties