miemie 5 éve
szülő
commit
a961940770

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

@@ -31,7 +31,7 @@ import java.util.List;
 )
 public class MybatisPlusInterceptor implements Interceptor {
 
-    private final List<InnerInterceptor> interceptors = new ArrayList<>();
+    private List<InnerInterceptor> interceptors = new ArrayList<>();
 
     @Override
     public Object intercept(Invocation invocation) throws Throwable {
@@ -86,6 +86,10 @@ public class MybatisPlusInterceptor implements Interceptor {
     }
 
     public void addInnerInterceptor(InnerInterceptor innerInterceptor) {
-        interceptors.add(innerInterceptor);
+        this.interceptors.add(innerInterceptor);
+    }
+
+    public void setInnerInterceptors(List<InnerInterceptor> innerInterceptors) {
+        this.interceptors = innerInterceptors;
     }
 }

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

@@ -18,7 +18,6 @@ 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.inner.PaginationInnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -46,7 +45,7 @@ public class CacheConfig {
         configuration.setCacheEnabled(true);
         sqlSessionFactory.setConfiguration(configuration);
         MybatisPlusInterceptor pagination = new MybatisPlusInterceptor();
-        pagination.addInnerInterceptor(new PaginationInnerInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true)));
+        pagination.addInnerInterceptor(new PaginationInnerInterceptor());
 
         sqlSessionFactory.setPlugins(pagination);
         return sqlSessionFactory.getObject();

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

@@ -30,7 +30,6 @@ 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.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;
 import net.sf.jsqlparser.statement.delete.Delete;
@@ -78,7 +77,7 @@ public class MybatisPlusConfig {
         configuration.setDefaultEnumTypeHandler(EnumOrdinalTypeHandler.class);  //默认枚举处理
         sqlSessionFactory.setConfiguration(configuration);
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor().setCountSqlParser(new JsqlParserCountOptimize(true)));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor());
         SqlExplainInterceptor sqlExplainInterceptor = new SqlExplainInterceptor();
         List<ISqlParser> sqlParserList = new ArrayList<>();
         sqlParserList.add(new AbstractJsqlParser() {