Exclude the columns used in constructor-automapping when applying property-automapping

This logic is applied only to the new arg-name-based constructor auto-mapping.
Although it is possible (and it may also be the expected behavior) to apply the same logic to the old column-order-based constructor auto-mapping, it will break many existing solutions, probably.

Author: harawata

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

@@ -100,6 +100,7 @@ public class DefaultResultSetHandler implements ResultSetHandler {
 
   // Cached Automappings
   private final Map<String, List<UnMappedColumnAutoMapping>> autoMappingsCache = new HashMap<>();
+  private final Map<String, List<String>> constructorAutoMappingColumns = new HashMap<>();
 
   // temporary marking flag that indicate using constructor mapping (use field to reduce memory usage)
   private boolean useConstructorMappings;
@@ -524,6 +525,10 @@ private List<UnMappedColumnAutoMapping> createAutomaticMappings(ResultSetWrapper
     if (autoMapping == null) {
       autoMapping = new ArrayList<>();
       final List<String> unmappedColumnNames = rsw.getUnmappedColumnNames(resultMap, columnPrefix);
+      List<String> mappedInConstructorAutoMapping = constructorAutoMappingColumns.remove(mapKey);
+      if (mappedInConstructorAutoMapping != null) {
+        unmappedColumnNames.removeAll(mappedInConstructorAutoMapping);
+      }
       for (String columnName : unmappedColumnNames) {
         String propertyName = columnName;
         if (columnPrefix != null && !columnPrefix.isEmpty()) {
@@ -660,7 +665,7 @@ private Object createResultObject(ResultSetWrapper rsw, ResultMap resultMap, Lis
     } else if (resultType.isInterface() || metaType.hasDefaultConstructor()) {
       return objectFactory.create(resultType);
     } else if (shouldApplyAutomaticMappings(resultMap, false)) {
-      return createByConstructorSignature(rsw, resultType, constructorArgTypes, constructorArgs);
+      return createByConstructorSignature(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs);
     }
     throw new ExecutorException("Do not know how to create an instance of " + resultType);
   }
@@ -692,9 +697,9 @@ Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> resultType
     return foundValues ? objectFactory.create(resultType, constructorArgTypes, constructorArgs) : null;
   }
 
-  private Object createByConstructorSignature(ResultSetWrapper rsw, Class<?> resultType,
+  private Object createByConstructorSignature(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType,
       List<Class<?>> constructorArgTypes, List<Object> constructorArgs) throws SQLException {
-    return applyConstructorAutomapping(rsw, resultType, constructorArgTypes, constructorArgs,
+    return applyConstructorAutomapping(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs,
         findConstructorForAutomapping(resultType, rsw).orElseThrow(() -> new ExecutorException(
             "No constructor found in " + resultType.getName() + " matching " + rsw.getClassNames())));
   }
@@ -733,10 +738,10 @@ private boolean findUsableConstructorByArgTypes(final Constructor<?> constructor
     return true;
   }
 
-  private Object applyConstructorAutomapping(ResultSetWrapper rsw, Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor) throws SQLException {
+  private Object applyConstructorAutomapping(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType, List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor) throws SQLException {
     boolean foundValues = false;
     if (configuration.isArgNameBasedConstructorAutoMapping()) {
-      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultType, constructorArgTypes, constructorArgs,
+      foundValues = applyArgNameBasedConstructorAutoMapping(rsw, resultMap, columnPrefix, resultType, constructorArgTypes, constructorArgs,
           constructor, foundValues);
     } else {
       foundValues = applyColumnOrderBasedConstructorAutomapping(rsw, constructorArgTypes, constructorArgs, constructor,
@@ -759,7 +764,7 @@ private boolean applyColumnOrderBasedConstructorAutomapping(ResultSetWrapper rsw
     return foundValues;
   }
 
-  private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, Class<?> resultType,
+  private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix, Class<?> resultType,
       List<Class<?>> constructorArgTypes, List<Object> constructorArgs, Constructor<?> constructor, boolean foundValues)
       throws SQLException {
     List<String> missingArgs = null;
@@ -776,6 +781,10 @@ private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, Cl
           Object value = typeHandler.getResult(rsw.getResultSet(), columnName);
           constructorArgTypes.add(paramType);
           constructorArgs.add(value);
+          final String mapKey = resultMap.getId() + ":" + columnPrefix;
+          if (!autoMappingsCache.containsKey(mapKey)) {
+            constructorAutoMappingColumns.computeIfAbsent(mapKey, k -> new ArrayList<>()).add(columnName);
+          }
           columnNotFound = false;
           foundValues = value != null || foundValues;
         }

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java

@@ -53,7 +53,7 @@ void shouldFindResultsInDifferentOrder() {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       User user = mapper.selectNameAndId(1);
       assertEquals(Integer.valueOf(1), user.getId());
-      assertEquals("User1", user.getName());
+      assertEquals("User1!", user.getName());
     }
   }
 
@@ -65,7 +65,7 @@ void shouldRespectUseColumnLabelSetting() {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       User user = mapper.selectNameAndIdWithBogusLabel(1);
       assertEquals(Integer.valueOf(1), user.getId());
-      assertEquals("User1", user.getName());
+      assertEquals("User1!", user.getName());
     } finally {
       sqlSessionFactory.getConfiguration().setUseColumnLabel(true);
     }
@@ -76,7 +76,7 @@ void shouldErrorMessageBeHelpful() {
     // This test requires -parameters compiler option
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
-      User user = mapper.selectNameAndIdWithBogusLabel(1);
+      mapper.selectNameAndIdWithBogusLabel(1);
       fail("Exception should be thrown");
     } catch (PersistenceException e) {
       ExecutorException ex = (ExecutorException) e.getCause();
@@ -96,7 +96,7 @@ void shouldWorkWithExtraColumns() {
       Mapper mapper = sqlSession.getMapper(Mapper.class);
       User user = mapper.selectNameTeamAndId(1);
       assertEquals(Integer.valueOf(1), user.getId());
-      assertEquals("User1", user.getName());
+      assertEquals("User1!", user.getName());
       assertEquals(99, user.getTeam());
     }
   }

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/User.java

@@ -24,7 +24,7 @@ public class User {
   public User(Integer id, String name) {
     super();
     this.id = id;
-    this.name = name;
+    this.name = name + "!";
   }
 
   public Integer getId() {