Fixes #19 and #9. Fail fast when there is no typehandler for a mapping.

Author: emacarron

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

@@ -326,12 +326,6 @@ protected Object getPropertyMappingValue(ResultSet rs, MetaObject metaResultObje
       return OMIT;
     } else {
       final TypeHandler<?> typeHandler = propertyMapping.getTypeHandler();
-      if (typeHandler == null) { // issue #9
-        throw new ExecutorException("Unknown type " + propertyMapping.getJavaType() 
-            + " in mapping property=" + propertyMapping.getProperty()
-            + " column=" +  propertyMapping.getColumn()
-            + ". You need to register a TypeHandler for this type for MyBatis to correctly convert the result.");
-      }
       final String column = prependPrefix(propertyMapping.getColumn(), columnPrefix);
       return typeHandler.getResult(rs, column);
     }
@@ -462,7 +456,7 @@ protected Object getNestedQueryConstructorValue(ResultSet rs, ResultMapping cons
       final Class<?> targetType = constructorMapping.getJavaType();
       final Object nestedQueryCacheObject = getNestedQueryCacheObject(nestedQuery, key);
       if (nestedQueryCacheObject != null && nestedQueryCacheObject instanceof List) {
-        value = resultExtractor.extractObjectFromList((List<Object>)nestedQueryCacheObject, targetType);
+        value = resultExtractor.extractObjectFromList((List<Object>) nestedQueryCacheObject, targetType);
       } else {
         final ResultLoader resultLoader = new ResultLoader(configuration, executor, nestedQuery, nestedQueryParameterObject, targetType, key, nestedBoundSql);
         value = resultLoader.loadResult();
@@ -471,7 +465,8 @@ protected Object getNestedQueryConstructorValue(ResultSet rs, ResultMapping cons
     return value;
   }
 
-  protected Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix) throws SQLException {
+  protected Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultObject, ResultMapping propertyMapping, ResultLoaderMap lazyLoader, String columnPrefix)
+      throws SQLException {
     final String nestedQueryId = propertyMapping.getNestedQueryId();
     final String property = propertyMapping.getProperty();
     final MappedStatement nestedQuery = configuration.getMappedStatement(nestedQueryId);
@@ -484,7 +479,7 @@ protected Object getNestedQueryMappingValue(ResultSet rs, MetaObject metaResultO
       final Class<?> targetType = propertyMapping.getJavaType();
       final Object nestedQueryCacheObject = getNestedQueryCacheObject(nestedQuery, key);
       if (nestedQueryCacheObject != null && nestedQueryCacheObject instanceof List) {
-        value = resultExtractor.extractObjectFromList((List<Object>)nestedQueryCacheObject, targetType);
+        value = resultExtractor.extractObjectFromList((List<Object>) nestedQueryCacheObject, targetType);
       } else if (executor.isCached(nestedQuery, key)) {
         executor.deferLoad(nestedQuery, metaResultObject, property, key, targetType);
       } else {

src/main/java/org/apache/ibatis/mapping/ResultMapping.java

@@ -117,25 +117,29 @@ public Builder composites(List<ResultMapping> composites) {
     }
 
     public ResultMapping build() {
-      validate();
       // lock down collections
       resultMapping.flags = Collections.unmodifiableList(resultMapping.flags);
       resultMapping.composites = Collections.unmodifiableList(resultMapping.composites);
       resolveTypeHandler();
+      validate();
       return resultMapping;
     }
 
     private void validate() {
-      // Issue 4: column is mandatory on nested queries
-      if (resultMapping.nestedQueryId != null && resultMapping.column == null && resultMapping.composites.size() == 0) {
-        throw new IllegalStateException("Missing column attribute for nested select in property " + resultMapping.property);
-      }
-      // Issue 697: cannot define both nestedQueryId and nestedResultMapId
+      // Issue #697: cannot define both nestedQueryId and nestedResultMapId
       if (resultMapping.nestedQueryId != null && resultMapping.nestedResultMapId != null) {
         throw new IllegalStateException("Cannot define both nestedQueryId and nestedResultMapId in property " + resultMapping.property);
       }
+      // Issue #5: there should be no mappings without typehandler
+      if (resultMapping.nestedQueryId == null && resultMapping.nestedResultMapId == null && resultMapping.typeHandler == null) {
+        throw new IllegalStateException("No typehandler found for property " + resultMapping.property);
+      }    
+      // Issue #4: column is mandatory on nested queries
+      if (resultMapping.nestedQueryId != null && resultMapping.column == null && resultMapping.composites.size() == 0) {
+        throw new IllegalStateException("Missing column attribute for nested select in property " + resultMapping.property);
+      }
     }
-
+    
     private void resolveTypeHandler() {
       if (resultMapping.typeHandler == null) {
         if (resultMapping.javaType != null) {

src/test/java/org/apache/ibatis/submitted/unknownobject/UnknownObjectTest.java

@@ -24,16 +24,14 @@
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
-import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class UnknownObjectTest {
 
   private static SqlSessionFactory sqlSessionFactory;
 
-  @BeforeClass
-  public static void setUp() throws Exception {
+  @Test(expected=PersistenceException.class)
+  public void shouldFailBecauseThereIsAPropertyWithoutTypeHandler() throws Exception {
     // create a SqlSessionFactory
     Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/unknownobject/mybatis-config.xml");
     sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
@@ -50,16 +48,4 @@ public static void setUp() throws Exception {
     session.close();
   }
 
-  @Test(expected=PersistenceException.class)
-  public void shouldGetAUser() {
-    SqlSession sqlSession = sqlSessionFactory.openSession();
-    try {
-      Mapper mapper = sqlSession.getMapper(Mapper.class);
-      User user = mapper.getUser(1);
-      Assert.assertEquals("User1", user.getName());
-    } finally {
-      sqlSession.close();
-    }
-  }
-
 }