Fix #4263: remove generic type parameterization from ObjectArrayDeserializer (#4264)

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -22,6 +22,8 @@ Project: jackson-databind
 #4248: `ThrowableDeserializer` does not handle `null` well for `cause`
 #4250: Add input validation for `NumberDeserializers` deserializers
  for "stringified" FP numbers
+#4263: Change `ObjectArrayDeserializer` to use "generic" type parameter
+  (`java.lang.Object`) to remove co-variant return type
 
 2.16.1 (not yet released)
 

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

@@ -26,7 +26,8 @@
  */
 @JacksonStdImpl
 public class ObjectArrayDeserializer
-    extends ContainerDeserializerBase<Object[]>
+// Nominal type changes to `java.lang.Object` in 2.17; was `Object[]` before
+    extends ContainerDeserializerBase<Object>
     implements ContextualDeserializer
 {
     private static final long serialVersionUID = 1L;
@@ -189,7 +190,7 @@ public Object getEmptyValue(DeserializationContext ctxt) throws JsonMappingExcep
      */
 
     @Override
-    public Object[] deserialize(JsonParser p, DeserializationContext ctxt)
+    public Object deserialize(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {
         // Ok: must point to START_ARRAY (or equivalent)
@@ -240,7 +241,7 @@ public Object[] deserialize(JsonParser p, DeserializationContext ctxt)
     }
 
     @Override
-    public Object[] deserializeWithType(JsonParser p, DeserializationContext ctxt,
+    public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer)
         throws IOException
     {
@@ -250,11 +251,12 @@ public Object[] deserializeWithType(JsonParser p, DeserializationContext ctxt,
     }
 
     @Override // since 2.9
-    public Object[] deserialize(JsonParser p, DeserializationContext ctxt,
-            Object[] intoValue) throws IOException
+    public Object deserialize(JsonParser p, DeserializationContext ctxt,
+            Object intoValue0) throws IOException
     {
+        final Object[] intoValue = (Object[]) intoValue0;
         if (!p.isExpectedStartArrayToken()) {
-            Object[] arr = handleNonArray(p, ctxt);
+            Object[] arr = (Object[]) handleNonArray(p, ctxt);
             if (arr == null) {
                 return intoValue;
             }
@@ -324,7 +326,7 @@ protected Byte[] deserializeFromBase64(JsonParser p, DeserializationContext ctxt
         return result;
     }
 
-    protected Object[] handleNonArray(JsonParser p, DeserializationContext ctxt)
+    protected Object handleNonArray(JsonParser p, DeserializationContext ctxt)
         throws IOException
     {
         // Can we do implicit coercion to a single-element array still?
@@ -342,7 +344,7 @@ protected Object[] handleNonArray(JsonParser p, DeserializationContext ctxt)
                 // Second: empty (and maybe blank) String
                 return _deserializeFromString(p, ctxt);
             }
-            return (Object[]) ctxt.handleUnexpectedToken(_containerType, p);
+            return ctxt.handleUnexpectedToken(_containerType, p);
         }
 
         Object value;

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

@@ -260,7 +260,7 @@ protected long _parseLong(String key) throws IllegalArgumentException {
     }
 
     protected double _parseDouble(String key) throws IllegalArgumentException {
-        return NumberInput.parseDouble(key);
+        return NumberInput.parseDouble(key, false);
     }
 
     // @since 2.9