Fix MetaObject not using real target

zhangrongfan · zhangrongfan · commit f99ff13fe416 · 2018-12-24T10:53:00.000+08:00
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/core/preprocessor/ParameterNormalizationPreprocessor.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/core/preprocessor/ParameterNormalizationPreprocessor.java
@@ -2,6 +2,7 @@
 
 import cn.mybatisboost.core.SqlProvider;
 import cn.mybatisboost.util.MapperUtils;
+import cn.mybatisboost.util.MyBatisUtils;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.reflection.MetaObject;
@@ -43,7 +44,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
                     Map<String, Object> parameterMap = new HashMap<>();
                     parameterMap.put("arg0", parameterObject);
                     parameterMap.put("param1", parameterObject);
-                    metaObject.setValue("delegate.parameterHandler.parameterObject", parameterMap);
+                    MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                            .setValue("delegate.parameterObject", parameterMap);
                     metaObject.setValue("delegate.boundSql.parameterObject", parameterMap);
                 }
             }
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/lang/provider/InsertEnhancement.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/lang/provider/InsertEnhancement.java
@@ -58,7 +58,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
                 metaObject.setValue("delegate.boundSql.parameterMappings",
                         MyBatisUtils.getListParameterMappings(configuration, propertiesAndColumns.first(), entities.size()));
                 metaObject.setValue("delegate.boundSql.parameterObject", parameterObject);
-                metaObject.setValue("delegate.parameterHandler.parameterObject", parameterObject);
+                MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                        .setValue("delegate.parameterObject", parameterObject);
             }
         }
     }
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/limiter/provider/MySQL.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/limiter/provider/MySQL.java
@@ -1,6 +1,7 @@
 package cn.mybatisboost.limiter.provider;
 
 import cn.mybatisboost.core.SqlProvider;
+import cn.mybatisboost.util.MyBatisUtils;
 import cn.mybatisboost.util.SqlUtils;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -16,7 +17,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
         metaObject.setValue("delegate.boundSql.sql",
                 SqlUtils.appendLimit(boundSql.getSql(), (RowBounds) metaObject.getValue("delegate.rowBounds")));
         metaObject.setValue("delegate.rowBounds", RowBounds.DEFAULT);
-        metaObject.setValue("delegate.resultSetHandler.rowBounds", RowBounds.DEFAULT);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.resultSetHandler"))
+                .setValue("delegate.rowBounds", RowBounds.DEFAULT);
     }
 
     @Override
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/limiter/provider/PostgreSQL.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/limiter/provider/PostgreSQL.java
@@ -1,6 +1,7 @@
 package cn.mybatisboost.limiter.provider;
 
 import cn.mybatisboost.core.SqlProvider;
+import cn.mybatisboost.util.MyBatisUtils;
 import cn.mybatisboost.util.SqlUtils;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -16,7 +17,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
         metaObject.setValue("delegate.boundSql.sql",
                 SqlUtils.appendLimitOffset(boundSql.getSql(), (RowBounds) metaObject.getValue("delegate.rowBounds")));
         metaObject.setValue("delegate.rowBounds", RowBounds.DEFAULT);
-        metaObject.setValue("delegate.resultSetHandler.rowBounds", RowBounds.DEFAULT);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.resultSetHandler"))
+                .setValue("delegate.rowBounds", RowBounds.DEFAULT);
     }
 
     @Override
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Delete.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Delete.java
@@ -47,7 +47,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
         List<ParameterMapping> parameterMappings = MyBatisUtils.getParameterMappings
                 ((org.apache.ibatis.session.Configuration)
                         metaObject.getValue("delegate.configuration"), properties);
-        metaObject.setValue("delegate.parameterHandler.parameterObject", entity);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                .setValue("delegate.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);
         metaObject.setValue("delegate.boundSql.sql", sqlBuilder.toString());
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Insert.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Insert.java
@@ -95,7 +95,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
                         metaObject.getValue("delegate.configuration"), properties);
             }
         }
-        metaObject.setValue("delegate.parameterHandler.parameterObject", entity);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                .setValue("delegate.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);
         metaObject.setValue("delegate.boundSql.sql", sqlBuilder.toString());
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/SelectByIds.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/SelectByIds.java
@@ -5,6 +5,7 @@
 import cn.mybatisboost.core.SqlProvider;
 import cn.mybatisboost.util.EntityUtils;
 import cn.mybatisboost.util.MapperUtils;
+import cn.mybatisboost.util.MyBatisUtils;
 import cn.mybatisboost.util.SqlUtils;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -57,7 +58,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
             } else {
                 parameterMap = Collections.emptyMap();
             }
-            metaObject.setValue("delegate.parameterHandler.parameterObject", parameterMap);
+            MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                    .setValue("delegate.parameterObject", parameterMap);
             metaObject.setValue("delegate.boundSql.parameterObject", parameterMap);
         }
         metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/SelectOrCount.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/SelectOrCount.java
@@ -52,7 +52,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
         List<ParameterMapping> parameterMappings = MyBatisUtils.getParameterMappings
                 ((org.apache.ibatis.session.Configuration)
                         metaObject.getValue("delegate.configuration"), properties);
-        metaObject.setValue("delegate.parameterHandler.parameterObject", entity);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                .setValue("delegate.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);
         metaObject.setValue("delegate.boundSql.sql", sqlBuilder.toString());
diff --git a/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Update.java b/mybatis-boost-core/src/main/java/cn/mybatisboost/mapper/provider/Update.java
@@ -60,7 +60,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen
         List<ParameterMapping> parameterMappings = MyBatisUtils.getParameterMappings
                 ((org.apache.ibatis.session.Configuration)
                         metaObject.getValue("delegate.configuration"), properties);
-        metaObject.setValue("delegate.parameterHandler.parameterObject", entity);
+        MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))
+                .setValue("delegate.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterObject", entity);
         metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);
         metaObject.setValue("delegate.boundSql.sql", sqlBuilder.toString());

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen`
`58`	`58`	`metaObject.setValue("delegate.boundSql.parameterMappings",`
`59`	`59`	`MyBatisUtils.getListParameterMappings(configuration, propertiesAndColumns.first(), entities.size()));`
`60`	`60`	`metaObject.setValue("delegate.boundSql.parameterObject", parameterObject);`
`61`		`- metaObject.setValue("delegate.parameterHandler.parameterObject", parameterObject);`
	`61`	`+ MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))`
	`62`	`+ .setValue("delegate.parameterObject", parameterObject);`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@ public void replace(Connection connection, MetaObject metaObject, MappedStatemen`
`95`	`95`	`metaObject.getValue("delegate.configuration"), properties);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`- metaObject.setValue("delegate.parameterHandler.parameterObject", entity);`
	`98`	`+ MyBatisUtils.getRealMetaObject(metaObject.getValue("delegate.parameterHandler"))`
	`99`	`+ .setValue("delegate.parameterObject", entity);`
`99`	`100`	`metaObject.setValue("delegate.boundSql.parameterObject", entity);`
`100`	`101`	`metaObject.setValue("delegate.boundSql.parameterMappings", parameterMappings);`
`101`	`102`	`metaObject.setValue("delegate.boundSql.sql", sqlBuilder.toString());`