优化解析核心方法名，新增 querywrapper lambda 转换参数测试

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtils.java

@@ -89,7 +89,7 @@ public class SqlUtils {
                 }
             }
         }
-        return COUNT_SQL_PARSER.optimizeSql(null, originalSql);
+        return COUNT_SQL_PARSER.parser(null, originalSql);
     }
 
     /**

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/AbstractSqlParserHandler.java

@@ -64,7 +64,7 @@ public abstract class AbstractSqlParserHandler {
                 int flag = 0;
                 String originalSql = (String) metaObject.getValue(PluginUtils.DELEGATE_BOUNDSQL_SQL);
                 for (ISqlParser sqlParser : this.sqlParserList) {
-                    SqlInfo sqlInfo = sqlParser.optimizeSql(metaObject, originalSql);
+                    SqlInfo sqlInfo = sqlParser.parser(metaObject, originalSql);
                     if (null != sqlInfo) {
                         originalSql = sqlInfo.getSql();
                         ++flag;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/optimize/JsqlParserCountOptimize.java

@@ -56,7 +56,7 @@ public class JsqlParserCountOptimize implements ISqlParser {
     private static final List<SelectItem> COUNT_SELECT_ITEM = countSelectItem();
 
     @Override
-    public SqlInfo optimizeSql(MetaObject metaObject, String sql) {
+    public SqlInfo parser(MetaObject metaObject, String sql) {
         if (logger.isDebugEnabled()) {
             logger.debug(" JsqlParserCountOptimize sql=" + sql);
         }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -8,11 +8,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Resource;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -39,7 +40,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 public class H2UserMapperTest extends BaseTest {
 
-    @Autowired
+    @Resource
     protected H2UserMapper userMapper;
 
     @BeforeClass
@@ -128,8 +129,10 @@ public class H2UserMapperTest extends BaseTest {
         Assert.assertTrue(null != userMapper.selectPage(new Page<>(1, 10),
             new QueryWrapper<H2User>().orderByAsc("name")));
 
-        // 查询结果集
-        List<Map<String, Object>> mapList = userMapper.selectMaps(new QueryWrapper<H2User>().lambda().eq(H2User::getName, NQQ));
+        // 查询结果集，测试 lambda 对象后 QueryWrapper 是否参数继续传递
+        QueryWrapper<H2User> qw = new QueryWrapper<>();
+        qw.lambda().eq(H2User::getName, NQQ);
+        List<Map<String, Object>> mapList = userMapper.selectMaps(qw);
         if (CollectionUtils.isNotEmpty(mapList)) {
             for (Map m : mapList) {
                 System.out.println(m);