错误依赖调整

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/SqlReservedWordsHandler.java

@@ -1,5 +1,6 @@
 package com.baomidou.mybatisplus.core.handlers;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -134,6 +135,10 @@ public abstract class SqlReservedWordsHandler {
 
     public abstract String convertQuote(GlobalConfiguration globalConfig, String column);
 
+    public boolean addAll(Collection<String> reservedWords) {
+        return RESERVED_WORDS.addAll(reservedWords);
+    }
+
     /**
      * 判断关键字中是否包含该字段
      *
@@ -146,7 +151,7 @@ public abstract class SqlReservedWordsHandler {
 
     //TODO: 3.0
     //可以考虑一个内部类是实现默认的convert， 通过getInstance()方法创建内部实现
-    public static SqlReservedWordsHandler getInstance(){
+    public static SqlReservedWordsHandler getInstance() {
         return new SqlReservedWordsHandler() {
             @Override
             public String convert(GlobalConfiguration globalConfig, String column) {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/ISqlInjector.java

@@ -18,6 +18,8 @@ package com.baomidou.mybatisplus.core.injector;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.session.Configuration;
 
+import com.baomidou.mybatisplus.core.assist.ISqlRunner;
+
 /**
  * <p>
  * SQL 自动注入器接口
@@ -48,7 +50,7 @@ public interface ISqlInjector {
      * 注入SqlRunner相关
      *
      * @param configuration
-     * @see com.baomidou.mybatisplus.core.assist.ISqlRunner
+     * @see ISqlRunner
      */
     void injectSqlRunner(Configuration configuration);
 

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/Columns.java

@@ -32,8 +32,15 @@ public class Columns implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Columns() {
+        // to do nothing
     }
 
+
+    /**
+     * 字段
+     */
+    private List<Column> columns = new ArrayList<>();
+
     /**
      * 获取实例
      */
@@ -60,11 +67,9 @@ public class Columns implements Serializable {
         return this;
     }
 
-    //字段
-    private List<Column> columns = new ArrayList<>();
 
     public Column[] getColumns() {
-        Column[] columnArray = new Column[columns.size()];
-        return columns.toArray(columnArray);
+        Column[] columnArray = new Column[this.columns.size()];
+        return this.columns.toArray(columnArray);
     }
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/GlobalConfiguration.java

@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 
-import com.baomidou.mybatisplus.MybatisSqlSessionTemplate;
 import com.baomidou.mybatisplus.annotations.FieldStrategy;
 import com.baomidou.mybatisplus.annotations.IdType;
 import com.baomidou.mybatisplus.core.enums.IDBType;
@@ -98,7 +97,7 @@ public class GlobalConfiguration implements Serializable {
     /**
      * 缓存当前Configuration的SqlSessionFactory
      */
-    private SqlSessionFactory sqlSessionFactory;
+//    private SqlSessionFactory sqlSessionFactory;
     /**
      * 缓存已注入CRUD的Mapper信息
      */
@@ -232,15 +231,15 @@ public class GlobalConfiguration implements Serializable {
         this.mapperRegistryCache = mapperRegistryCache;
     }
 
-    public SqlSessionFactory getSqlSessionFactory() {
-        return sqlSessionFactory;
-    }
+//    public SqlSessionFactory getSqlSessionFactory() {
+//        return sqlSessionFactory;
+//    }
 
-    public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
-        this.sqlSessionFactory = sqlSessionFactory;
-        //TODO: 3.0 在extension中初始化这个对象
-        this.sqlSession = new MybatisSqlSessionTemplate(sqlSessionFactory);
-    }
+//    public void setSqlSessionFactory(SqlSessionFactory sqlSessionFactory) {
+//        this.sqlSessionFactory = sqlSessionFactory;
+//        //TODO: 3.0 在extension中初始化这个对象
+//        this.sqlSession = new MybatisSqlSessionTemplate(sqlSessionFactory);
+//    }
 
     public boolean isCapitalMode() {
         return isCapitalMode;
@@ -266,7 +265,7 @@ public class GlobalConfiguration implements Serializable {
             if (reservedWordsHandler == null) {
                 reservedWordsHandler = SqlReservedWordsHandler.getInstance();
             }
-            reservedWordsHandler.RESERVED_WORDS.addAll(StringUtils.splitWorker(sqlKeywords.toUpperCase(), ",", -1, false));
+            reservedWordsHandler.addAll(StringUtils.splitWorker(sqlKeywords.toUpperCase(), ",", -1, false));
         }
     }
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/AbstractJsqlParser.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/AbstractJsqlParser.java

@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.parser;
+package com.baomidou.mybatisplus.core.parser;
 
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.reflection.MetaObject;
 
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+
+import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/ISqlParser.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2011-2020, hubin (jobob@qq.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.baomidou.mybatisplus.core.parser;
+
+import org.apache.ibatis.reflection.MetaObject;
+
+/**
+ * <p>
+ * SQL 解析接口
+ * </p>
+ *
+ * @author hubin
+ * @Date 2017-09-01
+ */
+public interface ISqlParser {
+
+    /**
+     * <p>
+     * 获取优化 SQL 方法
+     * </p>
+     *
+     * @param metaObject 元对象
+     * @param sql        SQL 语句
+     * @return SQL 信息
+     */
+    //TODO 3.0 change name
+    SqlInfo optimizeSql(MetaObject metaObject, String sql);
+
+}

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/ISqlParserFilter.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/ISqlParserFilter.java

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

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlInfo.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2011-2020, hubin (jobob@qq.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.baomidou.mybatisplus.core.parser;
+
+/**
+ * <p>
+ * Sql Info
+ * </p>
+ *
+ * @author hubin
+ * @Date 2017-06-20
+ */
+public class SqlInfo {
+
+    /**
+     * SQL 内容
+     */
+    private String sql;
+    /**
+     * 是否排序
+     */
+    private boolean orderBy = true;
+
+    public static SqlInfo newInstance() {
+        return new SqlInfo();
+    }
+
+    public String getSql() {
+        return sql;
+    }
+
+    public SqlInfo setSql(String sql) {
+        this.sql = sql;
+        return this;
+    }
+
+    public boolean isOrderBy() {
+        return orderBy;
+    }
+
+    public SqlInfo setOrderBy(boolean orderBy) {
+        this.orderBy = orderBy;
+        return this;
+    }
+}

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlParserHelper.java

@@ -0,0 +1,65 @@
+package com.baomidou.mybatisplus.core.parser;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.reflection.MetaObject;
+
+import com.baomidou.mybatisplus.annotations.SqlParser;
+
+public class SqlParserHelper {
+
+    public static final String DELEGATE_MAPPED_STATEMENT = "delegate.mappedStatement";
+    /**
+     * SQL 解析缓存
+     */
+    private static final Map<String, SqlParserInfo> sqlParserInfoCache = new ConcurrentHashMap<>();
+
+
+    /**
+     * <p>
+     * 初始化缓存 SqlParser 注解信息
+     * </p>
+     *
+     * @param mapperClass Mapper Class
+     */
+    public synchronized static void initSqlParserInfoCache(Class<?> mapperClass) {
+        Method[] methods = mapperClass.getDeclaredMethods();
+        for (Method method : methods) {
+            SqlParser sqlParser = method.getAnnotation(SqlParser.class);
+            if (null != sqlParser) {
+                StringBuilder sid = new StringBuilder();
+                sid.append(mapperClass.getName()).append(".").append(method.getName());
+                sqlParserInfoCache.put(sid.toString(), new SqlParserInfo(sqlParser));
+            }
+        }
+    }
+
+
+    /**
+     * <p>
+     * 获取 SqlParser 注解信息
+     * </p>
+     *
+     * @param metaObject 元数据对象
+     * @return
+     */
+    public static SqlParserInfo getSqlParserInfo(MetaObject metaObject) {
+        return sqlParserInfoCache.get(getMappedStatement(metaObject).getId());
+    }
+
+
+    /**
+     * <p>
+     * 获取当前执行 MappedStatement
+     * </p>
+     *
+     * @param metaObject 元对象
+     * @return
+     */
+    public static MappedStatement getMappedStatement(MetaObject metaObject) {
+        return (MappedStatement) metaObject.getValue(DELEGATE_MAPPED_STATEMENT);
+    }
+}

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/SqlParserInfo.java → mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlParserInfo.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.parser;
+package com.baomidou.mybatisplus.core.parser;
 
 
 import com.baomidou.mybatisplus.annotations.SqlParser;

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

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

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

@@ -18,7 +18,6 @@ package com.baomidou.mybatisplus.core.toolkit;
 import java.lang.reflect.Proxy;
 import java.util.Properties;
 
-import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 
@@ -33,63 +32,12 @@ import org.apache.ibatis.reflection.SystemMetaObject;
 public abstract class PluginUtils {
 
     public static final String DELEGATE_BOUNDSQL_SQL = "delegate.boundSql.sql";
-    public static final String DELEGATE_MAPPEDSTATEMENT = "delegate.mappedStatement";
-
-//    /**
-//     * SQL 解析缓存
-//     */
-    //TODO: 3.0 建议专门建一个Util
-//    private static final Map<String, SqlParserInfo> sqlParserInfoCache = new ConcurrentHashMap<>();
 
 
     private PluginUtils() {
         // to do nothing
     }
 
-    /**
-     * <p>
-     * 初始化缓存 SqlParser 注解信息
-     * </p>
-     *
-     * @param mapperClass Mapper Class
-     */
-    //TODO: 3.0
-    /*public synchronized static void initSqlParserInfoCache(Class<?> mapperClass) {
-        Method[] methods = mapperClass.getDeclaredMethods();
-        for (Method method : methods) {
-            SqlParser sqlParser = method.getAnnotation(SqlParser.class);
-            if (null != sqlParser) {
-                StringBuilder sid = new StringBuilder();
-                sid.append(mapperClass.getName()).append(".").append(method.getName());
-                sqlParserInfoCache.put(sid.toString(), new SqlParserInfo(sqlParser));
-            }
-        }
-    }*/
-
-    /**
-     * <p>
-     * 获取 SqlParser 注解信息
-     * </p>
-     *
-     * @param metaObject 元数据对象
-     * @return
-     */
-    //TODO: 3.0
-//    public static SqlParserInfo getSqlParserInfo(MetaObject metaObject) {
-//        return sqlParserInfoCache.get(getMappedStatement(metaObject).getId());
-//    }
-
-    /**
-     * <p>
-     * 获取当前执行 MappedStatement
-     * </p>
-     *
-     * @param metaObject 元对象
-     * @return
-     */
-    public static MappedStatement getMappedStatement(MetaObject metaObject) {
-        return (MappedStatement) metaObject.getValue(DELEGATE_MAPPEDSTATEMENT);
-    }
 
     /**
      * <p>
@@ -104,6 +52,7 @@ public abstract class PluginUtils {
         return target;
     }
 
+
     /**
      * <p>
      * 根据 key 获取 Properties 的值

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

@@ -17,8 +17,8 @@ package com.baomidou.mybatisplus.core.toolkit.sql;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.core.assist.ISqlParser;
-import com.baomidou.mybatisplus.core.assist.SqlInfo;
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.core.parser.SqlInfo;
 import com.baomidou.mybatisplus.core.enums.SqlLike;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.pagination.Pagination;

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

@@ -19,12 +19,13 @@ import java.util.List;
 
 import org.apache.ibatis.reflection.MetaObject;
 
-import com.baomidou.mybatisplus.core.assist.ISqlParser;
-import com.baomidou.mybatisplus.core.assist.SqlInfo;
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.core.parser.ISqlParserFilter;
+import com.baomidou.mybatisplus.core.parser.SqlInfo;
+import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
+import com.baomidou.mybatisplus.core.parser.SqlParserInfo;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
-import com.baomidou.mybatisplus.extension.plugins.parser.ISqlParserFilter;
-import com.baomidou.mybatisplus.extension.plugins.parser.SqlParserInfo;
 
 /**
  * <p>
@@ -50,8 +51,7 @@ public abstract class SqlParserHandler {
             // SQL 解析
             if (CollectionUtils.isNotEmpty(this.sqlParserList)) {
                 // @SqlParser(filter = true) 跳过该方法解析
-                //TODO: 3.0 新建parserUtil
-                SqlParserInfo sqlParserInfo = PluginUtils.getSqlParserInfo(metaObject);
+                SqlParserInfo sqlParserInfo = SqlParserHelper.getSqlParserInfo(metaObject);
                 if (null != sqlParserInfo && sqlParserInfo.getFilter()) {
                     return;
                 }
@@ -85,7 +85,8 @@ public abstract class SqlParserHandler {
         return sqlParserFilter;
     }
 
-    public void setSqlParserFilter(ISqlParserFilter sqlParserFilter) {
+    public SqlParserHandler setSqlParserFilter(ISqlParserFilter sqlParserFilter) {
         this.sqlParserFilter = sqlParserFilter;
+        return this;
     }
 }

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

@@ -30,8 +30,8 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.session.ResultHandler;
 import org.apache.ibatis.session.RowBounds;
 
-import com.baomidou.mybatisplus.core.assist.ISqlParser;
-import com.baomidou.mybatisplus.core.assist.SqlInfo;
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.core.parser.SqlInfo;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
 

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

@@ -21,12 +21,12 @@ import org.apache.ibatis.plugin.Plugin;
 import org.apache.ibatis.plugin.Signature;
 
 import com.baomidou.mybatisplus.annotations.Version;
-import com.baomidou.mybatisplus.entity.TableFieldInfo;
-import com.baomidou.mybatisplus.entity.TableInfo;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.toolkit.ClassUtils;
-import com.baomidou.mybatisplus.toolkit.ReflectionKit;
-import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
+import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 
 /**
  * <p>

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

@@ -37,8 +37,8 @@ import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.RowBounds;
 
 import com.baomidou.mybatisplus.core.MybatisDefaultParameterHandler;
-import com.baomidou.mybatisplus.core.assist.ISqlParser;
-import com.baomidou.mybatisplus.core.assist.SqlInfo;
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.core.parser.SqlInfo;
 import com.baomidou.mybatisplus.core.pagination.PageHelper;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;

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

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

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/tenant/package-info.java

@@ -1,4 +0,0 @@
-/**
- * mybatis 租户插件实现类
- */
-package com.baomidou.mybatisplus.extension.plugins.parser.tenant;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/tenant/TenantHandler.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantHandler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.parser.tenant;
+package com.baomidou.mybatisplus.extension.plugins.tenant;
 
 import net.sf.jsqlparser.expression.Expression;
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/tenant/TenantSchemaHandler.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSchemaHandler.java

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

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/tenant/TenantSchemaSqlParser.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSchemaSqlParser.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.parser.tenant;
+package com.baomidou.mybatisplus.extension.plugins.tenant;
 
 import com.baomidou.mybatisplus.extension.plugins.parser.AbstractJsqlParser;
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/parser/tenant/TenantSqlParser.java → mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParser.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.parser.tenant;
+package com.baomidou.mybatisplus.extension.plugins.tenant;
 
 import java.util.List;
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * mybatis 租户插件实现类
+ */
+package com.baomidou.mybatisplus.extension.plugins.tenant;