Fix and documentation for http://code.google.com/p/mybatis/issues/detail?id=1 - @resultMap annotation

Author: jeffgbutler

doc/en/MyBatis-3-User-Guide.doc

@@ -0,0 +1,12 @@
+package org.apache.ibatis.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ResultMap {
+  public abstract String value();
+}

doc/en/MyBatis-3-User-Guide.pdf

@@ -26,6 +26,7 @@
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectKey;
@@ -251,6 +252,14 @@ private void parseStatement(Method method) {
         resultSetType = options.resultSetType();
       }
 
+      ResultMap resultMapAnnotation = method.getAnnotation(ResultMap.class);
+      String resultMapId;
+      if (resultMapAnnotation == null) {
+          resultMapId = generateResultMapName(method);
+      } else {
+          resultMapId = resultMapAnnotation.value();
+      }
+      
       assistant.addMappedStatement(
           mappedStatementId,
           sqlSource,
@@ -260,7 +269,7 @@ private void parseStatement(Method method) {
           timeout,
           null,                             // ParameterMapID
           getParameterType(method),
-          generateResultMapName(method),    // ResultMapID
+          resultMapId,    // ResultMapID
           getReturnType(method),
           resultSetType,
           flushCache,

src/main/java/org/apache/ibatis/annotations/ResultMap.java

@@ -61,6 +61,7 @@ public void testWithoutComplex() {
         Assert.assertEquals("Smith", parent.getLastName());
       sqlSession.close();
     }
+    
     @Test
     public void testWithComplex() {
         SqlSession sqlSession = sqlSessionFactory.openSession();
@@ -76,4 +77,36 @@ public void testWithComplex() {
       sqlSession.close();
 
     }
+
+    @Test
+    public void testWithComplex2() {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+        Person person = personMapper.getWithComplex2(2l);
+        Assert.assertNotNull("person must not be null", person);
+        Assert.assertEquals("Christian", person.getFirstName());
+        Assert.assertEquals("Poitras", person.getLastName());
+        Person parent = person.getParent();
+        Assert.assertNotNull("parent must not be null", parent);
+        Assert.assertEquals("John", parent.getFirstName());
+        Assert.assertEquals("Smith", parent.getLastName());
+      sqlSession.close();
+
+    }
+
+    @Test
+    public void testWithComplex3() {
+        SqlSession sqlSession = sqlSessionFactory.openSession();
+        PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
+        Person person = personMapper.getWithComplex3(2l);
+        Assert.assertNotNull("person must not be null", person);
+        Assert.assertEquals("Christian", person.getFirstName());
+        Assert.assertEquals("Poitras", person.getLastName());
+        Person parent = person.getParent();
+        Assert.assertNotNull("parent must not be null", parent);
+        Assert.assertEquals("John", parent.getFirstName());
+        Assert.assertEquals("Smith", parent.getLastName());
+      sqlSession.close();
+
+    }
 }

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -1,7 +1,26 @@
 package org.apache.ibatis.submitted.complex_column;
 
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
 public interface PersonMapper {
 
     public Person getWithoutComplex(Long id);
     public Person getWithComplex(Long id);
+    
+    @Select({
+      "SELECT id, firstName, lastName, parent_id, parent_firstName, parent_lastName",
+      "FROM Person",
+      "WHERE id = #{id,jdbcType=INTEGER}"
+    })
+    @ResultMap("personMapComplex")
+    public Person getWithComplex2(Long id);
+
+    @Select({
+        "SELECT id, firstName, lastName, parent_id, parent_firstName, parent_lastName",
+        "FROM Person",
+        "WHERE id = #{id,jdbcType=INTEGER}"
+      })
+    @ResultMap("org.apache.ibatis.submitted.complex_column.PersonMapper.personMapComplex")
+    public Person getWithComplex3(Long id);
 }