Fix for http://code.google.com/p/mybatis/issues/detail?id=393 (add resultMap attribute to constructor/idArg element)

Author: emacarron

pom.xml

@@ -46,6 +46,10 @@
         <name>Riccardo Cossu</name>
         <email>[email protected]</email>
     </contributor>
+    <contributor>
+        <name>Tim Chen</name>
+        <email>[email protected]</email>
+    </contributor>
   </contributors>
   <properties>
     <findbugs.onlyAnalyze>org.apache.ibatis.*</findbugs.onlyAnalyze>

src/main/java/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd

@@ -70,6 +70,8 @@ javaType CDATA #IMPLIED
 column CDATA #IMPLIED
 jdbcType CDATA #IMPLIED
 typeHandler CDATA #IMPLIED
+select CDATA #IMPLIED
+resultMap CDATA #IMPLIED
 >
 
 <!ELEMENT arg EMPTY>

src/test/java/domain/blog/ComplexImmutableAuthor.java

@@ -0,0 +1,59 @@
+package domain.blog;
+
+import java.io.Serializable;
+
+public class ComplexImmutableAuthor implements Serializable {
+  private final ComplexImmutableAuthorId theComplexImmutableAuthorId;
+  protected final String bio;
+  protected final Section favouriteSection;
+
+  public ComplexImmutableAuthor(ComplexImmutableAuthorId aComplexImmutableAuthorId, String bio, Section section) {
+    theComplexImmutableAuthorId = aComplexImmutableAuthorId;
+    this.bio = bio;
+    this.favouriteSection = section;
+  }
+
+  public ComplexImmutableAuthorId getComplexImmutableAuthorId() {
+    return theComplexImmutableAuthorId;
+  }
+
+  public String getBio() {
+    return bio;
+  }
+
+  public Section getFavouriteSection() {
+    return favouriteSection;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    final ComplexImmutableAuthor that = (ComplexImmutableAuthor) o;
+
+    if (bio != null ? !bio.equals(that.bio) : that.bio != null) {
+      return false;
+    }
+    if (favouriteSection != that.favouriteSection) {
+      return false;
+    }
+    if (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId) : that.theComplexImmutableAuthorId != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int myresult = theComplexImmutableAuthorId != null ? theComplexImmutableAuthorId.hashCode() : 0;
+    myresult = 31 * myresult + (bio != null ? bio.hashCode() : 0);
+    myresult = 31 * myresult + (favouriteSection != null ? favouriteSection.hashCode() : 0);
+    return myresult;
+  }
+}

src/test/java/domain/blog/ComplexImmutableAuthorId.java

@@ -0,0 +1,67 @@
+package domain.blog;
+
+public class ComplexImmutableAuthorId {
+  protected final int id;
+  protected final String email;
+  protected final String username;
+  protected final String password;
+
+  public ComplexImmutableAuthorId(int aId, String aEmail, String aUsername, String aPassword) {
+    id = aId;
+    email = aEmail;
+    username = aUsername;
+    password = aPassword;
+  }
+
+  public int getId() {
+    return id;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    final ComplexImmutableAuthorId that = (ComplexImmutableAuthorId) o;
+
+    if (id != that.id) {
+      return false;
+    }
+    if (email != null ? !email.equals(that.email) : that.email != null) {
+      return false;
+    }
+    if (password != null ? !password.equals(that.password) : that.password != null) {
+      return false;
+    }
+    if (username != null ? !username.equals(that.username) : that.username != null) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int myresult = id;
+    myresult = 31 * myresult + (email != null ? email.hashCode() : 0);
+    myresult = 31 * myresult + (username != null ? username.hashCode() : 0);
+    myresult = 31 * myresult + (password != null ? password.hashCode() : 0);
+    return myresult;
+  }
+}

src/test/java/org/apache/ibatis/builder/AuthorMapper.xml

@@ -31,11 +31,33 @@
     </constructor>
   </resultMap>
 
+    <resultMap id="complexAuthorId" type="domain.blog.ComplexImmutableAuthorId">
+      <constructor>
+        <idArg column="id" javaType="_int"/>
+        <idArg column="username" javaType="string"/>
+        <idArg column="password" javaType="string"/>
+        <idArg column="email" javaType="string"/>
+      </constructor>
+    </resultMap>
+
+    <resultMap id="selectComplexImmutableAuthor" type="domain.blog.ComplexImmutableAuthor">
+      <constructor>
+        <idArg javaType="domain.blog.ComplexImmutableAuthorId" resultMap="complexAuthorId"/>
+        <arg column="bio" javaType="string"/>
+        <arg column="favourite_section" javaType="domain.blog.Section"/>
+      </constructor>
+    </resultMap>
+
   <select id="selectAllAuthors"
           resultType="domain.blog.Author">
     select * from author
   </select>
 
+    <select id="selectComplexAuthors"
+            resultMap="selectComplexImmutableAuthor">
+      select * from author
+    </select>
+
   <select id="selectAuthor"
           parameterMap="selectAuthor"
           resultMap="selectAuthor">

src/test/java/org/apache/ibatis/session/SqlSessionManagerTest.java

@@ -103,6 +103,12 @@ public void shouldSelectAllAuthors() throws Exception {
     assertEquals(2, authors.size());
   }
 
+  @Test
+  public void shouldSelectAllComplexAuthors() throws Exception {
+    List<ComplexImmutableAuthor> authors = manager.selectList("domain.blog.mappers.AuthorMapper.selectComplexAuthors");
+    assertEquals(2, authors.size());
+  }
+
   @Test
   public void shouldSelectCountOfPosts() throws Exception {
     Integer count = (Integer) manager.selectOne("domain.blog.mappers.BlogMapper.selectCountOfPosts");