调整目录

src/main/java/com/baomidou/mybatisplus/plugins/parser/AbstractSqlParser.java → src/main/java/com/baomidou/mybatisplus/parser/AbstractSqlParser.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.plugins.parser;
+package com.baomidou.mybatisplus.parser;
 
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;

src/main/java/com/baomidou/mybatisplus/plugins/parser/SqlInfo.java → src/main/java/com/baomidou/mybatisplus/parser/SqlInfo.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.plugins.parser;
+package com.baomidou.mybatisplus.parser;
 
 /**
  * <p>

src/main/java/com/baomidou/mybatisplus/parser/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * SQL 解析相关类
+ */
+package com.baomidou.mybatisplus.parser;

src/main/java/com/baomidou/mybatisplus/plugins/CachePaginationInterceptor.java

@@ -34,8 +34,8 @@ import org.apache.ibatis.session.RowBounds;
 
 import com.baomidou.mybatisplus.plugins.pagination.DialectFactory;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 import com.baomidou.mybatisplus.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.toolkit.SqlUtils;
 import com.baomidou.mybatisplus.toolkit.StringUtils;

src/main/java/com/baomidou/mybatisplus/plugins/PaginationInterceptor.java

@@ -39,8 +39,8 @@ import org.apache.ibatis.session.RowBounds;
 import com.baomidou.mybatisplus.MybatisDefaultParameterHandler;
 import com.baomidou.mybatisplus.plugins.pagination.DialectFactory;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 import com.baomidou.mybatisplus.toolkit.JdbcUtils;
 import com.baomidou.mybatisplus.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.toolkit.SqlUtils;
@@ -90,7 +90,7 @@ public class PaginationInterceptor implements Interceptor {
         BoundSql boundSql = (BoundSql) metaStatementHandler.getValue("delegate.boundSql");
         String originalSql = boundSql.getSql();
         Connection connection = (Connection) invocation.getArgs()[0];
-        if (isDynamicDataSource()) {
+        if (this.dynamicDataSource) {
             dialectType = JdbcUtils.getDbType(connection.getMetaData().getURL()).getDb();
         }
         if (rowBounds instanceof Pagination) {
@@ -188,10 +188,6 @@ public class PaginationInterceptor implements Interceptor {
         this.optimizeType = optimizeType;
     }
 
-    public boolean isDynamicDataSource() {
-        return dynamicDataSource;
-    }
-
     public void setDynamicDataSource(boolean dynamicDataSource) {
         this.dynamicDataSource = dynamicDataSource;
     }

src/main/java/com/baomidou/mybatisplus/plugins/pagination/optimize/AliDruidCountOptimize.java

@@ -16,8 +16,8 @@
 package com.baomidou.mybatisplus.plugins.pagination.optimize;
 
 import com.alibaba.druid.sql.PagerUtils;
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 
 /**
  * <p>

src/main/java/com/baomidou/mybatisplus/plugins/pagination/optimize/DefaultCountOptimize.java

@@ -15,8 +15,8 @@
  */
 package com.baomidou.mybatisplus.plugins.pagination.optimize;
 
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 
 /**
  * <p>

src/main/java/com/baomidou/mybatisplus/plugins/pagination/optimize/JsqlParserCountOptimize.java

@@ -18,8 +18,8 @@ package com.baomidou.mybatisplus.plugins.pagination.optimize;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.toolkit.SqlUtils;
 

src/main/java/com/baomidou/mybatisplus/plugins/parser/package-info.java

@@ -1,4 +0,0 @@
-/**
- * SQL 解析相关类
- */
-package com.baomidou.mybatisplus.plugins.parser;

src/main/java/com/baomidou/mybatisplus/plugins/tenancy/TenancySqlParser.java

@@ -1,7 +1,7 @@
 package com.baomidou.mybatisplus.plugins.tenancy;
 
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 
 import net.sf.jsqlparser.statement.insert.Insert;
 import net.sf.jsqlparser.statement.select.SelectBody;

src/main/java/com/baomidou/mybatisplus/toolkit/SqlUtils.java

@@ -21,8 +21,8 @@ import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.AliDruidCountOptimize;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.DefaultCountOptimize;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.JsqlParserCountOptimize;
-import com.baomidou.mybatisplus.plugins.parser.AbstractSqlParser;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.AbstractSqlParser;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 
 /**
  * <p>

src/test/java/com/baomidou/mybatisplus/test/SqlUtilsTest.java

@@ -6,7 +6,7 @@ import org.junit.Test;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.AliDruidCountOptimize;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.DefaultCountOptimize;
 import com.baomidou.mybatisplus.plugins.pagination.optimize.JsqlParserCountOptimize;
-import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
+import com.baomidou.mybatisplus.parser.SqlInfo;
 
 /**
  * <p>