Extract Method for Parsing Cache Value

Author: ZhangShenao

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

@@ -206,18 +206,8 @@ 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();
-        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);
-        }
+        Object value = parseCacheValue(parameterObject, boundSql, typeHandlerRegistry, propertyName, configuration);
         cacheKey.update(value);
       }
     }
@@ -228,6 +218,23 @@ 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;

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -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,18 +66,9 @@ 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();
-          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);
-          }
+          Object value =
+            BaseExecutor.parseCacheValue(parameterObject, boundSql, typeHandlerRegistry, propertyName, configuration);
           TypeHandler typeHandler = parameterMapping.getTypeHandler();
           JdbcType jdbcType = parameterMapping.getJdbcType();
           if (value == null && jdbcType == null) {

src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2019 the original author or authors.
+ *    Copyright 2009-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.