To simplify keyProperty referencing rule, drop the code for backward compatibility.

Author: harawata

src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java

@@ -21,7 +21,6 @@
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.binding.BindingException;
@@ -92,26 +91,6 @@ public void processBatch(MappedStatement ms, Statement stmt, Object parameter) {
 
   protected void assignKeysToOneOfParams(final Configuration configuration, ResultSet rs, final String[] keyProperties,
       Map<?, ?> paramMap) throws SQLException {
-    // For backward compatibility, search parameter with special name first.
-    if (paramMap.containsKey("collection")) {
-      Object param = paramMap.get("collection");
-      if (param instanceof Collection) {
-        assignKeysToParam(configuration, rs, keyProperties, param);
-        return;
-      }
-    } else if (paramMap.containsKey("list")) {
-      Object param = paramMap.get("list");
-      if (param instanceof List) {
-        assignKeysToParam(configuration, rs, keyProperties, param);
-        return;
-      }
-    } else if (paramMap.containsKey("array")) {
-      Object param = paramMap.get("array");
-      if (param instanceof Object[]) {
-        assignKeysToParam(configuration, rs, keyProperties, param);
-        return;
-      }
-    }
     // Assuming 'keyProperty' includes the parameter name. e.g. 'param.id'.
     int firstDot = keyProperties[0].indexOf('.');
     if (firstDot == -1) {

src/test/java/org/apache/ibatis/submitted/keygen/Jdbc3KeyGeneratorTest.java

@@ -251,60 +251,6 @@ public void shouldFailIfKeyPropertyIsInvalid_WrongParamName() throws Exception {
     }
   }
 
-  @Test
-  public void shouldAssignKeysToList_MultiParams() throws Exception {
-    SqlSession sqlSession = sqlSessionFactory.openSession();
-    try {
-      CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
-      List<Country> countries = new ArrayList<Country>();
-      countries.add(new Country("China", "CN"));
-      countries.add(new Country("United Kiongdom", "GB"));
-      mapper.insertListAndSomeId(countries, Integer.valueOf(1));
-      for (Country country : countries) {
-        assertNotNull(country.getId());
-      }
-    } finally {
-      sqlSession.rollback();
-      sqlSession.close();
-    }
-  }
-
-  @Test
-  public void shouldAssignKeysToCollection_MultiParams() throws Exception {
-    SqlSession sqlSession = sqlSessionFactory.openSession();
-    try {
-      CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
-      Set<Country> countries = new HashSet<Country>();
-      countries.add(new Country("China", "CN"));
-      countries.add(new Country("United Kiongdom", "GB"));
-      mapper.insertSetAndSomeId(countries, Integer.valueOf(1));
-      for (Country country : countries) {
-        assertNotNull(country.getId());
-      }
-    } finally {
-      sqlSession.rollback();
-      sqlSession.close();
-    }
-  }
-
-  @Test
-  public void shouldAssignKeysToArray_MultiParams() throws Exception {
-    SqlSession sqlSession = sqlSessionFactory.openSession();
-    try {
-      CountryMapper mapper = sqlSession.getMapper(CountryMapper.class);
-      Country[] countries = new Country[2];
-      countries[0] = new Country("China", "CN");
-      countries[1] = new Country("United Kiongdom", "GB");
-      mapper.insertArrayAndSomeId(countries, Integer.valueOf(1));
-      for (Country country : countries) {
-        assertNotNull(country.getId());
-      }
-    } finally {
-      sqlSession.rollback();
-      sqlSession.close();
-    }
-  }
-
   @Test
   public void shouldAssignKeysToNamedList_MultiParams() throws Exception {
     SqlSession sqlSession = sqlSessionFactory.openSession();