Revert Modification

Author: ZhangShenao

src/main/java/org/apache/ibatis/executor/BaseExecutor.java

@@ -206,8 +206,18 @@ public CacheKey createCacheKey(MappedStatement ms, Object parameterObject, RowBo
     // mimic DefaultParameterHandler logic
     for (ParameterMapping parameterMapping : parameterMappings) {
       if (parameterMapping.getMode() != ParameterMode.OUT) {
+        Object value;
         String propertyName = parameterMapping.getProperty();
-        Object value = parseCacheValue(parameterObject, boundSql, typeHandlerRegistry, propertyName, configuration);
+        if (boundSql.hasAdditionalParameter(propertyName)) {
+          value = boundSql.getAdditionalParameter(propertyName);
+        } else if (parameterObject == null) {
+          value = null;
+        } else if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+          value = parameterObject;
+        } else {
+          MetaObject metaObject = configuration.newMetaObject(parameterObject);
+          value = metaObject.getValue(propertyName);
+        }
         cacheKey.update(value);
       }
     }
@@ -218,23 +228,6 @@ public CacheKey createCacheKey(MappedStatement ms, Object parameterObject, RowBo
     return cacheKey;
   }
 
-  public static Object parseCacheValue(Object parameterObject, BoundSql boundSql,
-    TypeHandlerRegistry typeHandlerRegistry,
-    String propertyName, Configuration configuration) {
-    Object value;
-    if (boundSql.hasAdditionalParameter(propertyName)) {
-      value = boundSql.getAdditionalParameter(propertyName);
-    } else if (parameterObject == null) {
-      value = null;
-    } else if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
-      value = parameterObject;
-    } else {
-      MetaObject metaObject = configuration.newMetaObject(parameterObject);
-      value = metaObject.getValue(propertyName);
-    }
-    return value;
-  }
-
   @Override
   public boolean isCached(MappedStatement ms, CacheKey key) {
     return localCache.getObject(key) != null;
@@ -279,10 +272,10 @@ public void clearLocalCache() {
   protected abstract List<BatchResult> doFlushStatements(boolean isRollback) throws SQLException;
 
   protected abstract <E> List<E> doQuery(MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql)
-      throws SQLException;
+    throws SQLException;
 
   protected abstract <E> Cursor<E> doQueryCursor(MappedStatement ms, Object parameter, RowBounds rowBounds, BoundSql boundSql)
-      throws SQLException;
+    throws SQLException;
 
   protected void closeStatement(Statement statement) {
     if (statement != null) {
@@ -366,11 +359,11 @@ private static class DeferredLoad {
 
     // issue #781
     public DeferredLoad(MetaObject resultObject,
-                        String property,
-                        CacheKey key,
-                        PerpetualCache localCache,
-                        Configuration configuration,
-                        Class<?> targetType) {
+      String property,
+      CacheKey key,
+      PerpetualCache localCache,
+      Configuration configuration,
+      Class<?> targetType) {
       this.resultObject = resultObject;
       this.property = property;
       this.key = key;
@@ -387,7 +380,7 @@ public boolean canLoad() {
     public void load() {
       @SuppressWarnings("unchecked")
       // we suppose we get back a List
-      List<Object> list = (List<Object>) localCache.getObject(key);
+        List<Object> list = (List<Object>) localCache.getObject(key);
       Object value = resultExtractor.extractObjectFromList(list, targetType);
       resultObject.setValue(property, value);
     }

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

@@ -19,13 +19,13 @@
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.ibatis.executor.BaseExecutor;
 import org.apache.ibatis.executor.ErrorContext;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.ParameterMode;
+import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeException;
@@ -66,9 +66,18 @@ public void setParameters(PreparedStatement ps) {
       for (int i = 0; i < parameterMappings.size(); i++) {
         ParameterMapping parameterMapping = parameterMappings.get(i);
         if (parameterMapping.getMode() != ParameterMode.OUT) {
+          Object value;
           String propertyName = parameterMapping.getProperty();
-          Object value =
-            BaseExecutor.parseCacheValue(parameterObject, boundSql, typeHandlerRegistry, propertyName, configuration);
+          if (boundSql.hasAdditionalParameter(propertyName)) { // issue #448 ask first for additional params
+            value = boundSql.getAdditionalParameter(propertyName);
+          } else if (parameterObject == null) {
+            value = null;
+          } else if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+            value = parameterObject;
+          } else {
+            MetaObject metaObject = configuration.newMetaObject(parameterObject);
+            value = metaObject.getValue(propertyName);
+          }
           TypeHandler typeHandler = parameterMapping.getTypeHandler();
           JdbcType jdbcType = parameterMapping.getJdbcType();
           if (value == null && jdbcType == null) {