Merge pull request #3563 from jeffgbutler/type-handler-failure

Failing test for Type Handler Parsing

Author: harawata

src/main/java/org/apache/ibatis/builder/BaseBuilder.java

@@ -107,16 +107,15 @@ protected <T> Class<? extends T> resolveClass(String alias) {
 
   @Deprecated(since = "3.6.0", forRemoval = true)
   protected TypeHandler<?> resolveTypeHandler(Class<?> javaType, String typeHandlerAlias) {
-    return resolveTypeHandler(null, javaType, null, typeHandlerAlias);
+    return resolveTypeHandler(javaType, null, typeHandlerAlias);
   }
 
   @Deprecated(since = "3.6.0", forRemoval = true)
   protected TypeHandler<?> resolveTypeHandler(Class<?> javaType, Class<? extends TypeHandler<?>> typeHandlerType) {
     return resolveTypeHandler(javaType, null, typeHandlerType);
   }
 
-  protected TypeHandler<?> resolveTypeHandler(Class<?> parameterType, Type propertyType, JdbcType jdbcType,
-      String typeHandlerAlias) {
+  protected TypeHandler<?> resolveTypeHandler(Type propertyType, JdbcType jdbcType, String typeHandlerAlias) {
     Class<? extends TypeHandler<?>> typeHandlerType = null;
     typeHandlerType = resolveClass(typeHandlerAlias);
     if (typeHandlerType != null && !TypeHandler.class.isAssignableFrom(typeHandlerType)) {

src/main/java/org/apache/ibatis/builder/ParameterMappingTokenHandler.java

@@ -95,8 +95,8 @@ private ParameterMapping buildParameterMapping(String content) {
     if (genericType == null) {
       genericType = javaType;
     }
-    if ((typeHandler == null || typeHandlerAlias != null) && genericType != null && genericType != Object.class) {
-      typeHandler = resolveTypeHandler(parameterType, genericType, jdbcType, typeHandlerAlias);
+    if (typeHandler == null || typeHandlerAlias != null) {
+      typeHandler = resolveTypeHandler(genericType, jdbcType, typeHandlerAlias);
     }
     builder.typeHandler(typeHandler);
 

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

@@ -153,7 +153,7 @@ void resolveTypeHandlerTypeHandlerAliasIsNull() {
       {
       }
     };
-    TypeHandler<?> typeHandler = builder.resolveTypeHandler(String.class, null, null, (String) null);
+    TypeHandler<?> typeHandler = builder.resolveTypeHandler(null, null, (String) null);
     assertThat(typeHandler).isNull();
   }
 
@@ -163,7 +163,7 @@ void resolveTypeHandlerNoAssignable() {
       {
       }
     };
-    when(() -> builder.resolveTypeHandler(String.class, null, null, "integer"));
+    when(() -> builder.resolveTypeHandler(null, null, "integer"));
     then(caughtException()).isInstanceOf(BuilderException.class).hasMessage(
         "Type java.lang.Integer is not a valid TypeHandler because it does not implement TypeHandler interface");
   }

src/test/java/org/apache/ibatis/submitted/language/VelocitySqlSourceBuilder.java

@@ -134,7 +134,7 @@ private ParameterMapping buildParameterMapping(String content) {
         }
       }
       if (typeHandlerAlias != null) {
-        builder.typeHandler(resolveTypeHandler(javaType, propertyType, jdbcType, typeHandlerAlias));
+        builder.typeHandler(resolveTypeHandler(propertyType, jdbcType, typeHandlerAlias));
       }
       return builder.build();
     }

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

@@ -309,7 +309,7 @@ void specifyHandlerInXmlParameterWithoutParameterType() {
       // There is no way to obtain info about type parameters.
       assertThatExceptionOfType(PersistenceException.class).isThrownBy(() -> sqlSession.insert(
           "org.apache.ibatis.submitted.typebasedtypehandlerresolution.LocallySpecifiedHandlerMapper.insertXmlWithoutParameterType",
-          user)).withMessageContaining("FuzzyBean cannot be cast to class java.lang.String");
+          user)).withMessageContaining("Unknown rawType : class java.lang.Object");
     }
   }
 }

src/test/java/org/apache/ibatis/submitted/uuid_test/Mapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 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.
@@ -15,12 +15,17 @@
  */
 package org.apache.ibatis.submitted.uuid_test;
 
+import java.util.Map;
 import java.util.UUID;
 
+import org.apache.ibatis.annotations.Insert;
+
 public interface Mapper {
 
   User getUser(UUID id);
 
   void insertUser(User user);
 
+  @Insert("${sql}")
+  int insertDynamicUser(String sql, Map<String, Object> parameters);
 }

src/test/java/org/apache/ibatis/submitted/uuid_test/UUIDTest.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.
@@ -16,6 +16,7 @@
 package org.apache.ibatis.submitted.uuid_test;
 
 import java.io.Reader;
+import java.util.Map;
 import java.util.UUID;
 
 import org.apache.ibatis.BaseDataTest;
@@ -64,4 +65,18 @@ void shouldInsertAUser() {
     }
   }
 
+  @Test
+  void shouldInsertAUserFullyDynamic() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Map<String, Object> parameters = Map.of("p1", UUID.randomUUID(), "p2", "User3");
+      String sql = "insert into users values("
+          + "#{parameters.p1,typeHandler=org.apache.ibatis.submitted.uuid_test.UUIDTypeHandler}, "
+          + "#{parameters.p2})";
+
+      int rows = mapper.insertDynamicUser(sql, parameters);
+      Assertions.assertEquals(1, rows);
+    }
+  }
+
 }