Allow TypeHandler for Enum on annotation configuration #444

Author: kazuki43zoo

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

@@ -38,7 +38,7 @@
 
   JdbcType jdbcType() default JdbcType.UNDEFINED;
 
-  Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
+  Class<? extends TypeHandler> typeHandler() default UnknownTypeHandler.class;
 
   String select() default "";
 

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

@@ -40,7 +40,7 @@
 
   JdbcType jdbcType() default JdbcType.UNDEFINED;
 
-  Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
+  Class<? extends TypeHandler> typeHandler() default UnknownTypeHandler.class;
 
   One one() default @One;
 

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

@@ -36,7 +36,7 @@
 
   JdbcType jdbcType() default JdbcType.UNDEFINED;
 
-  Class<? extends TypeHandler<?>> typeHandler() default UnknownTypeHandler.class;
+  Class<? extends TypeHandler> typeHandler() default UnknownTypeHandler.class;
 
   Case[] cases();
 }

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

@@ -240,7 +240,9 @@ private Discriminator applyDiscriminator(String resultMapId, Class<?> resultType
       String column = discriminator.column();
       Class<?> javaType = discriminator.javaType() == void.class ? String.class : discriminator.javaType();
       JdbcType jdbcType = discriminator.jdbcType() == JdbcType.UNDEFINED ? null : discriminator.jdbcType();
-      Class<? extends TypeHandler<?>> typeHandler = discriminator.typeHandler() == UnknownTypeHandler.class ? null : discriminator.typeHandler();
+      @SuppressWarnings("unchecked")
+      Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>)
+              (discriminator.typeHandler() == UnknownTypeHandler.class ? null : discriminator.typeHandler());
       Case[] cases = discriminator.cases();
       Map<String, String> discriminatorMap = new HashMap<String, String>();
       for (Case c : cases) {
@@ -491,6 +493,9 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
       if (result.id()) {
         flags.add(ResultFlag.ID);
       }
+      @SuppressWarnings("unchecked")
+      Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>)
+              ((result.typeHandler() == UnknownTypeHandler.class) ? null : result.typeHandler());
       ResultMapping resultMapping = assistant.buildResultMapping(
           resultType,
           nullOrEmpty(result.property()),
@@ -501,7 +506,7 @@ private void applyResults(Result[] results, Class<?> resultType, List<ResultMapp
           null,
           null,
           null,
-          result.typeHandler() == UnknownTypeHandler.class ? null : result.typeHandler(),
+          typeHandler,
           flags,
           null,
           null,
@@ -545,6 +550,9 @@ private void applyConstructorArgs(Arg[] args, Class<?> resultType, List<ResultMa
       if (arg.id()) {
         flags.add(ResultFlag.ID);
       }
+      @SuppressWarnings("unchecked")
+      Class<? extends TypeHandler<?>> typeHandler = (Class<? extends TypeHandler<?>>)
+              (arg.typeHandler() == UnknownTypeHandler.class ? null : arg.typeHandler());
       ResultMapping resultMapping = assistant.buildResultMapping(
           resultType,
           null,
@@ -555,7 +563,7 @@ private void applyConstructorArgs(Arg[] args, Class<?> resultType, List<ResultMa
           nullOrEmpty(arg.resultMap()),
           null,
           null,
-          arg.typeHandler() == UnknownTypeHandler.class ? null : arg.typeHandler(),
+          typeHandler,
           flags,
           null,
           null,