fixes #555 suport primitive array resultType

Author: wuwen5

src/main/java/org/apache/ibatis/binding/MapperMethod.java

@@ -27,6 +27,7 @@
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.type.ArraysUtils;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
@@ -167,10 +168,14 @@ private <E> Object convertToDeclaredCollection(Configuration config, List<E> lis
   }
 
   @SuppressWarnings("unchecked")
-  private <E> E[] convertToArray(List<E> list) {
-    E[] array = (E[]) Array.newInstance(method.getReturnType().getComponentType(), list.size());
-    array = list.toArray(array);
-    return array;
+  private <E> Object convertToArray(List<E> list) {
+
+    Class<?> componentType = method.getReturnType().getComponentType();
+    if (componentType.isPrimitive()) {
+      return ArraysUtils.toPrimitiveArray(list.toArray(), componentType);
+    }
+
+    return list.toArray((E[])Array.newInstance(componentType, list.size()));
   }
 
   private <K, V> Map<K, V> executeForMap(SqlSession sqlSession, Object[] args) {

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

@@ -0,0 +1,117 @@
+/**
+ *    Copyright 2009-2016 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
+ *
+ *       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.type;
+
+/**
+ * @author wuwen.55@gmail.com
+ */
+public class ArraysUtils {
+
+  private ArraysUtils() {
+    // Prevent Instantiation
+  }
+
+  public static Object toPrimitiveArray(Object[] obj, Class<?> classes) {
+    if (classes == int.class) {
+      return toPrimitiveInt(obj);
+    } else if (classes == boolean.class) {
+      return toPrimitiveBoolean(obj);
+    } else if (classes == byte.class) {
+      return toPrimitiveByte(obj);
+    } else if (classes == long.class) {
+      return toPrimitiveLong(obj);
+    } else if (classes == float.class) {
+      return toPrimitiveFloat(obj);
+    } else if (classes == double.class) {
+      return toPrimitiveDouble(obj);
+    } else if (classes == short.class) {
+      return toPrimitiveShort(obj);
+    } else if (classes == char.class) {
+      return toPrimitiveChar(obj);
+    }
+
+    return null;
+  }
+
+
+  public static int[] toPrimitiveInt(Object[] array) {
+    final int[] result = new int[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Integer) array[i];
+    }
+    return result;
+  }
+
+  public static long[] toPrimitiveLong(Object[] array) {
+    final long[] result = new long[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Long) array[i];
+    }
+    return result;
+  }
+
+  public static short[] toPrimitiveShort(Object[] array) {
+    final short[] result = new short[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Short) array[i];
+    }
+    return result;
+  }
+
+  public static byte[] toPrimitiveByte(Object[] array) {
+    final byte[] result = new byte[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Byte) array[i];
+    }
+    return result;
+  }
+
+  public static double[] toPrimitiveDouble(Object[] array) {
+    final double[] result = new double[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Double) array[i];
+    }
+    return result;
+  }
+
+  public static float[] toPrimitiveFloat(Object[] array) {
+
+    final float[] result = new float[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Float) array[i];
+    }
+    return result;
+  }
+
+  public static boolean[] toPrimitiveBoolean(Object[] array) {
+
+    final boolean[] result = new boolean[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Boolean) array[i];
+    }
+    return result;
+  }
+
+  public static char[] toPrimitiveChar(Object[] array) {
+
+    final char[] result = new char[array.length];
+    for (int i = 0; i < array.length; i++) {
+      result[i] = (Character) array[i];
+    }
+    return result;
+  }
+
+}

src/test/java/org/apache/ibatis/submitted/array_result_type/ArrayResultTypeTest.java

@@ -88,12 +88,10 @@ public void shouldGetSimpleTypeArray() {
     }
   }
 
-  @Test(expected = ClassCastException.class)
+  @Test
   public void shouldGetPrimitiveArray() {
     SqlSession sqlSession = sqlSessionFactory.openSession();
     try {
-      // Throwing an exception is the expected behavior
-      // until #555 is fixed
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       int[] ids = mapper.getUserIdsPrimitive();
       assertEquals(1, ids[0]);