Drop declaringClass arg for now

Author: harawata

src/main/java/org/apache/ibatis/builder/BaseBuilder.java

@@ -112,7 +112,7 @@ protected TypeHandler<?> resolveTypeHandler(Class<?> javaType, String typeHandle
 
   @Deprecated
   protected TypeHandler<?> resolveTypeHandler(Class<?> javaType, Class<? extends TypeHandler<?>> typeHandlerType) {
-    return resolveTypeHandler(null, javaType, null, typeHandlerType);
+    return resolveTypeHandler(javaType, null, typeHandlerType);
   }
 
   protected TypeHandler<?> resolveTypeHandler(Class<?> parameterType, Type propertyType, JdbcType jdbcType,
@@ -123,15 +123,15 @@ protected TypeHandler<?> resolveTypeHandler(Class<?> parameterType, Type propert
       throw new BuilderException("Type " + typeHandlerType.getName()
           + " is not a valid TypeHandler because it does not implement TypeHandler interface");
     }
-    return resolveTypeHandler(parameterType, propertyType, jdbcType, typeHandlerType);
+    return resolveTypeHandler(propertyType, jdbcType, typeHandlerType);
   }
 
-  protected TypeHandler<?> resolveTypeHandler(Class<?> parameterType, Type propertyType, JdbcType jdbcType,
+  protected TypeHandler<?> resolveTypeHandler(Type javaType, JdbcType jdbcType,
       Class<? extends TypeHandler<?>> typeHandlerType) {
     if (typeHandlerType == null && jdbcType == null) {
       return null;
     }
-    return configuration.getTypeHandlerRegistry().resolve(parameterType, propertyType, jdbcType, typeHandlerType);
+    return configuration.getTypeHandlerRegistry().getTypeHandler(javaType, jdbcType, typeHandlerType);
   }
 
   protected <T> Class<? extends T> resolveAlias(String alias) {

src/main/java/org/apache/ibatis/builder/MapperBuilderAssistant.java

@@ -149,7 +149,7 @@ public ParameterMapping buildParameterMapping(Class<?> parameterType, String pro
 
     // Class parameterType = parameterMapBuilder.type();
     Class<?> javaTypeClass = resolveParameterJavaType(parameterType, property, javaType, jdbcType);
-    TypeHandler<?> typeHandlerInstance = resolveTypeHandler(parameterType, javaTypeClass, jdbcType, typeHandler);
+    TypeHandler<?> typeHandlerInstance = resolveTypeHandler(javaTypeClass, jdbcType, typeHandler);
 
     return new ParameterMapping.Builder(configuration, property, javaTypeClass).jdbcType(jdbcType)
         .resultMapId(resultMap).mode(parameterMode).numericScale(numericScale).typeHandler(typeHandlerInstance).build();
@@ -342,7 +342,7 @@ public ResultMapping buildResultMapping(Class<?> resultType, String property, St
       Class<? extends TypeHandler<?>> typeHandler, List<ResultFlag> flags, String resultSet, String foreignColumn,
       boolean lazy) {
     Entry<Type, Class<?>> setterType = resolveSetterType(resultType, property, javaType);
-    TypeHandler<?> typeHandlerInstance = resolveTypeHandler(resultType, setterType.getKey(), jdbcType, typeHandler);
+    TypeHandler<?> typeHandlerInstance = resolveTypeHandler(setterType.getKey(), jdbcType, typeHandler);
     List<ResultMapping> composites;
     if ((nestedSelect == null || nestedSelect.isEmpty()) && (foreignColumn == null || foreignColumn.isEmpty())) {
       composites = Collections.emptyList();

src/main/java/org/apache/ibatis/builder/ParameterMappingTokenHandler.java

@@ -144,7 +144,7 @@ private Class<?> figureOutJavaType(Map<String, String> propertiesMap, String pro
     if (metaParameters.hasGetter(propertyTokenizer.getName())) { // issue #448 get type from additional params
       return metaParameters.getGetterType(property);
     }
-    typeHandler = resolveTypeHandler(parameterType, null, jdbcType, (Class<? extends TypeHandler<?>>) null);
+    typeHandler = resolveTypeHandler(parameterType, jdbcType, (Class<? extends TypeHandler<?>>) null);
     if (typeHandler != null) {
       return parameterType;
     }

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

@@ -168,7 +168,7 @@ public void handleOutputParameters(CallableStatement cs) throws SQLException {
               javaType = metaParam.getGenericSetterType(property).getKey();
             }
             JdbcType jdbcType = parameterMapping.getJdbcType();
-            typeHandler = typeHandlerRegistry.resolve(parameterObject.getClass(), javaType, jdbcType, null);
+            typeHandler = typeHandlerRegistry.getTypeHandler(javaType, jdbcType, null);
             if (typeHandler == null) {
               typeHandler = typeHandlerRegistry.getTypeHandler(jdbcType);
               if (typeHandler == null) {

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

@@ -102,7 +102,7 @@ public TypeHandler<?> getTypeHandler(Type propertyType, String columnName) {
       }
 
       JdbcType jdbcType = jdbcTypes.get(index);
-      TypeHandler<?> handler = typeHandlerRegistry.resolve(null, k, jdbcType, null);
+      TypeHandler<?> handler = typeHandlerRegistry.getTypeHandler(k, jdbcType, null);
       if (handler != null) {
         return handler;
       }
@@ -113,7 +113,7 @@ public TypeHandler<?> getTypeHandler(Type propertyType, String columnName) {
         return null;
       }
 
-      handler = typeHandlerRegistry.resolve(null, javaType, jdbcType, null);
+      handler = typeHandlerRegistry.getTypeHandler(javaType, jdbcType, null);
       if (handler == null) {
         handler = typeHandlerRegistry.getTypeHandler(jdbcType);
       }

src/main/java/org/apache/ibatis/scripting/defaults/DefaultParameterHandler.java

@@ -106,9 +106,6 @@ public void setParameters(PreparedStatement ps) {
             value = parameterMapping.getValue();
           } else if (boundSql.hasAdditionalParameter(propertyName)) { // issue #448 ask first for additional params
             value = boundSql.getAdditionalParameter(propertyName);
-            if (typeHandler == null) {
-              typeHandler = typeHandlerRegistry.resolve(value.getClass(), null, actualJdbcType, null);
-            }
           } else if (parameterObject == null) {
             value = null;
           } else {
@@ -144,7 +141,7 @@ public void setParameters(PreparedStatement ps) {
                 } else {
                   try {
                     propertyGenericType = paramMetaObject.getGenericGetterType(propertyName).getKey();
-                    typeHandler = configuration.getTypeHandlerRegistry().resolve(parameterClass, propertyGenericType,
+                    typeHandler = configuration.getTypeHandlerRegistry().getTypeHandler(propertyGenericType,
                         actualJdbcType, null);
                   } catch (Exception e) {
                     // Not always resolvable
@@ -164,8 +161,7 @@ public void setParameters(PreparedStatement ps) {
             if (propertyGenericType == null) {
               propertyGenericType = value.getClass();
             }
-            typeHandler = typeHandlerRegistry.resolve(parameterObject.getClass(), propertyGenericType, actualJdbcType,
-                null);
+            typeHandler = typeHandlerRegistry.getTypeHandler(propertyGenericType, actualJdbcType, null);
           }
           if (typeHandler == null) {
             typeHandler = typeHandlerRegistry.getTypeHandler(actualJdbcType);

src/main/java/org/apache/ibatis/type/TypeHandlerRegistry.java

@@ -566,10 +566,4 @@ public Collection<TypeHandler<?>> getTypeHandlers() {
     return Collections.unmodifiableCollection(allTypeHandlersMap.values());
   }
 
-  public TypeHandler<?> resolve(Class<?> declaringClass, Type propertyType, JdbcType jdbcType,
-      Class<? extends TypeHandler<?>> typeHandlerClass) {
-    Type javaType = propertyType == null ? declaringClass : propertyType;
-    return getTypeHandler(javaType, jdbcType, typeHandlerClass);
-  }
-
 }