fix for http://code.google.com/p/mybatis/issues/detail?id=506 . Resolve the type inside a Collection Object

Author: emacarron

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

@@ -15,7 +15,15 @@
  */
 package org.apache.ibatis.reflection;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Collection;
+
+import org.apache.ibatis.reflection.invoker.GetFieldInvoker;
 import org.apache.ibatis.reflection.invoker.Invoker;
+import org.apache.ibatis.reflection.invoker.MethodInvoker;
 import org.apache.ibatis.reflection.property.PropertyTokenizer;
 
 public class MetaClass {
@@ -69,11 +77,55 @@ public Class<?> getSetterType(String name) {
   public Class<?> getGetterType(String name) {
     PropertyTokenizer prop = new PropertyTokenizer(name);
     if (prop.hasNext()) {
-      MetaClass metaProp = metaClassForProperty(prop.getName());
+      MetaClass metaProp = metaClassForProperty(prop);
       return metaProp.getGetterType(prop.getChildren());
     } else {
-      return reflector.getGetterType(prop.getName());
+      return getGetterType(prop); // issue #506. Resolve the type inside a Collection Object
+    }
+  }
+
+  private MetaClass metaClassForProperty(PropertyTokenizer prop) {
+    Class<?> propType = getGetterType(prop);
+    return MetaClass.forClass(propType);
+  }
+
+  private Class<?> getGetterType(PropertyTokenizer prop) {
+    Class<?> type = reflector.getGetterType(prop.getName());
+    if (prop.getIndex() != null && Collection.class.isAssignableFrom(type)) {
+      Type returnType = getGenericGetterType(prop.getName());
+      if (returnType instanceof ParameterizedType) {
+        Type[] actualTypeArguments = ((ParameterizedType) returnType).getActualTypeArguments();
+        if (actualTypeArguments != null && actualTypeArguments.length == 1) {
+          returnType = actualTypeArguments[0];
+          if (returnType instanceof Class) {
+            type = (Class<?>) returnType;
+          } else if (returnType instanceof ParameterizedType) {
+            type = (Class<?>) ((ParameterizedType) returnType).getRawType();
+          }
+        }
+      }
+    }
+    return type;
+  }
+
+  private Type getGenericGetterType(String propertyName) {
+    try {
+      Invoker invoker = reflector.getGetInvoker(propertyName);
+      if (invoker instanceof MethodInvoker) {
+        Field _method = MethodInvoker.class.getDeclaredField("method");
+        _method.setAccessible(true);
+        Method method = (Method) _method.get(invoker);
+        return method.getGenericReturnType();
+      } else if (invoker instanceof GetFieldInvoker) {
+        Field _field = GetFieldInvoker.class.getDeclaredField("field");
+        _field.setAccessible(true);
+        Field field = (Field) _field.get(invoker);
+        return field.getGenericType();
+      }
+    } catch (NoSuchFieldException e) {
+    } catch (IllegalAccessException e) {
     }
+    return null;
   }
 
   public boolean hasSetter(String name) {
@@ -94,7 +146,7 @@ public boolean hasGetter(String name) {
     PropertyTokenizer prop = new PropertyTokenizer(name);
     if (prop.hasNext()) {
       if (reflector.hasGetter(prop.getName())) {
-        MetaClass metaProp = metaClassForProperty(prop.getName());
+        MetaClass metaProp = metaClassForProperty(prop);
         return metaProp.hasGetter(prop.getChildren());
       } else {
         return false;
@@ -132,5 +184,3 @@ private StringBuilder buildProperty(String name, StringBuilder builder) {
   }
 
 }
-
-

src/test/java/org/apache/ibatis/submitted/simplelistparameter/Car.java

@@ -0,0 +1,40 @@
+/*
+ *    Copyright 2009-2012 The MyBatis Team
+ *
+ *    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
+ *
+ *       http://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.simplelistparameter;
+
+import java.util.List;
+
+public class Car {
+  // the result class doesn't need id for further processing
+  private String name;
+  private List<String> doors;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public List<String> getCarParts() {
+    return doors;
+  }
+
+  public void setCarParts(List<String> doors) {
+    this.doors = doors;
+  }
+}

src/test/java/org/apache/ibatis/submitted/simplelistparameter/CarMapper.java

@@ -0,0 +1,26 @@
+/*
+ *    Copyright 2009-2012 The MyBatis Team
+ *
+ *    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
+ *
+ *       http://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.simplelistparameter;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
+public interface CarMapper {
+
+  @Select({ "select id, name from car where doors = #{doors[1]}" })
+  List<Car> getCar(Car car);
+}

src/test/java/org/apache/ibatis/submitted/simplelistparameter/CreateDB.sql

@@ -0,0 +1,27 @@
+--
+--    Copyright 2009-2012 The MyBatis Team
+--
+--    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
+--
+--       http://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.
+--
+
+drop table car if exists;
+
+create table car (
+  id int,
+  name varchar(20),
+  doors int
+);
+
+insert into car (id, name, doors) values(1, 'Audi', 4);
+insert into car (id, name, doors) values(2, 'Ford', 4);
+insert into car (id, name, doors) values(3, 'Fiat', 4);

src/test/java/org/apache/ibatis/submitted/simplelistparameter/Map.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2011 The MyBatis Team
+
+       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
+
+          http://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.
+
+-->
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.simplelistparameter.CarMapper">
+
+	<resultMap id="carResult" type="Car">
+		<id column="id" /> <!-- id missing property attribute -->
+		<result property="name" column="name" />
+		<collection property="carParts"
+			column="id"
+			javaType="ArrayList"
+			ofType="Part"
+			select="getCarPartInfo" />
+	</resultMap>
+	
+	<resultMap id="partResult" type="Part">
+		<constructor>
+			<arg column="name" javaType="String"/>
+		</constructor>
+		<id column="partId" /> <!-- id missing property attribute -->
+	</resultMap>
+
+	<select id="getCarsInfo" resultMap="carResult">
+		SELECT car_id as "id", name
+		FROM car where car_id=#{id}
+	</select>
+
+	<select id="getCarPartInfo" resultMap="partResult">
+		SELECT part_id as "partId", name
+		FROM part where car_id=#{id}
+	</select>
+
+</mapper>

src/test/java/org/apache/ibatis/submitted/simplelistparameter/MapperConfig.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+       Copyright 2009-2011 The MyBatis Team
+
+       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
+
+          http://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.
+
+-->
+
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+	<settings>
+		<setting name="mapUnderscoreToCamelCase" value="true" />
+	</settings>
+
+	<typeAliases>
+		<package name="org/apache/ibatis/submitted/simplelistparameter" />
+	</typeAliases>
+
+	<environments default="development">
+		<environment id="development">
+			<transactionManager type="JDBC">
+				<property name="" value="" />
+			</transactionManager>
+			<dataSource type="UNPOOLED">
+				<property name="driver" value="org.hsqldb.jdbcDriver" />
+				<property name="url" value="jdbc:hsqldb:mem:simplelistparameter" />
+				<property name="username" value="sa" />
+			</dataSource>
+		</environment>
+	</environments>
+	
+	<mappers>
+		<mapper resource="org/apache/ibatis/submitted/simplelistparameter/Map.xml" />
+	</mappers>
+
+</configuration>

src/test/java/org/apache/ibatis/submitted/simplelistparameter/Part.java

@@ -0,0 +1,28 @@
+/*
+ *    Copyright 2009-2012 The MyBatis Team
+ *
+ *    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
+ *
+ *       http://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.simplelistparameter;
+
+public class Part {
+
+  private String name;
+  
+  public Part(String name) {
+	  this.name = name;
+  }
+	public String getName() {
+    return name;
+  }
+}

src/test/java/org/apache/ibatis/submitted/simplelistparameter/SimpleListParameterTest.java

@@ -0,0 +1,69 @@
+/*
+ *    Copyright 2009-2012 The MyBatis Team
+ *
+ *    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
+ *
+ *       http://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.simplelistparameter;
+
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.hsqldb.lib.ArraySort;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SimpleListParameterTest {
+
+  private static SqlSessionFactory sqlSessionFactory;
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    // create a SqlSessionFactory
+    Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/simplelistparameter/MapperConfig.xml");
+    sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    reader.close();
+
+    // populate in-memory database
+    SqlSession session = sqlSessionFactory.openSession();
+    Connection conn = session.getConnection();
+    reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/simplelistparameter/CreateDB.sql");
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setLogWriter(null);
+    runner.runScript(reader);
+    reader.close();
+    session.close();
+  }
+
+  @Test
+  public void shouldMapResultsWithoutActuallyWritingIdProperties() throws Exception {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      CarMapper carMapper = sqlSession.getMapper(CarMapper.class);
+      Car car = new Car();
+      car.setCarParts(Arrays.asList(new String[] {"2", "4"}));
+      List<Car> cars = carMapper.getCar(car);
+      Assert.assertNotNull(cars);
+    } finally {
+      sqlSession.close();
+    }
+  }
+
+}