Revert #618. Reason in issue's comments

Author: emacarron

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

@@ -28,15 +28,8 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Many {
-	
   String select() default "";
 
   FetchType fetchType() default FetchType.DEFAULT;
 
-  String resultSet() default "";
-
-	String resultMap() default "";
-	
-	String foreignColumn() default "";
-
 }

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

@@ -511,45 +511,17 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
           result.javaType() == void.class ? null : result.javaType(),
           result.jdbcType() == JdbcType.UNDEFINED ? null : result.jdbcType(),
           hasNestedSelect(result) ? nestedSelectId(result) : null,
-          hasResultMap(result) ? getResultMap(result) : null,
+          null,
           null,
           null,
           typeHandler,
           flags,
-          hasResultSet(result) ? getResultSet(result) : null,
-          hasForeignColumn(result) ? getForeignColumn(result) : null,
+          null,
+          null,
           isLazy(result));
       resultMappings.add(resultMapping);
     }
   }
-
-  private boolean hasResultSet(Result result) {
-    return result.many().resultSet().length() > 0;
-  }
-
-  private boolean hasResultMap(Result result) {
-    return result.many().resultMap().length() > 0;
-  }
-
-  private boolean hasForeignColumn(Result result) {
-    return result.many().foreignColumn().length() > 0;
-  }
-
-  private String getResultSet(Result result) {
-    return result.many().resultSet();
-  }
-
-  private String getResultMap(Result result) {
-    String nestedResultMap = result.many().resultMap();
-    if (!nestedResultMap.contains(".")) {
-      nestedResultMap = type.getName() + "." + nestedResultMap;
-    }
-    return nestedResultMap;
-  }
-
-  private String getForeignColumn(Result result) {
-    return result.many().foreignColumn();
-  }
 
   private String nestedSelectId(Result result) {
     String nestedSelect = result.one().select();

src/test/java/org/apache/ibatis/submitted/sptests/SPMapper.java

@@ -18,7 +18,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Many;
 import org.apache.ibatis.annotations.Options;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Result;
@@ -48,15 +47,6 @@ public interface SPMapper {
 
   List<Name> getNamesAndItemsLinkedById(int id);
 
-  @Select("{call sptest.getnamesanditems()}")
-  @Results({
-    @Result(property = "firstName", column = "FIRST_NAME"),
-    @Result(property = "lastName", column = "LAST_NAME"),
-    @Result(property = "items", column = "ID", many = @Many(resultMap = "itemResult", resultSet = "items", foreignColumn = "name_id"))
-  })
-  @Options(resultSets = "names,items", statementType = StatementType.CALLABLE)
-  List<Name> getNamesAndItemsLinkedAnnotationBased();
-
   Object echoDate(Map<String, Object> parameter);  // issue #145
 
   // annotated

src/test/java/org/apache/ibatis/submitted/sptests/SPTest.java

@@ -858,21 +858,4 @@ public void testGetNamesAndItemsLinkedWithNoMatchingInfo() throws SQLException {
     }
   }
 
-  @Test
-  public void testGetNamesAndItemsLinkedAnnotationBased() throws SQLException {
-    SqlSession sqlSession = sqlSessionFactory.openSession();
-    try {
-      SPMapper spMapper = sqlSession.getMapper(SPMapper.class);
-
-      List<Name> names = spMapper.getNamesAndItemsLinkedAnnotationBased();
-      assertEquals(4, names.size());
-      assertEquals(2, names.get(0).getItems().size());
-      assertEquals(1, names.get(1).getItems().size());
-      assertNull(names.get(2).getItems());
-      assertNull(names.get(3).getItems());
-    } finally {
-      sqlSession.close();
-    }
-  }
-
 }