to qiuqiu

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/MybatisPlusInterceptor.java

@@ -1,6 +1,6 @@
 package com.baomidou.mybatisplus.extension.plugins;
 
-import com.baomidou.mybatisplus.extension.plugins.chain.QiuQiu;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
@@ -31,7 +31,7 @@ import java.util.List;
 )
 public class MybatisPlusInterceptor implements Interceptor {
 
-    private final List<QiuQiu> qiuQius = new ArrayList<>();
+    private final List<InnerInterceptor> interceptors = new ArrayList<>();
 
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
@@ -52,7 +52,7 @@ public class MybatisPlusInterceptor implements Interceptor {
                     // 几乎不可能走进这里面,除非使用Executor的代理对象调用query[args[6]]
                     boundSql = (BoundSql) args[5];
                 }
-                for (QiuQiu query : qiuQius) {
+                for (InnerInterceptor query : interceptors) {
                     if (!query.willDoQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql)) {
                         return Collections.emptyList();
                     }
@@ -61,7 +61,7 @@ public class MybatisPlusInterceptor implements Interceptor {
                 CacheKey cacheKey = executor.createCacheKey(ms, parameter, rowBounds, boundSql);
                 return executor.query(ms, parameter, rowBounds, resultHandler, cacheKey, boundSql);
             } else if (isUpdate) {
-                for (QiuQiu query : qiuQius) {
+                for (InnerInterceptor query : interceptors) {
                     query.update(executor, ms, parameter);
                 }
             }
@@ -70,8 +70,8 @@ public class MybatisPlusInterceptor implements Interceptor {
             final StatementHandler sh = (StatementHandler) target;
             Connection connections = (Connection) args[0];
             Integer transactionTimeout = (Integer) args[1];
-            for (QiuQiu qiuQiu : qiuQius) {
-                qiuQiu.prepare(sh, connections, transactionTimeout);
+            for (InnerInterceptor innerInterceptor : interceptors) {
+                innerInterceptor.prepare(sh, connections, transactionTimeout);
             }
         }
         return invocation.proceed();
@@ -85,7 +85,7 @@ public class MybatisPlusInterceptor implements Interceptor {
         return target;
     }
 
-    public void addQiuQiu(QiuQiu qiuQiu) {
-        qiuQius.add(qiuQiu);
+    public void addInnerInterceptor(InnerInterceptor innerInterceptor) {
+        interceptors.add(innerInterceptor);
     }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/BlockAttackQiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
@@ -16,7 +16,7 @@ import java.sql.Connection;
  * @author miemie
  * @since 2020-06-22
  */
-public class BlockAttackQiuQiu extends JsqlParserSupport implements QiuQiu {
+public class BlockAttackInnerInterceptor extends JsqlParserSupport implements InnerInterceptor {
 
     @Override
     public void prepare(StatementHandler sh, Connection connection, Integer transactionTimeout) {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/IllegalSQLQiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
@@ -38,7 +38,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author miemie
  * @since 2020-06-22
  */
-public class IllegalSQLQiuQiu extends JsqlParserSupport implements QiuQiu {
+public class IllegalSQLInnerInterceptor extends JsqlParserSupport implements InnerInterceptor {
 
     /**
      * 缓存验证结果，提高性能

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/QiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/InnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.executor.statement.StatementHandler;
@@ -15,7 +15,7 @@ import java.sql.SQLException;
  * @since 2020-06-16
  */
 @SuppressWarnings({"rawtypes"})
-public interface QiuQiu {
+public interface InnerInterceptor {
 
     /**
      * @param executor      Executor(可能是代理对象)

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/OptimisticLockerQiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/OptimisticLockerInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -24,7 +24,7 @@ import java.util.Map;
  * @since 2020-06-21
  */
 @SuppressWarnings({"unchecked"})
-public class OptimisticLockerQiuQiu implements QiuQiu {
+public class OptimisticLockerInnerInterceptor implements InnerInterceptor {
 
     private static final String PARAM_UPDATE_METHOD_NAME = "update";
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/PageQiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 @Data
 @Accessors(chain = true)
 @SuppressWarnings({"rawtypes"})
-public class PageQiuQiu implements QiuQiu {
+public class PaginationInnerInterceptor implements InnerInterceptor {
 
     protected static final Map<String, MappedStatement> countMsCache = new ConcurrentHashMap<>();
     protected final Log logger = LogFactory.getLog(this.getClass());

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/chain/TenantQiuQiu.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantInnerInterceptor.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.chain;
+package com.baomidou.mybatisplus.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
@@ -42,7 +42,7 @@ import java.util.List;
 @Accessors(chain = true)
 @RequiredArgsConstructor
 @SuppressWarnings({"rawtypes"})
-public class TenantQiuQiu extends JsqlParserSupport implements QiuQiu {
+public class TenantInnerInterceptor extends JsqlParserSupport implements InnerInterceptor {
 
     private final TenantHandler tenantHandler;
 

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

@@ -17,7 +17,7 @@ package com.baomidou.mybatisplus.test.h2.cache;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.chain.PageQiuQiu;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.ExecutorType;
@@ -46,7 +46,7 @@ public class CacheConfig {
         configuration.setCacheEnabled(true);
         sqlSessionFactory.setConfiguration(configuration);
         MybatisPlusInterceptor pagination = new MybatisPlusInterceptor();
-        pagination.addQiuQiu(new PageQiuQiu().setCountSqlParser(new JsqlParserCountOptimize(true)));
+        pagination.addInnerInterceptor(new PaginationInnerInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true)));
 
         sqlSessionFactory.setPlugins(pagination);
         return sqlSessionFactory.getObject();

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

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.extension.injector.methods.LogicDeleteByIdWithFi
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.SqlExplainInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.chain.PageQiuQiu;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.baomidou.mybatisplus.test.h2.H2MetaObjectHandler;
@@ -78,7 +78,7 @@ public class MybatisPlusConfig {
         configuration.setDefaultEnumTypeHandler(EnumOrdinalTypeHandler.class);  //默认枚举处理
         sqlSessionFactory.setConfiguration(configuration);
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addQiuQiu(new PageQiuQiu().setCountSqlParser(new JsqlParserCountOptimize(true)));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true)));
         SqlExplainInterceptor sqlExplainInterceptor = new SqlExplainInterceptor();
         List<ISqlParser> sqlParserList = new ArrayList<>();
         sqlParserList.add(new AbstractJsqlParser() {