#93 auto-mapping should also be applied to deeply nested collection/association.

Author: harawata

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

@@ -748,7 +748,7 @@ private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey c
     if (resultObject != null) {
       final MetaObject metaObject = configuration.newMetaObject(resultObject);
       ancestorObjects.put(absoluteKey, resultObject);
-      applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, false);
+      applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, false, parentAutoMapping);
       ancestorObjects.remove(absoluteKey);
     } else {
       final ResultLoaderMap lazyLoader = instantiateResultLoaderMap();
@@ -761,7 +761,7 @@ private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey c
         }        
         foundValues = applyPropertyMappings(rsw, resultMap, metaObject, lazyLoader, columnPrefix) || foundValues;
         ancestorObjects.put(absoluteKey, resultObject);
-        foundValues = applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, true) || foundValues;
+        foundValues = applyNestedResultMappings(rsw, resultMap, metaObject, columnPrefix, combinedKey, true, parentAutoMapping) || foundValues;
         ancestorObjects.remove(absoluteKey);
         foundValues = (lazyLoader != null && lazyLoader.size() > 0) || foundValues;
         resultObject = foundValues ? resultObject : null;
@@ -775,7 +775,7 @@ private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey c
   // NESTED RESULT MAP (JOIN MAPPING)
   //
 
-  private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, String parentPrefix, CacheKey parentRowKey, boolean newObject) {
+  private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap resultMap, MetaObject metaObject, String parentPrefix, CacheKey parentRowKey, boolean newObject, Boolean parentAutoMapping) {
     boolean foundValues = false;
     for (ResultMapping resultMapping : resultMap.getPropertyResultMappings()) {
       final String nestedResultMapId = resultMapping.getNestedResultMapId();
@@ -793,7 +793,7 @@ private boolean applyNestedResultMappings(ResultSetWrapper rsw, ResultMap result
             boolean knownValue = (rowValue != null);
             final Object collectionProperty = instantiateCollectionPropertyIfAppropriate(resultMapping, metaObject);            
             if (anyNotNullColumnHasValue(resultMapping, columnPrefix, rsw.getResultSet())) {
-              rowValue = getRowValue(rsw, nestedResultMap, combinedKey, rowKey, columnPrefix, rowValue, resultMap.getAutoMapping());
+              rowValue = getRowValue(rsw, nestedResultMap, combinedKey, rowKey, columnPrefix, rowValue, parentAutoMapping != null ? parentAutoMapping : resultMap.getAutoMapping());
               if (rowValue != null && !knownValue) {
                 if (collectionProperty != null) {
                   final MetaObject targetMetaObject = configuration.newMetaObject(collectionProperty);

src/test/java/org/apache/ibatis/submitted/automapping/AutomappingTest.java

@@ -73,6 +73,7 @@ public void shouldGetAUserWithPets() {
 	    Assert.assertEquals("User2", user.getName());
 	    Assert.assertEquals(2, user.getPets().size());
 	    Assert.assertEquals(Integer.valueOf(12), user.getPets().get(0).getPetId());
+	    Assert.assertEquals("John", user.getPets().get(0).getBreeder().getBreederName());
 	    Assert.assertEquals("Kotetsu", user.getPets().get(1).getPetName());
 	  } finally {
 	    sqlSession.close();

src/test/java/org/apache/ibatis/submitted/automapping/Breeder.java

@@ -0,0 +1,38 @@
+/*
+ *    Copyright 2009-2013 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.submitted.automapping;
+
+public class Breeder {
+
+  private Integer breederId;
+  private String breederName;
+
+  public Integer getBreederId() {
+    return breederId;
+  }
+
+  public void setBreederId(Integer breederId) {
+    this.breederId = breederId;
+  }
+
+  public String getBreederName() {
+    return breederName;
+  }
+
+  public void setBreederName(String breederName) {
+    this.breederName = breederName;
+  }
+}

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

@@ -31,6 +31,12 @@ create table books (
 create table pets (
   id int,
   owner int,
+  breeder int,
+  name varchar(20)
+);
+
+create table breeder (
+  id int,
   name varchar(20)
 );
 
@@ -39,6 +45,8 @@ insert into users (id, name) values(2, 'User2');
 
 insert into books (version, name) values(99, 'Learn Java');
 
-insert into pets (id, owner, name) values(11, 1, 'Ren');
-insert into pets (id, owner, name) values(12, 2, 'Chien');
-insert into pets (id, owner, name) values(13, 2, 'Kotetsu');
+insert into pets (id, owner, breeder, name) values(11, 1, null, 'Ren');
+insert into pets (id, owner, breeder, name) values(12, 2, 101, 'Chien');
+insert into pets (id, owner, breeder, name) values(13, 2, null, 'Kotetsu');
+
+insert into breeder (id, name) values(101, 'John');

src/test/java/org/apache/ibatis/submitted/automapping/Mapper.xml

@@ -28,15 +28,20 @@
 	</resultMap>
 
 	<select id="getUserWithPets" resultMap="resultWithPets">
-		select users.id, users.name, pets.id as petId, pets.name as petName from users
+		select users.id, users.name,
+			pets.id as petId, pets.name as petName,
+			breeder.id as breederId, breeder.name as breederName
+		from users
 		left join pets on pets.owner = users.id
+		left join breeder on breeder.id = pets.breeder
 		where users.id = #{id}
 	</select>
 
 	<resultMap type="org.apache.ibatis.submitted.automapping.User" id="resultWithPets" autoMapping="true">
 		<id column="id" property="id"/>
 		<collection property="pets" ofType="org.apache.ibatis.submitted.automapping.Pet">
 			<id column="petId" property="petId"/>
+			<association property="breeder" javaType="org.apache.ibatis.submitted.automapping.Breeder" />
 		</collection>
 	</resultMap>
 

src/test/java/org/apache/ibatis/submitted/automapping/Pet.java

@@ -19,6 +19,7 @@ public class Pet {
 
   private Integer petId;
   private String petName;
+  private Breeder breeder;
 
   public Integer getPetId() {
     return petId;
@@ -35,4 +36,12 @@ public String getPetName() {
   public void setPetName(String petName) {
     this.petName = petName;
   }
+
+  public Breeder getBreeder() {
+    return breeder;
+  }
+
+  public void setBreeder(Breeder breeder) {
+    this.breeder = breeder;
+  }
 }