From 554b8530fd50c7a7bf96425ce9c82b775f0174d2 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Fri, 9 Sep 2022 16:33:17 +0800
Subject: [PATCH 01/15] add tuple type for list with fixed element types format

---
 .../deser/BasicDeserializerFactory.java       | 42 +++++---
 .../databind/deser/DeserializerCache.java     |  8 +-
 .../databind/deser/DeserializerFactory.java   |  8 +-
 .../databind/deser/std/TupleDeserializer.java | 95 +++++++++++++++++++
 .../jackson/databind/type/TupleType.java      | 27 ++++++
 .../jackson/databind/type/TypeBindings.java   | 28 +++++-
 .../jackson/databind/type/TypeFactory.java    | 26 ++---
 .../jackson/databind/ObjectMapperTest.java    | 46 +++++++--
 8 files changed, 241 insertions(+), 39 deletions(-)
 create mode 100644 src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
 create mode 100644 src/main/java/com/fasterxml/jackson/databind/type/TupleType.java

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
index e8ca72191e..7fb74da4cf 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java
@@ -716,7 +716,7 @@ protected void _addImplicitFactoryCreators(DeserializationContext ctxt,
                 }
                 continue;
             }
-            AnnotatedParameter nonAnnotatedParam = null;            
+            AnnotatedParameter nonAnnotatedParam = null;
             SettableBeanProperty[] properties = new SettableBeanProperty[argCount];
             int implicitNameCount = 0;
             int explicitNameCount = 0;
@@ -1474,6 +1474,18 @@ public JsonDeserializer<?> createCollectionLikeDeserializer(DeserializationConte
         return deser;
     }
 
+    @Override
+    public JsonDeserializer<?> createTupleDeserializer(DeserializationContext ctxt,
+            TupleType type, BeanDescription beanDesc)
+        throws JsonMappingException
+    {
+        CollectionType ct = ctxt.getTypeFactory().constructCollectionType(Collection.class,
+                TypeFactory.unknownType());
+        CollectionDeserializer deser = (CollectionDeserializer) createCollectionDeserializer(ctxt,
+                ct, beanDesc);
+        return new TupleDeserializer(deser, type);
+    }
+
     /*
     /**********************************************************
     /* DeserializerFactory impl: Map(-like) deserializers
@@ -2010,7 +2022,7 @@ public TypeDeserializer findPropertyTypeDeserializer(DeserializationConfig confi
         throws JsonMappingException
     {
         AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyTypeResolver(config, annotated, baseType);        
+        TypeResolverBuilder<?> b = ai.findPropertyTypeResolver(config, annotated, baseType);
         // Defaulting: if no annotations on member, check value class
         if (b == null) {
             return findTypeDeserializer(config, baseType);
@@ -2037,13 +2049,13 @@ public TypeDeserializer findPropertyTypeDeserializer(DeserializationConfig confi
      * 
      * @param containerType Type of property; must be a container type
      * @param propertyEntity Field or method that contains container property
-     */    
+     */
     public TypeDeserializer findPropertyContentTypeDeserializer(DeserializationConfig config,
             JavaType containerType, AnnotatedMember propertyEntity)
         throws JsonMappingException
     {
         AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        TypeResolverBuilder<?> b = ai.findPropertyContentTypeResolver(config, propertyEntity, containerType);        
+        TypeResolverBuilder<?> b = ai.findPropertyContentTypeResolver(config, propertyEntity, containerType);
         JavaType contentType = containerType.getContentType();
         // Defaulting: if no annotations on member, check class
         if (b == null) {
@@ -2086,13 +2098,17 @@ public JsonDeserializer<?> findDefaultDeserializer(DeserializationContext ctxt,
             return StringDeserializer.instance;
         }
         if (rawType == CLASS_ITERABLE) {
-            // [databind#199]: Can and should 'upgrade' to a Collection type:
-            TypeFactory tf = ctxt.getTypeFactory();
-            JavaType[] tps = tf.findTypeParameters(type, CLASS_ITERABLE);
-            JavaType elemType = (tps == null || tps.length != 1) ? TypeFactory.unknownType() : tps[0];
-            CollectionType ct = tf.constructCollectionType(Collection.class, elemType);
-            // Should we re-introspect beanDesc? For now let's not...
-            return createCollectionDeserializer(ctxt, ct, beanDesc);
+            if (type instanceof TupleType) {
+                return createTupleDeserializer(ctxt, (TupleType) type, beanDesc);
+            } else {
+                // [databind#199]: Can and should 'upgrade' to a Collection type:
+                TypeFactory tf = ctxt.getTypeFactory();
+                JavaType[] tps = tf.findTypeParameters(type, CLASS_ITERABLE);
+                // Should we re-introspect beanDesc? For now let's not...
+                JavaType elemType = (tps == null || tps.length != 1) ? TypeFactory.unknownType() : tps[0];
+                CollectionType ct = tf.constructCollectionType(Collection.class, elemType);
+                return createCollectionDeserializer(ctxt, ct, beanDesc);
+            }
         }
         if (rawType == CLASS_MAP_ENTRY) {
             // 28-Apr-2015, tatu: TypeFactory does it all for us already so
@@ -2375,7 +2391,7 @@ protected JavaType resolveMemberAndTypeAnnotations(DeserializationContext ctxt,
                 type = type.withContentValueHandler(cd);
             }
             TypeDeserializer contentTypeDeser = findPropertyContentTypeDeserializer(
-                    ctxt.getConfig(), type, (AnnotatedMember) member);            	
+                    ctxt.getConfig(), type, (AnnotatedMember) member);
             if (contentTypeDeser != null) {
                 type = type.withContentTypeHandler(contentTypeDeser);
             }
@@ -2418,7 +2434,7 @@ protected boolean _hasCreatorAnnotation(DeserializationContext ctxt,
         AnnotationIntrospector intr = ctxt.getAnnotationIntrospector();
         if (intr != null) {
             JsonCreator.Mode mode = intr.findCreatorAnnotation(ctxt.getConfig(), ann);
-            return (mode != null) && (mode != JsonCreator.Mode.DISABLED); 
+            return (mode != null) && (mode != JsonCreator.Mode.DISABLED);
         }
         return false;
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
index 69b4a2b204..3898e5bf27 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
@@ -79,7 +79,7 @@ Object writeReplace() {
 
     /**
      * Method that can be used to determine how many deserializers this
-     * provider is caching currently 
+     * provider is caching currently
      * (if it does caching: default implementation does)
      * Exact count depends on what kind of deserializers get cached;
      * default implementation caches only dynamically constructed deserializers,
@@ -101,7 +101,7 @@ public int cachedDeserializersCount() {
      * configuration changes for mapper than owns the provider.
      */
     public void flushCachedDeserializers() {
-        _cachedDeserializers.clear();       
+        _cachedDeserializers.clear();
     }
 
     /*
@@ -460,7 +460,7 @@ protected Converter<Object,Object> findConverter(DeserializationContext ctxt,
             return null;
         }
         return ctxt.converterInstance(a, convDef);
-    }    
+    }
     /**
      * Method called to see if given method has annotations that indicate
      * a more specific type than what the argument specifies.
@@ -503,7 +503,7 @@ private JavaType modifyTypeByAnnotation(DeserializationContext ctxt,
                         // keyType = type.getKeyType(); // just in case it's used below
                     }
                 }
-            }            
+            }
         }
         JavaType contentType = type.getContentType();
         if (contentType != null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerFactory.java b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerFactory.java
index 4451fccffe..6fb8503a67 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerFactory.java
@@ -10,7 +10,7 @@
  * {@link JsonDeserializer} instances (which are then cached by
  * context and/or dedicated cache).
  *<p>
- * Since there are multiple broad categories of deserializers, there are 
+ * Since there are multiple broad categories of deserializers, there are
  * multiple factory methods:
  *<ul>
  * <li>For JSON "Array" type, we need 2 methods: one to deal with expected
@@ -165,6 +165,10 @@ public abstract JsonDeserializer<?> createCollectionLikeDeserializer(Deserializa
             CollectionLikeType type, BeanDescription beanDesc)
         throws JsonMappingException;
 
+    public abstract JsonDeserializer<?> createTupleDeserializer(DeserializationContext ctxt,
+            TupleType type, BeanDescription beanDesc)
+        throws JsonMappingException;
+
     public abstract JsonDeserializer<?> createMapDeserializer(DeserializationContext ctxt,
             MapType type, BeanDescription beanDesc)
         throws JsonMappingException;
@@ -208,7 +212,7 @@ public abstract TypeDeserializer findTypeDeserializer(DeserializationConfig conf
      * given type as opposed to auto-generated "Bean" deserializer. Factory itself will check
      * for known JDK-provided types, but registered {@link com.fasterxml.jackson.databind.Module}s
      * are also called to see if they might provide explicit deserializer.
-     *<p> 
+     *<p>
      * Main use for this method is with Safe Default Typing (and generally Safe Polymorphic
      * Deserialization), during which it is good to be able to check that given raw type
      * is explicitly supported and as such "known type" (as opposed to potentially
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
new file mode 100644
index 0000000000..5e7c2d0375
--- /dev/null
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -0,0 +1,95 @@
+package com.fasterxml.jackson.databind.deser.std;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
+import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
+import com.fasterxml.jackson.databind.type.TupleType;
+import com.fasterxml.jackson.databind.util.ClassUtil;
+
+/**
+ * TupleDeserializer
+ */
+@JacksonStdImpl
+public class TupleDeserializer extends CollectionDeserializer {
+    private static final long serialVersionUID = 1L;
+
+    private CollectionDeserializer deser;
+
+    private List<JavaType> elementTypeList;
+
+    public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
+        super(deser);
+        this.deser = deser;
+        this.elementTypeList = tupleType.getBindings().getTypeParameters();
+    }
+
+    public CollectionDeserializer getCollectionDeserializer() {
+        return deser;
+    }
+
+    @Override
+    protected Collection<Object> _deserializeFromArray(JsonParser p, DeserializationContext ctxt,
+            Collection<Object> result)
+        throws IOException
+    {
+        // [databind#631]: Assign current value, to be accessible by custom serializers
+        p.setCurrentValue(result);
+
+        JsonDeserializer<Object> valueDes = null;
+        final TypeDeserializer typeDeser = _valueTypeDeserializer;
+        JsonToken t;
+        int idx = -1;
+        while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
+            try {
+                idx++;
+                Object value;
+                if (t == JsonToken.VALUE_NULL) {
+                    if (_skipNullValues) {
+                        continue;
+                    }
+                    value = this.deser._nullProvider.getNullValue(ctxt);
+                } else {
+                    valueDes = ctxt.findContextualValueDeserializer(elementTypeList.get(idx), null);
+                    if (typeDeser == null) {
+                        value = valueDes.deserialize(p, ctxt);
+                    } else {
+                        value = valueDes.deserializeWithType(p, ctxt, typeDeser);
+                    }
+                }
+                result.add(value);
+
+                /* 17-Dec-2017, tatu: should not occur at this level...
+            } catch (UnresolvedForwardReference reference) {
+                throw JsonMappingException
+                    .from(p, "Unresolved forward reference but no identity info", reference);
+                */
+            } catch (Exception e) {
+                boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
+                if (!wrap) {
+                    ClassUtil.throwIfRTE(e);
+                }
+                throw JsonMappingException.wrapWithPath(e, result, result.size());
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public CollectionDeserializer createContextual(DeserializationContext ctxt,
+            BeanProperty property) throws JsonMappingException
+    {
+        this.deser = deser.createContextual(ctxt, property);
+        return this;
+    }
+}
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
new file mode 100644
index 0000000000..1bf26dc24d
--- /dev/null
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
@@ -0,0 +1,27 @@
+package com.fasterxml.jackson.databind.type;
+
+/**
+ * Tuple types are defined as list with fixed element types format.
+ */
+public class TupleType extends SimpleType {
+    private static final long serialVersionUID = 1L;
+
+    private SimpleType base;
+
+    protected TupleType(SimpleType base) {
+        super(base);
+        this.base = base;
+    }
+
+    public SimpleType getSimpleType() {
+        return base;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder(40);
+        sb.append("[tuple type, class ").append(buildCanonicalName()).append(']');
+        return sb.toString();
+    }
+}
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
index b9422b2bc7..487df24245 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
@@ -64,6 +64,18 @@ private TypeBindings(String[] names, JavaType[] types, String[] uvars)
         _hashCode = h;
     }
 
+    private TypeBindings(String[] names, JavaType[] types)
+    {
+        _names = (names == null) ? NO_STRINGS : names;
+        _types = (types == null) ? NO_TYPES : types;
+        int h = 1;
+        for (int i = 0, len = _types.length; i < len; ++i) {
+            h += _types[i].hashCode();
+        }
+        _unboundVariables = null;
+        _hashCode = h;
+    }
+
     public static TypeBindings emptyBindings() {
         return EMPTY;
     }
@@ -117,6 +129,16 @@ public static TypeBindings create(Class<?> erasedType, JavaType[] types)
         return new TypeBindings(names, types, null);
     }
 
+    public static TypeBindings createTuple(JavaType[] types)
+    {
+        if (types == null) {
+            types = NO_TYPES;
+        }
+        TypeVariable<?>[] vars = Iterable.class.getTypeParameters();
+        String[] names = new String[] { vars[0].getName() };
+        return new TypeBindings(names, types);
+    }
+
     public static TypeBindings create(Class<?> erasedType, JavaType typeArg1)
     {
         // 30-Oct-2015, tatu: Minor optimization for relatively common cases
@@ -260,7 +282,7 @@ public boolean isEmpty() {
     /**
      * Returns number of bindings contained
      */
-    public int size() { 
+    public int size() {
         return _types.length;
     }
 
@@ -420,7 +442,7 @@ public static TypeVariable<?>[] paramsFor1(Class<?> erasedType)
                 return VARS_ITERABLE;
             }
             return erasedType.getTypeParameters();
-        }    
+        }
 
         public static TypeVariable<?>[] paramsFor2(Class<?> erasedType)
         {
@@ -434,7 +456,7 @@ public static TypeVariable<?>[] paramsFor2(Class<?> erasedType)
                 return VARS_LINKED_HASH_MAP;
             }
             return erasedType.getTypeParameters();
-        }    
+        }
     }
 
     /**
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index b3168c8b43..f3068526f2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -20,7 +20,7 @@
  * as well as many objects it constructs (like
 * {@link com.fasterxml.jackson.databind.DeserializationConfig} and
  * {@link com.fasterxml.jackson.databind.SerializationConfig})),
- * but usually those objects also 
+ * but usually those objects also
  * expose convenience methods (<code>constructType</code>).
  * So, you can do for example:
  *<pre>
@@ -227,7 +227,7 @@ protected TypeFactory(LookupCache<Object,JavaType> typeCache, TypeParser p,
      * {@link TypeModifier} added as the first modifier to call (in case there
      * are multiple registered).
      */
-    public TypeFactory withModifier(TypeModifier mod) 
+    public TypeFactory withModifier(TypeModifier mod)
     {
         LookupCache<Object,JavaType> typeCache = _typeCache;
         TypeModifier[] mods;
@@ -699,7 +699,7 @@ public JavaType[] findTypeParameters(JavaType type, Class<?> expType)
     /**
      * @deprecated Since 2.7 resolve raw type first, then find type parameters
      */
-    @Deprecated // since 2.7    
+    @Deprecated // since 2.7
     public JavaType[] findTypeParameters(Class<?> clz, Class<?> expType, TypeBindings bindings) {
         return findTypeParameters(constructType(clz, bindings), expType);
     }
@@ -707,7 +707,7 @@ public JavaType[] findTypeParameters(Class<?> clz, Class<?> expType, TypeBinding
     /**
      * @deprecated Since 2.7 resolve raw type first, then find type parameters
      */
-    @Deprecated // since 2.7    
+    @Deprecated // since 2.7
     public JavaType[] findTypeParameters(Class<?> clz, Class<?> expType) {
         return findTypeParameters(constructType(clz), expType);
     }
@@ -790,7 +790,7 @@ public JavaType constructType(TypeReference<?> typeRef)
      *
      * @return Fully resolve type
      *
-     * @since 2.12 as replacement for deprecated {@link #constructType(Type, TypeBindings)} 
+     * @since 2.12 as replacement for deprecated {@link #constructType(Type, TypeBindings)}
      */
     public JavaType resolveMemberType(Type type, TypeBindings contextBindings) {
         return _fromAny(null, type, contextBindings);
@@ -1033,6 +1033,10 @@ public JavaType constructSimpleType(Class<?> rawType, JavaType[] parameterTypes)
         return _fromClass(null, rawType, TypeBindings.create(rawType, parameterTypes));
     }
 
+    public JavaType constructTupleType(JavaType[] parameterTypes) {
+        return new TupleType((SimpleType) _fromClass(null, Iterable.class, TypeBindings.createTuple(parameterTypes)));
+    }
+
     /**
      * Method for constructing a type instance with specified parameterization.
      *
@@ -1045,7 +1049,7 @@ public JavaType constructSimpleType(Class<?> rawType, Class<?> parameterTarget,
             JavaType[] parameterTypes)
     {
         return constructSimpleType(rawType, parameterTypes);
-    } 
+    }
 
     /**
      * Method for constructing a {@link ReferenceType} instance with given type parameter
@@ -1066,7 +1070,7 @@ public JavaType constructReferenceType(Class<?> rawType, JavaType referredType)
     /**
      * Method that use by core Databind functionality, and that should NOT be called
      * by application code outside databind package.
-     *<p> 
+     *<p>
      * Unchecked here not only means that no checks are made as to whether given class
      * might be non-simple type (like {@link CollectionType}) but also that most of supertype
      * information is not gathered. This means that unless called on primitive types or
@@ -1506,7 +1510,7 @@ else if (superClass != null) {
             }
             // if not, perhaps we are now resolving a well-known class or interface?
             if (result == null) {
-                result = _fromWellKnownClass(context, rawType, bindings, superClass, superInterfaces); 
+                result = _fromWellKnownClass(context, rawType, bindings, superClass, superInterfaces);
                 if (result == null) {
                     result = _fromWellKnownInterface(context, rawType, bindings, superClass, superInterfaces);
                     if (result == null) {
@@ -1615,10 +1619,10 @@ protected JavaType _fromParamType(ClassStack context, ParameterizedType ptype,
 
         // First: what is the actual base type? One odd thing is that 'getRawType'
         // returns Type, not Class<?> as one might expect. But let's assume it is
-        // always of type Class: if not, need to add more code to resolve it to Class.        
+        // always of type Class: if not, need to add more code to resolve it to Class.
         Type[] args = ptype.getActualTypeArguments();
         int paramCount = (args == null) ? 0 : args.length;
-        TypeBindings newBindings;        
+        TypeBindings newBindings;
 
         if (paramCount == 0) {
             newBindings = EMPTY_BINDINGS;
@@ -1661,7 +1665,7 @@ protected JavaType _fromVariable(ClassStack context, TypeVariable<?> var, TypeBi
         // 15-Jan-2019, tatu: As weird as this looks, apparently on some platforms (Arm CPU, mobile
         //    devices), unsynchronized internal access can lead to issues, see:
         //
-        //  https://vmlens.com/articles/java-lang-reflect-typevariable-getbounds-is-not-thread-safe/  
+        //  https://vmlens.com/articles/java-lang-reflect-typevariable-getbounds-is-not-thread-safe/
         //
         //    No good way to reproduce but since this should not be on critical path, let's add
         //    syncing as it seems potentially necessary.
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index c465cf3068..61420a636d 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -1,8 +1,18 @@
 package com.fasterxml.jackson.databind;
 
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -10,14 +20,20 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.Nulls;
-import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.StreamReadFeature;
+import com.fasterxml.jackson.core.StreamWriteFeature;
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
-
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.node.*;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class ObjectMapperTest extends BaseMapTest
 {
@@ -544,4 +560,22 @@ public void testHasExplicitTimeZone() throws Exception
             assertEquals(DEFAULT_TZ, w2.getConfig().getTimeZone());
         }
     }
+
+    public void testReadValueByItemTypes() throws JsonMappingException, JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        JavaType[] elementJavaTypes = new JavaType[] {
+                mapper.getTypeFactory().constructType(Integer.class),
+                mapper.getTypeFactory().constructType(BigDecimal.class),
+                mapper.getTypeFactory().constructType(Long.class),
+                mapper.getTypeFactory().constructType(String.class)
+                };
+        JavaType javaType = mapper.getTypeFactory().constructTupleType(elementJavaTypes);
+        String content = "[1,2,3,null]";
+        List<Object> objectList = mapper.readValue(content, javaType);
+        assertEquals(new Integer(1), objectList.get(0));
+        assertEquals(new BigDecimal("2"), objectList.get(1));
+        assertEquals(new Long(3), objectList.get(2));
+        assertEquals(null, objectList.get(3));
+    }
+
 }

From efdc8163a374bd5317a11deec9acfad7ed7ceb51 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sat, 10 Sep 2022 13:13:30 +0800
Subject: [PATCH 02/15] fixed null value deserialization

---
 .../databind/deser/std/TupleDeserializer.java |  9 +++----
 .../jackson/databind/type/TypeBindings.java   | 12 ++++-----
 .../jackson/databind/type/TypeFactory.java    | 12 +++++++--
 .../jackson/databind/ObjectMapperTest.java    | 25 +++++++++++++++----
 4 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index 5e7c2d0375..09008ed3ba 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
+import com.fasterxml.jackson.databind.deser.NullValueProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.type.TupleType;
 import com.fasterxml.jackson.databind.util.ClassUtil;
@@ -53,14 +54,12 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
         while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
             try {
                 idx++;
+                valueDes = ctxt.findContextualValueDeserializer(elementTypeList.get(idx), null);
                 Object value;
                 if (t == JsonToken.VALUE_NULL) {
-                    if (_skipNullValues) {
-                        continue;
-                    }
-                    value = this.deser._nullProvider.getNullValue(ctxt);
+                    NullValueProvider nuller = findContentNullProvider(ctxt, null, valueDes);
+                    value = nuller.getNullValue(ctxt);
                 } else {
-                    valueDes = ctxt.findContextualValueDeserializer(elementTypeList.get(idx), null);
                     if (typeDeser == null) {
                         value = valueDes.deserialize(p, ctxt);
                     } else {
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
index 487df24245..75cecfd3d9 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
@@ -64,10 +64,10 @@ private TypeBindings(String[] names, JavaType[] types, String[] uvars)
         _hashCode = h;
     }
 
-    private TypeBindings(String[] names, JavaType[] types)
+    private TypeBindings(String[] names, JavaType[] elementTypes)
     {
         _names = (names == null) ? NO_STRINGS : names;
-        _types = (types == null) ? NO_TYPES : types;
+        _types = (elementTypes == null) ? NO_TYPES : elementTypes;
         int h = 1;
         for (int i = 0, len = _types.length; i < len; ++i) {
             h += _types[i].hashCode();
@@ -129,14 +129,14 @@ public static TypeBindings create(Class<?> erasedType, JavaType[] types)
         return new TypeBindings(names, types, null);
     }
 
-    public static TypeBindings createTuple(JavaType[] types)
+    public static TypeBindings createTuple(JavaType[] elementTypes)
     {
-        if (types == null) {
-            types = NO_TYPES;
+        if (elementTypes == null) {
+            elementTypes = NO_TYPES;
         }
         TypeVariable<?>[] vars = Iterable.class.getTypeParameters();
         String[] names = new String[] { vars[0].getName() };
-        return new TypeBindings(names, types);
+        return new TypeBindings(names, elementTypes);
     }
 
     public static TypeBindings create(Class<?> erasedType, JavaType typeArg1)
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index f3068526f2..74af889879 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -1033,8 +1033,16 @@ public JavaType constructSimpleType(Class<?> rawType, JavaType[] parameterTypes)
         return _fromClass(null, rawType, TypeBindings.create(rawType, parameterTypes));
     }
 
-    public JavaType constructTupleType(JavaType[] parameterTypes) {
-        return new TupleType((SimpleType) _fromClass(null, Iterable.class, TypeBindings.createTuple(parameterTypes)));
+    /**
+     * Method for constructing a type instance with fixed element types.
+     * <p>
+     * for example:
+     * first element of "[1,2,3,null]" is Integer, second element is BigDecimal,
+     * third element is Long, fourth element is String.
+     */
+    public JavaType constructTupleType(JavaType[] elementTypes) {
+        return new TupleType((SimpleType) _fromClass(null, Iterable.class,
+                TypeBindings.createTuple(elementTypes)));
     }
 
     /**
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index 61420a636d..092ca94a24 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -561,21 +561,36 @@ public void testHasExplicitTimeZone() throws Exception
         }
     }
 
-    public void testReadValueByItemTypes() throws JsonMappingException, JsonProcessingException {
+    @SuppressWarnings("unchecked")
+    public void testReadValueByFixedElementTypes() throws JsonMappingException, JsonProcessingException {
         ObjectMapper mapper = new ObjectMapper();
-        JavaType[] elementJavaTypes = new JavaType[] {
+        JavaType[] elementTypes = new JavaType[] {
                 mapper.getTypeFactory().constructType(Integer.class),
                 mapper.getTypeFactory().constructType(BigDecimal.class),
                 mapper.getTypeFactory().constructType(Long.class),
-                mapper.getTypeFactory().constructType(String.class)
+                mapper.getTypeFactory().constructType(String.class),
+                mapper.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class)
                 };
-        JavaType javaType = mapper.getTypeFactory().constructTupleType(elementJavaTypes);
-        String content = "[1,2,3,null]";
+        JavaType javaType = mapper.getTypeFactory().constructTupleType(elementTypes);
+        String content = "[1,2,3,null,{\"t\":1.23}]";
         List<Object> objectList = mapper.readValue(content, javaType);
         assertEquals(new Integer(1), objectList.get(0));
         assertEquals(new BigDecimal("2"), objectList.get(1));
         assertEquals(new Long(3), objectList.get(2));
         assertEquals(null, objectList.get(3));
+        assertEquals(new BigDecimal("1.23"), ((Generic<BigDecimal>) objectList.get(4)).getT());
     }
 
+    private static class Generic<T> {
+        private T t;
+
+        public T getT() {
+            return t;
+        }
+
+        @SuppressWarnings("unused")
+        public void setT(T t) {
+            this.t = t;
+        }
+    }
 }

From d6a03772fdd51f7962cc94a3b2f0413ef237f501 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sat, 10 Sep 2022 16:55:38 +0800
Subject: [PATCH 03/15] optimize TupleDeserializer

---
 .../databind/deser/std/TupleDeserializer.java |  28 ++---
 .../jackson/databind/type/TypeBindings.java   |   5 +-
 .../jackson/databind/ObjectMapperTest.java    | 103 +++++++++++++++++-
 3 files changed, 117 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index 09008ed3ba..cf29976feb 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind.deser.std;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
@@ -14,7 +15,6 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.deser.NullValueProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.type.TupleType;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
@@ -27,12 +27,16 @@ public class TupleDeserializer extends CollectionDeserializer {
 
     private CollectionDeserializer deser;
 
-    private List<JavaType> elementTypeList;
+    private TupleType tupleType;
+    
+    private List<JsonDeserializer<Object>> valueDesList = new ArrayList<>();
+    
+    private List<NullValueProvider> nullerList = new ArrayList<>();
 
     public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
         super(deser);
         this.deser = deser;
-        this.elementTypeList = tupleType.getBindings().getTypeParameters();
+        this.tupleType = tupleType;
     }
 
     public CollectionDeserializer getCollectionDeserializer() {
@@ -47,24 +51,16 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
         // [databind#631]: Assign current value, to be accessible by custom serializers
         p.setCurrentValue(result);
 
-        JsonDeserializer<Object> valueDes = null;
-        final TypeDeserializer typeDeser = _valueTypeDeserializer;
         JsonToken t;
         int idx = -1;
         while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
             try {
                 idx++;
-                valueDes = ctxt.findContextualValueDeserializer(elementTypeList.get(idx), null);
                 Object value;
                 if (t == JsonToken.VALUE_NULL) {
-                    NullValueProvider nuller = findContentNullProvider(ctxt, null, valueDes);
-                    value = nuller.getNullValue(ctxt);
+                    value = nullerList.get(idx).getNullValue(ctxt);
                 } else {
-                    if (typeDeser == null) {
-                        value = valueDes.deserialize(p, ctxt);
-                    } else {
-                        value = valueDes.deserializeWithType(p, ctxt, typeDeser);
-                    }
+                    value = valueDesList.get(idx).deserialize(p, ctxt);
                 }
                 result.add(value);
 
@@ -89,6 +85,12 @@ public CollectionDeserializer createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
         this.deser = deser.createContextual(ctxt, property);
+        for (JavaType type : tupleType.getBindings().getTypeParameters()) {
+            JsonDeserializer<Object> valueDes = ctxt.findContextualValueDeserializer(type, property);
+            NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDes);
+            valueDesList.add(valueDes);
+            nullerList.add(nuller);
+        }
         return this;
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
index 75cecfd3d9..01286fc552 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeBindings.java
@@ -134,9 +134,8 @@ public static TypeBindings createTuple(JavaType[] elementTypes)
         if (elementTypes == null) {
             elementTypes = NO_TYPES;
         }
-        TypeVariable<?>[] vars = Iterable.class.getTypeParameters();
-        String[] names = new String[] { vars[0].getName() };
-        return new TypeBindings(names, elementTypes);
+        return new TypeBindings(new String[] { TypeParamStash.VARS_ITERABLE[0].getName() },
+                elementTypes);
     }
 
     public static TypeBindings create(Class<?> erasedType, JavaType typeArg1)
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index 092ca94a24..5cc55e080a 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.Nulls;
+import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -28,6 +29,8 @@
 import com.fasterxml.jackson.core.StreamWriteFeature;
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -569,18 +572,33 @@ public void testReadValueByFixedElementTypes() throws JsonMappingException, Json
                 mapper.getTypeFactory().constructType(BigDecimal.class),
                 mapper.getTypeFactory().constructType(Long.class),
                 mapper.getTypeFactory().constructType(String.class),
-                mapper.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class)
+                mapper.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class),
+                mapper.getTypeFactory().constructCollectionType(List.class, Shape.class)
                 };
         JavaType javaType = mapper.getTypeFactory().constructTupleType(elementTypes);
-        String content = "[1,2,3,null,{\"t\":1.23}]";
+        String content = "[]";
         List<Object> objectList = mapper.readValue(content, javaType);
+        assertEquals(0, objectList.size());
+        content = "[null,null,null,null,null]";
+        objectList = mapper.readValue(content, javaType);
+        assertEquals(5, objectList.size());
+        content = "[1,2,3,null,{\"s\":1.23},"
+                + "[{\"@class\":\"com.fasterxml.jackson.databind.ObjectMapperTest$Circle\","
+                + "\"radius\":4},"
+                + "{\"@class\":\"com.fasterxml.jackson.databind.ObjectMapperTest$Rectangle\","
+                + "\"width\":5,\"height\":6}]]";
+        objectList = mapper.readValue(content, javaType);
         assertEquals(new Integer(1), objectList.get(0));
         assertEquals(new BigDecimal("2"), objectList.get(1));
         assertEquals(new Long(3), objectList.get(2));
         assertEquals(null, objectList.get(3));
         assertEquals(new BigDecimal("1.23"), ((Generic<BigDecimal>) objectList.get(4)).getT());
+        assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
+        assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
+        assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
     }
 
+    @JsonDeserialize(using = Generic.CustomerDeserializer.class)
     private static class Generic<T> {
         private T t;
 
@@ -588,9 +606,88 @@ public T getT() {
             return t;
         }
 
-        @SuppressWarnings("unused")
         public void setT(T t) {
             this.t = t;
         }
+
+        private static class CustomerDeserializer extends JsonDeserializer<Generic<?>>
+                implements ContextualDeserializer {
+
+            private Class<?> tClazz;
+
+            @SuppressWarnings("unused")
+            public CustomerDeserializer() {
+            }
+
+            public CustomerDeserializer(Class<?> tClazz) {
+                this.tClazz = tClazz;
+            }
+
+            @Override
+            public Generic<?> deserialize(JsonParser p, DeserializationContext ctxt)
+                    throws IOException, JacksonException {
+                JsonNode node = ctxt.readTree(p).findValue("s");
+                Generic<Object> g = new Generic<>();
+                Object t = ((ObjectMapper) p.getCodec()).convertValue(node, this.tClazz);
+                g.setT(t);
+                return g;
+            }
+
+            @Override
+            public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
+                    throws JsonMappingException {
+                JavaType currentType = null;
+                if (property == null) {
+                    // current type is root type.
+                    currentType = ctxt.getContextualType();
+                } else {
+                    // current type is wrapped in other type.
+                    currentType = property.getType();
+                }
+                Class<?> tClazz = currentType.getBindings().getBoundType(0).getRawClass();
+                return new CustomerDeserializer(tClazz);
+            }
+        }
+    }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
+    private static class Shape {
+
+    }
+
+    private static class Circle extends Shape {
+        private int radius;
+
+        public int getRadius() {
+            return radius;
+        }
+
+        @SuppressWarnings("unused")
+        public void setRadius(int radius) {
+            this.radius = radius;
+        }
+    }
+
+    private static class Rectangle extends Shape {
+        private int width;
+        private int height;
+
+        public int getWidth() {
+            return width;
+        }
+
+        @SuppressWarnings("unused")
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        public int getHeight() {
+            return height;
+        }
+
+        @SuppressWarnings("unused")
+        public void setHeight(int height) {
+            this.height = height;
+        }
     }
 }

From 2355a8a30c73d847c06d5e3fcb0fdf0e24db86ae Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 00:08:12 +0800
Subject: [PATCH 04/15] add constructTupleType with Class array

---
 .../jackson/databind/type/TypeFactory.java          | 12 ++++++++++++
 .../jackson/databind/ObjectMapperTest.java          | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index 74af889879..407e39269a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -1045,6 +1045,18 @@ public JavaType constructTupleType(JavaType[] elementTypes) {
                 TypeBindings.createTuple(elementTypes)));
     }
 
+    public JavaType constructTupleType(Class<?>[] elementClazzs) {
+        TypeFactory typeFactory = new TypeFactory();
+        JavaType[] elementTypes = new JavaType[elementClazzs.length];
+        int idx = -1;
+        for (Class<?> clazz : elementClazzs) {
+            idx++;
+            elementTypes[idx] = typeFactory.constructType(clazz);
+        }
+        return new TupleType((SimpleType) _fromClass(null, Iterable.class,
+                TypeBindings.createTuple(elementTypes)));
+    }
+
     /**
      * Method for constructing a type instance with specified parameterization.
      *
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index 5cc55e080a..853ce42cab 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -596,6 +596,19 @@ public void testReadValueByFixedElementTypes() throws JsonMappingException, Json
         assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
         assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
         assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
+        Class<?>[] clazzs = new Class<?>[] {
+            Integer.class,
+            BigDecimal.class,
+            Long.class,
+            String.class
+        };
+        javaType = mapper.getTypeFactory().constructTupleType(clazzs);
+        content = "[1,2,3,null]";
+        objectList = mapper.readValue(content, javaType);
+        assertEquals(new Integer(1), objectList.get(0));
+        assertEquals(new BigDecimal("2"), objectList.get(1));
+        assertEquals(new Long(3), objectList.get(2));
+        assertEquals(null, objectList.get(3));
     }
 
     @JsonDeserialize(using = Generic.CustomerDeserializer.class)

From bf6ac3449d9d03143d68fa27705de25aff739ea9 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 07:04:28 +0800
Subject: [PATCH 05/15] add ObjectReader testcase

---
 .../jackson/databind/ObjectMapperTest.java    |   4 +-
 .../jackson/databind/ObjectReaderTest.java    | 154 +++++++++++++++++-
 2 files changed, 153 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index 853ce42cab..b0afa74ffa 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -583,9 +583,9 @@ public void testReadValueByFixedElementTypes() throws JsonMappingException, Json
         objectList = mapper.readValue(content, javaType);
         assertEquals(5, objectList.size());
         content = "[1,2,3,null,{\"s\":1.23},"
-                + "[{\"@class\":\"com.fasterxml.jackson.databind.ObjectMapperTest$Circle\","
+                + "[{\"@class\":\"" + getClass().getCanonicalName() + "$Circle\","
                 + "\"radius\":4},"
-                + "{\"@class\":\"com.fasterxml.jackson.databind.ObjectMapperTest$Rectangle\","
+                + "{\"@class\":\"" + getClass().getCanonicalName() + "$Rectangle\","
                 + "\"width\":5,\"height\":6}]]";
         objectList = mapper.readValue(content, javaType);
         assertEquals(new Integer(1), objectList.get(0));
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
index 706d5189e4..c6dba71956 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
@@ -2,16 +2,18 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.math.BigDecimal;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.core.json.JsonReadFeature;
-
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
@@ -414,7 +416,7 @@ public void testPointerWithArrays() throws Exception
     public static class Pojo1637 {
         public Set<String> set1;
         public Set<String> set2;
-    }    
+    }
 
     // [databind#2636]
     public void testCanPassResultToOverloadedMethod() throws Exception {
@@ -532,4 +534,150 @@ private A(@JsonProperty("knownField") String knownField) {
             this.knownField = knownField;
         }
     }
+
+    @SuppressWarnings("unchecked")
+    public void testReaderForFixedElementTypes() throws IOException {
+        JavaType[] elementTypes = new JavaType[] {
+                MAPPER.getTypeFactory().constructType(Integer.class),
+                MAPPER.getTypeFactory().constructType(BigDecimal.class),
+                MAPPER.getTypeFactory().constructType(Long.class),
+                MAPPER.getTypeFactory().constructType(String.class),
+                MAPPER.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class),
+                MAPPER.getTypeFactory().constructCollectionType(List.class, Shape.class)
+                };
+        JavaType javaType = MAPPER.getTypeFactory().constructTupleType(elementTypes);
+        String content = "[]";
+        JsonParser p = MAPPER.createParser(content);
+        List<Object> objectList = MAPPER.readerFor(javaType).readValue(p);
+        p.close();
+        assertEquals(0, objectList.size());
+        content = "[null,null,null,null,null]";
+        p = MAPPER.createParser(content);
+        objectList = MAPPER.readerFor(javaType).readValue(p);
+        p.close();
+        assertEquals(5, objectList.size());
+        content = "[1,2,3,null,{\"s\":1.23},"
+                + "[{\"@class\":\"" + getClass().getCanonicalName() + "$Circle\","
+                + "\"radius\":4},"
+                + "{\"@class\":\"" + getClass().getCanonicalName() + "$Rectangle\","
+                + "\"width\":5,\"height\":6}]]";
+        p = MAPPER.createParser(content);
+        objectList = MAPPER.readerFor(javaType).readValue(p);
+        p.close();
+        assertEquals(new Integer(1), objectList.get(0));
+        assertEquals(new BigDecimal("2"), objectList.get(1));
+        assertEquals(new Long(3), objectList.get(2));
+        assertEquals(null, objectList.get(3));
+        assertEquals(new BigDecimal("1.23"), ((Generic<BigDecimal>) objectList.get(4)).getT());
+        assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
+        assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
+        assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
+        Class<?>[] clazzs = new Class<?>[] {
+            Integer.class,
+            BigDecimal.class,
+            Long.class,
+            String.class
+        };
+        javaType = MAPPER.getTypeFactory().constructTupleType(clazzs);
+        content = "[1,2,3,null]";
+        p = MAPPER.createParser(content);
+        objectList = MAPPER.readerFor(javaType).readValue(p);
+        p.close();
+        assertEquals(new Integer(1), objectList.get(0));
+        assertEquals(new BigDecimal("2"), objectList.get(1));
+        assertEquals(new Long(3), objectList.get(2));
+    }
+
+    @JsonDeserialize(using = Generic.CustomerDeserializer.class)
+    private static class Generic<T> {
+        private T t;
+
+        public T getT() {
+            return t;
+        }
+
+        public void setT(T t) {
+            this.t = t;
+        }
+
+        private static class CustomerDeserializer extends JsonDeserializer<Generic<?>>
+                implements ContextualDeserializer {
+
+            private Class<?> tClazz;
+
+            @SuppressWarnings("unused")
+            public CustomerDeserializer() {
+            }
+
+            public CustomerDeserializer(Class<?> tClazz) {
+                this.tClazz = tClazz;
+            }
+
+            @Override
+            public Generic<?> deserialize(JsonParser p, DeserializationContext ctxt)
+                    throws IOException, JacksonException {
+                JsonNode node = ctxt.readTree(p).findValue("s");
+                Generic<Object> g = new Generic<>();
+                Object t = ((ObjectMapper) p.getCodec()).convertValue(node, this.tClazz);
+                g.setT(t);
+                return g;
+            }
+
+            @Override
+            public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
+                    throws JsonMappingException {
+                JavaType currentType = null;
+                if (property == null) {
+                    // current type is root type.
+                    currentType = ctxt.getContextualType();
+                } else {
+                    // current type is wrapped in other type.
+                    currentType = property.getType();
+                }
+                Class<?> tClazz = currentType.getBindings().getBoundType(0).getRawClass();
+                return new CustomerDeserializer(tClazz);
+            }
+        }
+    }
+
+    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
+    private static class Shape {
+
+    }
+
+    private static class Circle extends Shape {
+        private int radius;
+
+        public int getRadius() {
+            return radius;
+        }
+
+        @SuppressWarnings("unused")
+        public void setRadius(int radius) {
+            this.radius = radius;
+        }
+    }
+
+    private static class Rectangle extends Shape {
+        private int width;
+        private int height;
+
+        public int getWidth() {
+            return width;
+        }
+
+        @SuppressWarnings("unused")
+        public void setWidth(int width) {
+            this.width = width;
+        }
+
+        public int getHeight() {
+            return height;
+        }
+
+        @SuppressWarnings("unused")
+        public void setHeight(int height) {
+            this.height = height;
+        }
+    }
 }

From 55094d383811bff260473c258ddc5c5282a0f171 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 14:32:26 +0800
Subject: [PATCH 06/15] modified tuple type testcase

---
 .../jackson/databind/ObjectReaderTest.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
index c6dba71956..3a2379f278 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
@@ -536,7 +536,7 @@ private A(@JsonProperty("knownField") String knownField) {
     }
 
     @SuppressWarnings("unchecked")
-    public void testReaderForFixedElementTypes() throws IOException {
+    public void testReaderForTupleType() throws IOException {
         JavaType[] elementTypes = new JavaType[] {
                 MAPPER.getTypeFactory().constructType(Integer.class),
                 MAPPER.getTypeFactory().constructType(BigDecimal.class),
@@ -545,15 +545,16 @@ public void testReaderForFixedElementTypes() throws IOException {
                 MAPPER.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class),
                 MAPPER.getTypeFactory().constructCollectionType(List.class, Shape.class)
                 };
-        JavaType javaType = MAPPER.getTypeFactory().constructTupleType(elementTypes);
+        JavaType tupleType = MAPPER.getTypeFactory().constructTupleType(elementTypes);
+        ObjectReader tupleTypeReader = MAPPER.readerFor(tupleType);
         String content = "[]";
         JsonParser p = MAPPER.createParser(content);
-        List<Object> objectList = MAPPER.readerFor(javaType).readValue(p);
+        List<Object> objectList = tupleTypeReader.readValue(p);
         p.close();
         assertEquals(0, objectList.size());
         content = "[null,null,null,null,null]";
         p = MAPPER.createParser(content);
-        objectList = MAPPER.readerFor(javaType).readValue(p);
+        objectList = tupleTypeReader.readValue(p);
         p.close();
         assertEquals(5, objectList.size());
         content = "[1,2,3,null,{\"s\":1.23},"
@@ -562,7 +563,7 @@ public void testReaderForFixedElementTypes() throws IOException {
                 + "{\"@class\":\"" + getClass().getCanonicalName() + "$Rectangle\","
                 + "\"width\":5,\"height\":6}]]";
         p = MAPPER.createParser(content);
-        objectList = MAPPER.readerFor(javaType).readValue(p);
+        objectList = tupleTypeReader.readValue(p);
         p.close();
         assertEquals(new Integer(1), objectList.get(0));
         assertEquals(new BigDecimal("2"), objectList.get(1));
@@ -572,16 +573,17 @@ public void testReaderForFixedElementTypes() throws IOException {
         assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
         assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
         assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
-        Class<?>[] clazzs = new Class<?>[] {
+        Class<?>[] elementClazzs = new Class<?>[] {
             Integer.class,
             BigDecimal.class,
             Long.class,
             String.class
         };
-        javaType = MAPPER.getTypeFactory().constructTupleType(clazzs);
+        tupleType = MAPPER.getTypeFactory().constructTupleType(elementClazzs);
+        tupleTypeReader = MAPPER.readerFor(tupleType);
         content = "[1,2,3,null]";
         p = MAPPER.createParser(content);
-        objectList = MAPPER.readerFor(javaType).readValue(p);
+        objectList = tupleTypeReader.readValue(p);
         p.close();
         assertEquals(new Integer(1), objectList.get(0));
         assertEquals(new BigDecimal("2"), objectList.get(1));

From 910ca91f957a995addb45972b72a56f486b86e2f Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 15:52:53 +0800
Subject: [PATCH 07/15] disable unwrapSingle of TupleDeserializer

---
 .../jackson/databind/deser/std/TupleDeserializer.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index cf29976feb..47cffcf1e2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -34,7 +34,11 @@ public class TupleDeserializer extends CollectionDeserializer {
     private List<NullValueProvider> nullerList = new ArrayList<>();
 
     public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
-        super(deser);
+        // disable unwrapSingle.
+        super(deser._valueType,
+                deser._valueDeserializer, deser._valueTypeDeserializer,
+                deser._valueInstantiator, deser._delegateDeserializer,
+                deser._nullProvider, false);
         this.deser = deser;
         this.tupleType = tupleType;
     }

From 29d4c84a07debfa2af64dd05bce3b5caf90788ef Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 17:07:08 +0800
Subject: [PATCH 08/15] delete redundant testcase

---
 .../databind/deser/DeserializerCache.java     |   8 +-
 .../databind/deser/std/TupleDeserializer.java |   7 -
 .../jackson/databind/ObjectMapperTest.java    | 171 +-----------------
 3 files changed, 10 insertions(+), 176 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
index 3898e5bf27..69b4a2b204 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java
@@ -79,7 +79,7 @@ Object writeReplace() {
 
     /**
      * Method that can be used to determine how many deserializers this
-     * provider is caching currently
+     * provider is caching currently 
      * (if it does caching: default implementation does)
      * Exact count depends on what kind of deserializers get cached;
      * default implementation caches only dynamically constructed deserializers,
@@ -101,7 +101,7 @@ public int cachedDeserializersCount() {
      * configuration changes for mapper than owns the provider.
      */
     public void flushCachedDeserializers() {
-        _cachedDeserializers.clear();
+        _cachedDeserializers.clear();       
     }
 
     /*
@@ -460,7 +460,7 @@ protected Converter<Object,Object> findConverter(DeserializationContext ctxt,
             return null;
         }
         return ctxt.converterInstance(a, convDef);
-    }
+    }    
     /**
      * Method called to see if given method has annotations that indicate
      * a more specific type than what the argument specifies.
@@ -503,7 +503,7 @@ private JavaType modifyTypeByAnnotation(DeserializationContext ctxt,
                         // keyType = type.getKeyType(); // just in case it's used below
                     }
                 }
-            }
+            }            
         }
         JavaType contentType = type.getContentType();
         if (contentType != null) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index 47cffcf1e2..b35ca848d7 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -52,7 +52,6 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
             Collection<Object> result)
         throws IOException
     {
-        // [databind#631]: Assign current value, to be accessible by custom serializers
         p.setCurrentValue(result);
 
         JsonToken t;
@@ -67,12 +66,6 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
                     value = valueDesList.get(idx).deserialize(p, ctxt);
                 }
                 result.add(value);
-
-                /* 17-Dec-2017, tatu: should not occur at this level...
-            } catch (UnresolvedForwardReference reference) {
-                throw JsonMappingException
-                    .from(p, "Unresolved forward reference but no identity info", reference);
-                */
             } catch (Exception e) {
                 boolean wrap = (ctxt == null) || ctxt.isEnabled(DeserializationFeature.WRAP_EXCEPTIONS);
                 if (!wrap) {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
index b0afa74ffa..c465cf3068 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java
@@ -1,18 +1,8 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import java.io.*;
+import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -20,23 +10,14 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.annotation.Nulls;
-import com.fasterxml.jackson.core.JacksonException;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.StreamReadFeature;
-import com.fasterxml.jackson.core.StreamWriteFeature;
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.core.util.MinimalPrettyPrinter;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
+
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.*;
 
 public class ObjectMapperTest extends BaseMapTest
 {
@@ -563,144 +544,4 @@ public void testHasExplicitTimeZone() throws Exception
             assertEquals(DEFAULT_TZ, w2.getConfig().getTimeZone());
         }
     }
-
-    @SuppressWarnings("unchecked")
-    public void testReadValueByFixedElementTypes() throws JsonMappingException, JsonProcessingException {
-        ObjectMapper mapper = new ObjectMapper();
-        JavaType[] elementTypes = new JavaType[] {
-                mapper.getTypeFactory().constructType(Integer.class),
-                mapper.getTypeFactory().constructType(BigDecimal.class),
-                mapper.getTypeFactory().constructType(Long.class),
-                mapper.getTypeFactory().constructType(String.class),
-                mapper.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class),
-                mapper.getTypeFactory().constructCollectionType(List.class, Shape.class)
-                };
-        JavaType javaType = mapper.getTypeFactory().constructTupleType(elementTypes);
-        String content = "[]";
-        List<Object> objectList = mapper.readValue(content, javaType);
-        assertEquals(0, objectList.size());
-        content = "[null,null,null,null,null]";
-        objectList = mapper.readValue(content, javaType);
-        assertEquals(5, objectList.size());
-        content = "[1,2,3,null,{\"s\":1.23},"
-                + "[{\"@class\":\"" + getClass().getCanonicalName() + "$Circle\","
-                + "\"radius\":4},"
-                + "{\"@class\":\"" + getClass().getCanonicalName() + "$Rectangle\","
-                + "\"width\":5,\"height\":6}]]";
-        objectList = mapper.readValue(content, javaType);
-        assertEquals(new Integer(1), objectList.get(0));
-        assertEquals(new BigDecimal("2"), objectList.get(1));
-        assertEquals(new Long(3), objectList.get(2));
-        assertEquals(null, objectList.get(3));
-        assertEquals(new BigDecimal("1.23"), ((Generic<BigDecimal>) objectList.get(4)).getT());
-        assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
-        assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
-        assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
-        Class<?>[] clazzs = new Class<?>[] {
-            Integer.class,
-            BigDecimal.class,
-            Long.class,
-            String.class
-        };
-        javaType = mapper.getTypeFactory().constructTupleType(clazzs);
-        content = "[1,2,3,null]";
-        objectList = mapper.readValue(content, javaType);
-        assertEquals(new Integer(1), objectList.get(0));
-        assertEquals(new BigDecimal("2"), objectList.get(1));
-        assertEquals(new Long(3), objectList.get(2));
-        assertEquals(null, objectList.get(3));
-    }
-
-    @JsonDeserialize(using = Generic.CustomerDeserializer.class)
-    private static class Generic<T> {
-        private T t;
-
-        public T getT() {
-            return t;
-        }
-
-        public void setT(T t) {
-            this.t = t;
-        }
-
-        private static class CustomerDeserializer extends JsonDeserializer<Generic<?>>
-                implements ContextualDeserializer {
-
-            private Class<?> tClazz;
-
-            @SuppressWarnings("unused")
-            public CustomerDeserializer() {
-            }
-
-            public CustomerDeserializer(Class<?> tClazz) {
-                this.tClazz = tClazz;
-            }
-
-            @Override
-            public Generic<?> deserialize(JsonParser p, DeserializationContext ctxt)
-                    throws IOException, JacksonException {
-                JsonNode node = ctxt.readTree(p).findValue("s");
-                Generic<Object> g = new Generic<>();
-                Object t = ((ObjectMapper) p.getCodec()).convertValue(node, this.tClazz);
-                g.setT(t);
-                return g;
-            }
-
-            @Override
-            public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property)
-                    throws JsonMappingException {
-                JavaType currentType = null;
-                if (property == null) {
-                    // current type is root type.
-                    currentType = ctxt.getContextualType();
-                } else {
-                    // current type is wrapped in other type.
-                    currentType = property.getType();
-                }
-                Class<?> tClazz = currentType.getBindings().getBoundType(0).getRawClass();
-                return new CustomerDeserializer(tClazz);
-            }
-        }
-    }
-
-    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS)
-    private static class Shape {
-
-    }
-
-    private static class Circle extends Shape {
-        private int radius;
-
-        public int getRadius() {
-            return radius;
-        }
-
-        @SuppressWarnings("unused")
-        public void setRadius(int radius) {
-            this.radius = radius;
-        }
-    }
-
-    private static class Rectangle extends Shape {
-        private int width;
-        private int height;
-
-        public int getWidth() {
-            return width;
-        }
-
-        @SuppressWarnings("unused")
-        public void setWidth(int width) {
-            this.width = width;
-        }
-
-        public int getHeight() {
-            return height;
-        }
-
-        @SuppressWarnings("unused")
-        public void setHeight(int height) {
-            this.height = height;
-        }
-    }
 }

From 9e6355610b462063c2bdb486c74b2070985ac87e Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 18:08:10 +0800
Subject: [PATCH 09/15] fixed createContextual of TupleDeserializer

---
 .../databind/deser/std/TupleDeserializer.java | 34 +++++++++++++++----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index b35ca848d7..92614ce70f 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -28,10 +28,10 @@ public class TupleDeserializer extends CollectionDeserializer {
     private CollectionDeserializer deser;
 
     private TupleType tupleType;
-    
-    private List<JsonDeserializer<Object>> valueDesList = new ArrayList<>();
-    
-    private List<NullValueProvider> nullerList = new ArrayList<>();
+
+    private List<JsonDeserializer<Object>> valueDesList;
+
+    private List<NullValueProvider> nullerList;
 
     public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
         // disable unwrapSingle.
@@ -41,6 +41,21 @@ public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
                 deser._nullProvider, false);
         this.deser = deser;
         this.tupleType = tupleType;
+        this.valueDesList = new ArrayList<>();
+        this.nullerList = new ArrayList<>();
+    }
+
+    public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType,
+            List<JsonDeserializer<Object>> valueDesList, List<NullValueProvider> nullerList) {
+        // disable unwrapSingle.
+        super(deser._valueType,
+                deser._valueDeserializer, deser._valueTypeDeserializer,
+                deser._valueInstantiator, deser._delegateDeserializer,
+                deser._nullProvider, false);
+        this.deser = deser;
+        this.tupleType = tupleType;
+        this.valueDesList = valueDesList;
+        this.nullerList = nullerList;
     }
 
     public CollectionDeserializer getCollectionDeserializer() {
@@ -81,12 +96,17 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
     public CollectionDeserializer createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
-        this.deser = deser.createContextual(ctxt, property);
+        this.valueDesList.clear();
+        this.nullerList.clear();
         for (JavaType type : tupleType.getBindings().getTypeParameters()) {
             JsonDeserializer<Object> valueDes = ctxt.findContextualValueDeserializer(type, property);
             NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDes);
-            valueDesList.add(valueDes);
-            nullerList.add(nuller);
+            this.valueDesList.add(valueDes);
+            this.nullerList.add(nuller);
+        }
+        CollectionDeserializer deser = super.createContextual(ctxt, property);
+        if (deser != this.deser) {
+            return new TupleDeserializer(deser, this.tupleType, this.valueDesList, this.nullerList);
         }
         return this;
     }

From 70827a93da7f6b7bcb92cd19ea2d7c68b939e4c1 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Sun, 11 Sep 2022 18:31:24 +0800
Subject: [PATCH 10/15] optimize codes

---
 .../jackson/databind/deser/std/TupleDeserializer.java    | 7 +++----
 .../com/fasterxml/jackson/databind/type/TypeFactory.java | 9 +++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index 92614ce70f..d33cb46401 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -70,15 +70,14 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
         p.setCurrentValue(result);
 
         JsonToken t;
-        int idx = -1;
+        int idx = 0;
         while ((t = p.nextToken()) != JsonToken.END_ARRAY) {
             try {
-                idx++;
                 Object value;
                 if (t == JsonToken.VALUE_NULL) {
-                    value = nullerList.get(idx).getNullValue(ctxt);
+                    value = nullerList.get(idx++).getNullValue(ctxt);
                 } else {
-                    value = valueDesList.get(idx).deserialize(p, ctxt);
+                    value = valueDesList.get(idx++).deserialize(p, ctxt);
                 }
                 result.add(value);
             } catch (Exception e) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
index 407e39269a..be7cb53ae2 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TypeFactory.java
@@ -1046,15 +1046,12 @@ public JavaType constructTupleType(JavaType[] elementTypes) {
     }
 
     public JavaType constructTupleType(Class<?>[] elementClazzs) {
-        TypeFactory typeFactory = new TypeFactory();
         JavaType[] elementTypes = new JavaType[elementClazzs.length];
-        int idx = -1;
+        int idx = 0;
         for (Class<?> clazz : elementClazzs) {
-            idx++;
-            elementTypes[idx] = typeFactory.constructType(clazz);
+            elementTypes[idx++] = constructType(clazz);
         }
-        return new TupleType((SimpleType) _fromClass(null, Iterable.class,
-                TypeBindings.createTuple(elementTypes)));
+        return constructTupleType(elementTypes);
     }
 
     /**

From 9d59e61eea33d6b98736641fbaddf22803acda07 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Mon, 12 Sep 2022 00:46:02 +0800
Subject: [PATCH 11/15] add withResolved method of TupleDeserializer

---
 .../databind/deser/std/TupleDeserializer.java | 51 +++++++++++--------
 .../jackson/databind/type/TupleType.java      |  6 ++-
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index d33cb46401..fd84bf2879 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -15,6 +15,8 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 import com.fasterxml.jackson.databind.deser.NullValueProvider;
+import com.fasterxml.jackson.databind.deser.ValueInstantiator;
+import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.type.TupleType;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
@@ -25,43 +27,40 @@
 public class TupleDeserializer extends CollectionDeserializer {
     private static final long serialVersionUID = 1L;
 
-    private CollectionDeserializer deser;
-
     private TupleType tupleType;
 
     private List<JsonDeserializer<Object>> valueDesList;
 
     private List<NullValueProvider> nullerList;
 
-    public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType) {
+    public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType)
+    {
         // disable unwrapSingle.
         super(deser._valueType,
                 deser._valueDeserializer, deser._valueTypeDeserializer,
                 deser._valueInstantiator, deser._delegateDeserializer,
                 deser._nullProvider, false);
-        this.deser = deser;
         this.tupleType = tupleType;
         this.valueDesList = new ArrayList<>();
         this.nullerList = new ArrayList<>();
     }
 
-    public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType,
-            List<JsonDeserializer<Object>> valueDesList, List<NullValueProvider> nullerList) {
+    protected TupleDeserializer (JavaType containerType,
+            JsonDeserializer<Object> valueDeser, TypeDeserializer valueTypeDeser,
+            ValueInstantiator valueInstantiator,
+            JsonDeserializer<Object> delegateDeser,
+            NullValueProvider nuller,
+            TupleType tupleType,
+            List<JsonDeserializer<Object>> valueDesList, List<NullValueProvider> nullerList)
+    {
         // disable unwrapSingle.
-        super(deser._valueType,
-                deser._valueDeserializer, deser._valueTypeDeserializer,
-                deser._valueInstantiator, deser._delegateDeserializer,
-                deser._nullProvider, false);
-        this.deser = deser;
+        super(containerType, valueDeser, valueTypeDeser, valueInstantiator, delegateDeser,
+                nuller, false);
         this.tupleType = tupleType;
         this.valueDesList = valueDesList;
         this.nullerList = nullerList;
     }
 
-    public CollectionDeserializer getCollectionDeserializer() {
-        return deser;
-    }
-
     @Override
     protected Collection<Object> _deserializeFromArray(JsonParser p, DeserializationContext ctxt,
             Collection<Object> result)
@@ -95,18 +94,26 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
     public CollectionDeserializer createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
-        this.valueDesList.clear();
-        this.nullerList.clear();
         for (JavaType type : tupleType.getBindings().getTypeParameters()) {
             JsonDeserializer<Object> valueDes = ctxt.findContextualValueDeserializer(type, property);
             NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDes);
             this.valueDesList.add(valueDes);
             this.nullerList.add(nuller);
         }
-        CollectionDeserializer deser = super.createContextual(ctxt, property);
-        if (deser != this.deser) {
-            return new TupleDeserializer(deser, this.tupleType, this.valueDesList, this.nullerList);
-        }
-        return this;
+        return super.createContextual(ctxt, property);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected TupleDeserializer withResolved(JsonDeserializer<?> dd,
+            JsonDeserializer<?> vd, TypeDeserializer vtd,
+            NullValueProvider nuller, Boolean unwrapSingle)
+    {
+        return new TupleDeserializer(_containerType,
+                (JsonDeserializer<Object>) vd, vtd,
+                _valueInstantiator, (JsonDeserializer<Object>) dd,
+                nuller,
+                this.tupleType,
+                this.valueDesList, this.nullerList);
     }
 }
diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
index 1bf26dc24d..64fe805bee 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
@@ -8,12 +8,14 @@ public class TupleType extends SimpleType {
 
     private SimpleType base;
 
-    protected TupleType(SimpleType base) {
+    protected TupleType(SimpleType base)
+    {
         super(base);
         this.base = base;
     }
 
-    public SimpleType getSimpleType() {
+    public SimpleType getSimpleType()
+    {
         return base;
     }
 

From ddb857f4d765029e57a7dc3ff58f7490b6f12648 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Mon, 12 Sep 2022 08:58:48 +0800
Subject: [PATCH 12/15] optimize TupleType

---
 .../com/fasterxml/jackson/databind/type/TupleType.java    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
index 64fe805bee..8ad5a5f7e3 100644
--- a/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
+++ b/src/main/java/com/fasterxml/jackson/databind/type/TupleType.java
@@ -6,17 +6,9 @@
 public class TupleType extends SimpleType {
     private static final long serialVersionUID = 1L;
 
-    private SimpleType base;
-
     protected TupleType(SimpleType base)
     {
         super(base);
-        this.base = base;
-    }
-
-    public SimpleType getSimpleType()
-    {
-        return base;
     }
 
     @Override

From d772f2c29e519e18841c77ea63ab0b2b8aa0d4e6 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Mon, 12 Sep 2022 09:05:34 +0800
Subject: [PATCH 13/15] modify value deserializer list name

---
 .../databind/deser/std/TupleDeserializer.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index fd84bf2879..fc1781c401 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -29,7 +29,7 @@ public class TupleDeserializer extends CollectionDeserializer {
 
     private TupleType tupleType;
 
-    private List<JsonDeserializer<Object>> valueDesList;
+    private List<JsonDeserializer<Object>> valueDeserList;
 
     private List<NullValueProvider> nullerList;
 
@@ -41,7 +41,7 @@ public TupleDeserializer(CollectionDeserializer deser, TupleType tupleType)
                 deser._valueInstantiator, deser._delegateDeserializer,
                 deser._nullProvider, false);
         this.tupleType = tupleType;
-        this.valueDesList = new ArrayList<>();
+        this.valueDeserList = new ArrayList<>();
         this.nullerList = new ArrayList<>();
     }
 
@@ -51,13 +51,13 @@ protected TupleDeserializer (JavaType containerType,
             JsonDeserializer<Object> delegateDeser,
             NullValueProvider nuller,
             TupleType tupleType,
-            List<JsonDeserializer<Object>> valueDesList, List<NullValueProvider> nullerList)
+            List<JsonDeserializer<Object>> valueDeserList, List<NullValueProvider> nullerList)
     {
         // disable unwrapSingle.
         super(containerType, valueDeser, valueTypeDeser, valueInstantiator, delegateDeser,
                 nuller, false);
         this.tupleType = tupleType;
-        this.valueDesList = valueDesList;
+        this.valueDeserList = valueDeserList;
         this.nullerList = nullerList;
     }
 
@@ -76,7 +76,7 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
                 if (t == JsonToken.VALUE_NULL) {
                     value = nullerList.get(idx++).getNullValue(ctxt);
                 } else {
-                    value = valueDesList.get(idx++).deserialize(p, ctxt);
+                    value = valueDeserList.get(idx++).deserialize(p, ctxt);
                 }
                 result.add(value);
             } catch (Exception e) {
@@ -95,9 +95,9 @@ public CollectionDeserializer createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
         for (JavaType type : tupleType.getBindings().getTypeParameters()) {
-            JsonDeserializer<Object> valueDes = ctxt.findContextualValueDeserializer(type, property);
-            NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDes);
-            this.valueDesList.add(valueDes);
+            JsonDeserializer<Object> valueDeser = ctxt.findContextualValueDeserializer(type, property);
+            NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDeser);
+            this.valueDeserList.add(valueDeser);
             this.nullerList.add(nuller);
         }
         return super.createContextual(ctxt, property);
@@ -114,6 +114,6 @@ protected TupleDeserializer withResolved(JsonDeserializer<?> dd,
                 _valueInstantiator, (JsonDeserializer<Object>) dd,
                 nuller,
                 this.tupleType,
-                this.valueDesList, this.nullerList);
+                this.valueDeserList, this.nullerList);
     }
 }

From 7692c487315c6808e7f4eae7edf4660c30c3fc86 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Mon, 12 Sep 2022 09:26:11 +0800
Subject: [PATCH 14/15] add databind#735 testcase

---
 .../jackson/databind/ObjectReaderTest.java    | 50 ++++++++++++++++++-
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
index 3a2379f278..ea4a071554 100644
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/ObjectReaderTest.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -543,7 +544,8 @@ public void testReaderForTupleType() throws IOException {
                 MAPPER.getTypeFactory().constructType(Long.class),
                 MAPPER.getTypeFactory().constructType(String.class),
                 MAPPER.getTypeFactory().constructParametricType(Generic.class, BigDecimal.class),
-                MAPPER.getTypeFactory().constructCollectionType(List.class, Shape.class)
+                MAPPER.getTypeFactory().constructCollectionType(List.class, Shape.class),
+                MAPPER.getTypeFactory().constructType(TestBean.class)
                 };
         JavaType tupleType = MAPPER.getTypeFactory().constructTupleType(elementTypes);
         ObjectReader tupleTypeReader = MAPPER.readerFor(tupleType);
@@ -561,7 +563,8 @@ public void testReaderForTupleType() throws IOException {
                 + "[{\"@class\":\"" + getClass().getCanonicalName() + "$Circle\","
                 + "\"radius\":4},"
                 + "{\"@class\":\"" + getClass().getCanonicalName() + "$Rectangle\","
-                + "\"width\":5,\"height\":6}]]";
+                + "\"width\":5,\"height\":6}],"
+                + "{\"map1\":{\"a\":1},\"map2\":{\"a\":1}}]";
         p = MAPPER.createParser(content);
         objectList = tupleTypeReader.readValue(p);
         p.close();
@@ -573,6 +576,8 @@ public void testReaderForTupleType() throws IOException {
         assertEquals(4, ((Circle) ((List<?>) objectList.get(5)).get(0)).getRadius());
         assertEquals(5, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getWidth());
         assertEquals(6, ((Rectangle) ((List<?>) objectList.get(5)).get(1)).getHeight());
+        assertEquals(100, ((TestBean) objectList.get(6)).getMap1().get("a").intValue());
+        assertEquals(1, ((TestBean) objectList.get(6)).getMap2().get("a").intValue());
         Class<?>[] elementClazzs = new Class<?>[] {
             Integer.class,
             BigDecimal.class,
@@ -682,4 +687,45 @@ public void setHeight(int height) {
             this.height = height;
         }
     }
+    
+    @SuppressWarnings("unused")
+    private static class TestBean {
+
+        @JsonProperty("map1")
+        @JsonDeserialize(contentUsing = TestBeanCustomDeserializer.class)
+        Map<String, Integer> map1;
+
+        @JsonProperty("map2")
+        Map<String, Integer> map2;
+
+        public Map<String, Integer> getMap1() {
+            return map1;
+        }
+
+        public void setMap1(Map<String, Integer> map1) {
+            this.map1 = map1;
+        }
+
+        public Map<String, Integer> getMap2() {
+            return map2;
+        }
+
+        public void setMap2(Map<String, Integer> map2) {
+            this.map2 = map2;
+        }
+    }
+
+    private static class TestBeanCustomDeserializer extends StdDeserializer<Integer> {
+        private static final long serialVersionUID = 1L;
+
+        public TestBeanCustomDeserializer() {
+            super(Integer.class);
+        }
+
+        @Override
+        public Integer deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+            Integer value = p.readValueAs(Integer.class);
+            return value * 100;
+        }
+    }
 }

From 89f907c1e2c78141286809334e0b1e93ccd012d6 Mon Sep 17 00:00:00 2001
From: zrlw <zrlw@sina.com>
Date: Tue, 13 Sep 2022 22:06:45 +0800
Subject: [PATCH 15/15] fixed bean properties of tuple element deserializer

---
 .../jackson/databind/deser/std/TupleDeserializer.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
index fc1781c401..ec77664d41 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/std/TupleDeserializer.java
@@ -95,8 +95,8 @@ public CollectionDeserializer createContextual(DeserializationContext ctxt,
             BeanProperty property) throws JsonMappingException
     {
         for (JavaType type : tupleType.getBindings().getTypeParameters()) {
-            JsonDeserializer<Object> valueDeser = ctxt.findContextualValueDeserializer(type, property);
-            NullValueProvider nuller = findContentNullProvider(ctxt, property, valueDeser);
+            JsonDeserializer<Object> valueDeser = ctxt.findContextualValueDeserializer(type, null);
+            NullValueProvider nuller = findContentNullProvider(ctxt, null, valueDeser);
             this.valueDeserList.add(valueDeser);
             this.nullerList.add(nuller);
         }