Support constructor-auto-mapping using super type #1240

Author: kazuki43zoo

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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.
@@ -29,6 +29,7 @@
 import org.apache.ibatis.executor.result.DefaultResultContext;
 import org.apache.ibatis.executor.result.DefaultResultHandler;
 import org.apache.ibatis.executor.result.ResultMapException;
+import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.Discriminator;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -697,15 +698,24 @@ private boolean allowedConstructor(final Constructor<?> constructor, final List<
     if (parameterTypes.length != classNames.size()) return false;
     for (int i = 0; i < parameterTypes.length; i++) {
       final Class<?> parameterType = parameterTypes[i];
-      if (parameterType.isPrimitive() && !primitiveTypes.getWrapper(parameterType).getName().equals(classNames.get(i))) {
+      final String className = classNames.get(i);
+      if (parameterType.isPrimitive() && !primitiveTypes.getWrapper(parameterType).getName().equals(className)) {
         return false;
-      } else if (!parameterType.isPrimitive() && !parameterType.getName().equals(classNames.get(i))) {
+      } else if (!parameterType.isPrimitive() && !parameterType.isAssignableFrom(toClassForName(className))) {
         return false;
       }
     }
     return true;
   }
 
+  private Class<?> toClassForName(String className) {
+    try {
+      return Resources.classForName(className);
+    } catch (ClassNotFoundException e) {
+      throw new ExecutorException(e);
+    }
+  }
+
   private List<String> typeNames(Class<?>[] parameterTypes) {
     List<String> names = new ArrayList<String>();
     for (Class<?> type : parameterTypes) {

src/test/java/org/apache/ibatis/autoconstructor/CreateDB.sql

@@ -1,5 +1,5 @@
 --
---    Copyright 2009-2017 the original author or authors.
+--    Copyright 2009-2018 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.
@@ -22,10 +22,11 @@ CREATE TABLE subject (
   name   VARCHAR(20),
   age    INT NOT NULL,
   height INT,
-  weight INT
+  weight INT,
+  dt TIMESTAMP
 );
 
-INSERT INTO subject (id, name, age, height, weight) VALUES (1, 'a', 10, 100, 45);
-INSERT INTO subject (id, name, age, height, weight) VALUES (2, 'b', 10, NULL, 45);
-INSERT INTO subject (id, name, age, height, weight) VALUES (2, 'b', 10, NULL, NULL);
+INSERT INTO subject (id, name, age, height, weight, dt) VALUES (1, 'a', 10, 100, 45, CURRENT_TIMESTAMP );
+INSERT INTO subject (id, name, age, height, weight, dt) VALUES (2, 'b', 10, NULL, 45, CURRENT_TIMESTAMP);
+INSERT INTO subject (id, name, age, height, weight, dt) VALUES (2, 'b', 10, NULL, NULL, CURRENT_TIMESTAMP);
 

src/test/java/org/apache/ibatis/autoconstructor/PrimitiveSubject.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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,18 +15,22 @@
  */
 package org.apache.ibatis.autoconstructor;
 
+import java.util.Date;
+
 public class PrimitiveSubject {
   private final int id;
   private final String name;
   private final int age;
   private final int height;
   private final int weight;
+  private final Date dt;
 
-  public PrimitiveSubject(final int id, final String name, final int age, final int height, final int weight) {
+  public PrimitiveSubject(final int id, final String name, final int age, final int height, final int weight, final Date dt) {
     this.id = id;
     this.name = name;
     this.age = age;
     this.height = height;
     this.weight = weight;
+    this.dt = dt;
   }
 }

src/test/java/org/apache/ibatis/autoconstructor/WrapperSubject.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2017 the original author or authors.
+ *    Copyright 2009-2018 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,18 +15,22 @@
  */
 package org.apache.ibatis.autoconstructor;
 
+import java.sql.Timestamp;
+
 public class WrapperSubject {
   private final int id;
   private final String name;
   private final int age;
   private final int height;
   private final int weight;
+  private final Timestamp dt;
 
-  public WrapperSubject(final int id, final String name, final int age, final Integer height, final Integer weight) {
+  public WrapperSubject(final int id, final String name, final int age, final Integer height, final Integer weight, Timestamp dt) {
     this.id = id;
     this.name = name;
     this.age = age;
     this.height = height == null ? 0 : height;
     this.weight = weight == null ? 0 : weight;
+    this.dt = dt;
   }
 }