Jdbc3KeyGenerator should use Type instead of Class in handler resolution

Author: harawata

src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java

@@ -15,6 +15,7 @@
  */
 package org.apache.ibatis.executor.keygen;
 
+import java.lang.reflect.Type;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -259,7 +260,7 @@ protected void assign(ResultSet rs, Object param) {
             throw new ExecutorException("No setter found for the keyProperty '" + propertyName + "' in '"
                 + metaParam.getOriginalObject().getClass().getName() + "'.");
           }
-          Class<?> propertyType = metaParam.getSetterType(propertyName);
+          Type propertyType = metaParam.getGenericSetterType(propertyName).getKey();
           JdbcType jdbcType = JdbcType.forCode(rsmd.getColumnType(columnPosition));
           typeHandler = typeHandlerRegistry.getTypeHandler(propertyType, jdbcType);
           if (typeHandler == null) {

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

@@ -15,7 +15,11 @@
  */
 package org.apache.ibatis.submitted.typebasedtypehandlerresolution;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.Select;
 
@@ -49,4 +53,12 @@ public interface GloballyRegisteredHandlerMapper {
   ParentBean selectNestedUser_SingleParam(Integer id);
 
   ParentBean selectNestedUser_MultiParam(Integer id);
+
+  @Options(useGeneratedKeys = true, keyColumn = "id", keyProperty = "id")
+  @Insert("insert into product (name) values (#{name})")
+  int insertProduct(Product product);
+
+  int insertProducts(List<Product> products);
+
+  int insertProducts2(@Param("dummy") String dummy, @Param("products") List<Product> products);
 }

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

@@ -16,6 +16,7 @@
 package org.apache.ibatis.submitted.typebasedtypehandlerresolution;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.Arrays;
 import java.util.List;
@@ -219,4 +220,43 @@ void shouldHandlerAppliedToNestedSelectMultiParam() {
       assertEquals(1, bean.getUser().getId());
     }
   }
+
+  @Test
+  void shouldHandlerGeneratedKey() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      Product product = new Product();
+      product.setName("Great product");
+      assertEquals(1, mapper.insertProduct(product));
+      assertNotNull(product.getId());
+    }
+  }
+
+  @Test
+  void shouldHandlerGeneratedKeys() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      Product product1 = new Product();
+      product1.setName("Great product");
+      Product product2 = new Product();
+      product2.setName("Good product");
+      assertEquals(2, mapper.insertProducts(List.of(product1, product2)));
+      assertNotNull(product1.getId());
+      assertNotNull(product2.getId());
+    }
+  }
+
+  @Test
+  void shouldHandlerGeneratedKeys_MultiParams() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      Product product1 = new Product();
+      product1.setName("Great product");
+      Product product2 = new Product();
+      product2.setName("Good product");
+      assertEquals(2, mapper.insertProducts2("dummy", List.of(product1, product2)));
+      assertNotNull(product1.getId());
+      assertNotNull(product2.getId());
+    }
+  }
 }

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

@@ -0,0 +1,38 @@
+/*
+ *    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.
+ *    You may obtain a copy of the License at
+ *
+ *       https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+package org.apache.ibatis.submitted.typebasedtypehandlerresolution;
+
+public class Product {
+  private FuzzyBean<Integer> id;
+  private String name;
+
+  public FuzzyBean<Integer> getId() {
+    return id;
+  }
+
+  public void setId(FuzzyBean<Integer> id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/TypeAwareTypeHandler.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.
@@ -79,6 +79,16 @@ public Object getResult(ResultSet rs, String columnName) throws SQLException {
 
   @Override
   public Object getResult(ResultSet rs, int columnIndex) throws SQLException {
+    if (FuzzyBean.class.equals(rawType)) {
+      if (String.class.equals(typeArg)) {
+        return new FuzzyBean<String>(rs.getString(columnIndex));
+      } else if (Integer.class.equals(typeArg)) {
+        return new FuzzyBean<Integer>(rs.getInt(columnIndex));
+      }
+    } else if (LocalDate.class.equals(rawType)) {
+      int v = rs.getInt(columnIndex);
+      return v == 0 ? null : LocalDate.of(v / 10000, v / 100 % 100, v % 100);
+    }
     return null;
   }
 

src/test/resources/org/apache/ibatis/submitted/typebasedtypehandlerresolution/CreateDB.sql

@@ -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.
@@ -30,3 +30,9 @@ insert into users (id, strvalue, intvalue, datevalue, datevalue2, strings, integ
   values(1, 'garden', 31, 20200511, '2020-05-09', 'a,b,c', '1,3,5');
 insert into users (id, strvalue, intvalue, datevalue, datevalue2, strings, integers)
   values(2, 'vault', 32, 20200512, '2020-05-10', 'd,e,f', '7,9');
+
+
+create table product (
+  id int identity,
+  name varchar(20)
+);

src/test/resources/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredHandlerMapper.xml

@@ -76,4 +76,17 @@
     where strvalue = #{strvalue} and intvalue = #{intvalue}
   </select>
 
+  <insert id="insertProducts" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into product (name) values
+    <foreach collection="list" item="product" separator=",">
+      (#{product.name})
+    </foreach>
+  </insert>
+
+  <insert id="insertProducts2" useGeneratedKeys="true" keyColumn="id" keyProperty="products.id">
+    insert into product (name) values
+    <foreach collection="products" item="product" separator=",">
+      (#{product.name})
+    </foreach>
+  </insert>
 </mapper>