Type handler should be applied to parameter objects

Author: harawata

src/main/java/org/apache/ibatis/executor/BaseExecutor.java

@@ -36,6 +36,7 @@
 import org.apache.ibatis.mapping.ParameterMode;
 import org.apache.ibatis.mapping.StatementType;
 import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.ParamNameResolver;
 import org.apache.ibatis.reflection.factory.ObjectFactory;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.LocalCacheScope;
@@ -218,13 +219,18 @@ public CacheKey createCacheKey(MappedStatement ms, Object parameterObject, RowBo
           value = boundSql.getAdditionalParameter(propertyName);
         } else if (parameterObject == null) {
           value = null;
-        } else if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
-          value = parameterObject;
         } else {
-          if (metaObject == null) {
-            metaObject = configuration.newMetaObject(parameterObject);
+          ParamNameResolver paramNameResolver = ms.getParamNameResolver();
+          if (paramNameResolver != null
+              && typeHandlerRegistry.hasTypeHandler(paramNameResolver.getType(paramNameResolver.getNames()[0]))
+              || typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+            value = parameterObject;
+          } else {
+            if (metaObject == null) {
+              metaObject = configuration.newMetaObject(parameterObject);
+            }
+            value = metaObject.getValue(propertyName);
           }
-          value = metaObject.getValue(propertyName);
         }
         cacheKey.update(value);
       }

src/main/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandler.java

@@ -138,6 +138,8 @@ public void setParameters(PreparedStatement ps) {
                     } else {
                       propertyGenericType = actualParamClass;
                     }
+                  } else {
+                    propertyGenericType = actualParamType;
                   }
                 } else {
                   try {

src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java

@@ -193,7 +193,7 @@ public void setDefaultEnumTypeHandler(@SuppressWarnings("rawtypes") Class<? exte
     this.defaultEnumTypeHandler = typeHandler;
   }
 
-  public boolean hasTypeHandler(Class<?> javaType) {
+  public boolean hasTypeHandler(Type javaType) {
     return hasTypeHandler(javaType, null);
   }
 
@@ -216,13 +216,6 @@ public TypeHandler<?> getMappingTypeHandler(Class<? extends TypeHandler<?>> hand
     return allTypeHandlersMap.get(handlerType);
   }
 
-  @Deprecated
-  @SuppressWarnings("unchecked")
-  public <T> TypeHandler<T> getTypeHandler(Class<T> clazz) {
-    return (TypeHandler<T>) getTypeHandler((Type) clazz);
-  }
-
-  @Deprecated
   public TypeHandler<?> getTypeHandler(Type type) {
     return getTypeHandler(type, null);
   }

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2024 the original author or authors.
+ *    Copyright 2009-2025 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -170,7 +170,7 @@ void registerJavaTypeInitializingTypeHandler() {
     builder.parse();
 
     TypeHandlerRegistry typeHandlerRegistry = builder.getConfiguration().getTypeHandlerRegistry();
-    TypeHandler<MyEnum> typeHandler = typeHandlerRegistry.getTypeHandler(MyEnum.class);
+    TypeHandler<?> typeHandler = typeHandlerRegistry.getTypeHandler(MyEnum.class);
 
     assertTrue(typeHandler instanceof EnumOrderTypeHandler);
     assertArrayEquals(MyEnum.values(), ((EnumOrderTypeHandler<MyEnum>) typeHandler).constants);

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredHandlerMapper.java

@@ -39,4 +39,10 @@ public interface GloballyRegisteredHandlerMapper {
 
   @Select("select strvalue from users where id = #{id}")
   FuzzyBean<String> selectFuzzyString(Integer id);
+
+  @Select("select id, strvalue, intvalue, strings, integers from users where strvalue = #{v}")
+  User getUserByFuzzyBean(FuzzyBean<String> str);
+
+  @Select("select id, strvalue, intvalue, strings, integers from users where strvalue = #{p1} and intvalue = #{p2}")
+  User getUserByFuzzyBeans(FuzzyBean<String> p1, FuzzyBean<Integer> p2);
 }

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredTypeHandlerResolutionTest.java

@@ -183,4 +183,22 @@ void handleReturnTypeWithTypeParam() {
       assertEquals("garden", fuzzyBean.getValue());
     }
   }
+
+  @Test
+  void shouldHandlerBeAppliedToSoleParam() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      User user = mapper.getUserByFuzzyBean(new FuzzyBean<String>("garden"));
+      assertEquals(1, user.getId());
+    }
+  }
+
+  @Test
+  void shouldHandlerBeAppliedToMultiParams() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      User user = mapper.getUserByFuzzyBeans(new FuzzyBean<String>("garden"), new FuzzyBean<Integer>(31));
+      assertEquals(1, user.getId());
+    }
+  }
 }

src/test/java/org/apache/ibatis/type/TypeHandlerRegistryTest.java

@@ -50,7 +50,7 @@ void setup() {
 
   @Test
   void shouldRegisterAndRetrieveTypeHandler() {
-    TypeHandler<String> stringTypeHandler = typeHandlerRegistry.getTypeHandler(String.class);
+    TypeHandler<?> stringTypeHandler = typeHandlerRegistry.getTypeHandler(String.class);
     typeHandlerRegistry.register(String.class, JdbcType.LONGVARCHAR, stringTypeHandler);
     assertEquals(stringTypeHandler, typeHandlerRegistry.getTypeHandler(String.class, JdbcType.LONGVARCHAR));