Fallback for generic param names

Author: harawata

src/main/java/org/apache/ibatis/reflection/ParamNameResolver.java

@@ -181,7 +181,21 @@ public Object getNamedParams(Object[] args) {
 
   public Type getType(String name) {
     PropertyTokenizer propertyTokenizer = new PropertyTokenizer(name);
-    Type type = typeMap.get(propertyTokenizer.getName());
+    String unindexed = propertyTokenizer.getName();
+    Type type = typeMap.get(unindexed);
+
+    if (type == null && unindexed.startsWith(GENERIC_NAME_PREFIX)) {
+      try {
+        Integer paramIndex = Integer.valueOf(unindexed.substring(GENERIC_NAME_PREFIX.length())) - 1;
+        unindexed = names.get(paramIndex);
+        if (unindexed != null) {
+          type = typeMap.get(unindexed);
+        }
+      } catch (NumberFormatException e) {
+        // user mistake
+      }
+    }
+
     if (propertyTokenizer.getIndex() != null) {
       if (type instanceof ParameterizedType) {
         Type[] typeArgs = ((ParameterizedType) type).getActualTypeArguments();
@@ -190,7 +204,6 @@ public Type getType(String name) {
         return ((Class<?>) type).getComponentType();
       }
     }
-    // TODO: param1, param2
     return type;
   }
 

src/test/java/org/apache/ibatis/reflection/ParamNameResolverTest.java

@@ -41,6 +41,7 @@ void testGetTypeSimple() throws Exception {
     Method method = clazz.getDeclaredMethod("m1", Integer.class);
     ParamNameResolver resolver = new ParamNameResolver(new Configuration(), method, clazz);
     assertEquals(Integer.class, resolver.getType("p"));
+    assertEquals(Integer.class, resolver.getType("param1"));
   }
 
   @Test
@@ -50,6 +51,7 @@ void testGetTypeList() throws Exception {
     ParamNameResolver resolver = new ParamNameResolver(new Configuration(), method, clazz);
     assertEquals(List.class, ((ParameterizedType) resolver.getType("p")).getRawType());
     assertEquals(String.class, resolver.getType("p[0]"));
+    assertEquals(String.class, resolver.getType("param1[0]"));
   }
 
   @Test
@@ -59,5 +61,7 @@ void testGetTypeArray() throws Exception {
     ParamNameResolver resolver = new ParamNameResolver(new Configuration(), method, clazz);
     assertEquals(Integer[].class, resolver.getType("p"));
     assertEquals(Integer.class, resolver.getType("p[0]"));
+    assertEquals(Integer[].class, resolver.getType("param1"));
+    assertEquals(Integer.class, resolver.getType("param1[0]"));
   }
 }