miemie 4 年之前
父節點
當前提交
adf1e85aee
共有 38 個文件被更改,包括 62 次插入77 次删除
  1. 1 1
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlParser.java
  2. 1 1
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableField.java
  3. 3 3
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java
  4. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisParameterHandler.java
  5. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/enums/IEnum.java
  6. 1 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/AbstractBaseExecutor.java
  7. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisBatchExecutor.java
  8. 2 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisCachingExecutor.java
  9. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisReuseExecutor.java
  10. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisSimpleExecutor.java
  11. 6 6
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/IPage.java
  12. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java
  13. 2 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java
  14. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlParserHelper.java
  15. 4 4
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/CollectionUtils.java
  16. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKit.java
  17. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/MybatisEnumTypeHandler.java
  18. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/parsers/DynamicTableNameParser.java
  19. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/parsers/ITableNameHandler.java
  20. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/IllegalSQLInterceptor.java
  21. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/MybatisPlusInterceptor.java
  22. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/OptimisticLockerInterceptor.java
  23. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/PaginationInterceptor.java
  24. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/SqlExplainInterceptor.java
  25. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TableNameHandler.java
  26. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java
  27. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java
  28. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java
  29. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java
  30. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/InnerInterceptor.java
  31. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/OptimisticLockerInnerInterceptor.java
  32. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java
  33. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java
  34. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantHandler.java
  35. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParser.java
  36. 3 3
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlHelper.java
  37. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlParserUtils.java
  38. 11 25
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

+ 1 - 1
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlParser.java

@@ -22,7 +22,7 @@ import java.lang.annotation.*;
  *
  * @author hubin
  * @since 2018-01-13
- * @deprecated 3.3.3 use {@link InterceptorIgnore}
+ * @deprecated 3.4.0 use {@link InterceptorIgnore}
  */
 @Documented
 @Deprecated

+ 1 - 1
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableField.java

@@ -145,7 +145,7 @@ public @interface TableField {
      * 一般情况下不推荐使用
      * {@link ParameterMapping#javaType}
      *
-     * @since 3.3.3 @2020-07-23
+     * @since 3.4.0 @2020-07-23
      */
     boolean javaType() default false;
 

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java

@@ -70,7 +70,7 @@ public class MybatisConfiguration extends Configuration {
     /**
      * 是否生成短key缓存
      *
-     * @since 3.3.3
+     * @since 3.4.0
      */
     @Setter
     @Getter
@@ -91,7 +91,7 @@ public class MybatisConfiguration extends Configuration {
 
     /**
      * @return GlobalConfig
-     * @deprecated 3.3.3 please use {@link GlobalConfigUtils#getGlobalConfig(Configuration)}
+     * @deprecated 3.4.0 please use {@link GlobalConfigUtils#getGlobalConfig(Configuration)}
      */
     @Deprecated
     public GlobalConfig getGlobalConfig() {
@@ -100,7 +100,7 @@ public class MybatisConfiguration extends Configuration {
 
     /**
      * @param globalConfig GlobalConfig
-     * @deprecated 3.3.3 please use {@link GlobalConfigUtils#setGlobalConfig(Configuration, GlobalConfig)}
+     * @deprecated 3.4.0 please use {@link GlobalConfigUtils#setGlobalConfig(Configuration, GlobalConfig)}
      */
     @Deprecated
     public void setGlobalConfig(GlobalConfig globalConfig) {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisParameterHandler.java

@@ -44,7 +44,7 @@ import java.util.Map;
  * 自定义 ParameterHandler 重装构造函数,填充插入方法主键 ID
  *
  * @author nieqiuqiu 2020/6/5
- * @since 3.3.3
+ * @since 3.4.0
  */
 public class MybatisParameterHandler implements ParameterHandler {
 

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/enums/IEnum.java

@@ -22,7 +22,7 @@ import java.io.Serializable;
  *
  * @author hubin
  * @since 2017-10-11
- * @deprecated 3.3.3 @2020-06-30
+ * @deprecated 3.4.0 @2020-06-30
  */
 @Deprecated
 public interface IEnum<T extends Serializable> extends com.baomidou.mybatisplus.annotation.IEnum<T> {

+ 1 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/AbstractBaseExecutor.java

@@ -16,7 +16,6 @@
 package com.baomidou.mybatisplus.core.executor;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
 import org.apache.ibatis.cache.CacheKey;
 import org.apache.ibatis.executor.BaseExecutor;
@@ -38,7 +37,7 @@ import java.util.Optional;
  * 重写执行器 {@link org.apache.ibatis.executor.BaseExecutor}
  *
  * @author nieqiurong 2019/4/22.
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public abstract class AbstractBaseExecutor extends BaseExecutor {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisBatchExecutor.java

@@ -41,7 +41,7 @@ import java.util.List;
  * 重写执行器 {@link org.apache.ibatis.executor.BatchExecutor}
  *
  * @author nieqiurong 2019/4/14.
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public class MybatisBatchExecutor extends AbstractBaseExecutor {

+ 2 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisCachingExecutor.java

@@ -15,8 +15,8 @@
  */
 package com.baomidou.mybatisplus.core.executor;
 
-import com.baomidou.mybatisplus.core.metadata.PageList;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.PageList;
 import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import org.apache.ibatis.cache.Cache;
@@ -42,7 +42,7 @@ import java.util.Optional;
  * copy org.apache.ibatis.executor.CachingExecutor 主要修改了分页缓存逻辑
  *
  * @author nieqiuqiu
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public class MybatisCachingExecutor implements Executor {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisReuseExecutor.java

@@ -38,7 +38,7 @@ import java.util.Map;
  * 重写执行器 {@link org.apache.ibatis.executor.ReuseExecutor}
  *
  * @author nieqiurong 2019/4/14.
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public class MybatisReuseExecutor extends AbstractBaseExecutor {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/executor/MybatisSimpleExecutor.java

@@ -36,7 +36,7 @@ import java.util.List;
  * 重写执行器 {@link org.apache.ibatis.executor.SimpleExecutor}
  *
  * @author nieqiurong 2019/4/14.
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public class MybatisSimpleExecutor extends AbstractBaseExecutor {

+ 6 - 6
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/IPage.java

@@ -44,7 +44,7 @@ public interface IPage<T> extends Serializable {
      * KEY/VALUE 条件
      *
      * @return ignore
-     * @deprecated 3.3.3 @2020-06-30
+     * @deprecated 3.4.0 @2020-06-30
      */
     @Deprecated
     default Map<Object, Object> condition() {
@@ -83,7 +83,7 @@ public interface IPage<T> extends Serializable {
     /**
      * 最大每页分页数限制,优先级高于分页插件内的 maxLimit
      *
-     * @since 3.3.3 @2020-07-17
+     * @since 3.4.0 @2020-07-17
      */
     default Long maxLimit() {
         return null;
@@ -117,7 +117,7 @@ public interface IPage<T> extends Serializable {
      *
      * @param hit 是否命中
      * @since 3.3.1
-     * @deprecated 3.3.3 @2020-06-30 缓存遵循mybatis的一或二缓
+     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
      */
     @Deprecated
     default void hitCount(boolean hit) {
@@ -129,7 +129,7 @@ public interface IPage<T> extends Serializable {
      *
      * @return 是否命中count缓存
      * @since 3.3.1
-     * @deprecated 3.3.3 @2020-06-30 缓存遵循mybatis的一或二缓
+     * @deprecated 3.4.0 @2020-06-30 缓存遵循mybatis的一或二缓
      */
     @Deprecated
     default boolean isHitCount() {
@@ -203,7 +203,7 @@ public interface IPage<T> extends Serializable {
      * MappedStatement 的 id
      *
      * @return id
-     * @since 3.3.3 @2020-06-19
+     * @since 3.4.0 @2020-06-19
      */
     default String countId() {
         return null;
@@ -214,7 +214,7 @@ public interface IPage<T> extends Serializable {
      *
      * @return 缓存key值
      * @since 3.3.2
-     * @deprecated 3.3.3 @2020-06-30
+     * @deprecated 3.4.0 @2020-06-30
      */
     @Deprecated
     default String cacheKey() {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java

@@ -65,7 +65,7 @@ public class TableFieldInfo implements Constants {
     /**
      * 是否是基本数据类型
      *
-     * @since 3.3.3 @2020-6-19
+     * @since 3.4.0 @2020-6-19
      */
     private final boolean isPrimitive;
     /**

+ 2 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -143,7 +143,7 @@ public class TableInfo implements Constants {
     /**
      * 表字段是否启用了逻辑删除
      *
-     * @since 3.3.3
+     * @since 3.4.0
      */
     @Getter
     @Setter(AccessLevel.NONE)
@@ -151,7 +151,7 @@ public class TableInfo implements Constants {
     /**
      * 逻辑删除字段
      *
-     * @since 3.3.3
+     * @since 3.4.0
      */
     @Getter
     @Setter(AccessLevel.NONE)

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

@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
  *
  * @author hubin
  * @since 2018-07-22
- * @deprecated 3.3.3
+ * @deprecated 3.4.0
  */
 @Deprecated
 public class SqlParserHelper {

+ 4 - 4
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/CollectionUtils.java

@@ -77,7 +77,7 @@ public class CollectionUtils {
      * @param <V> V
      * @return HashMap
      * @see com.google.common.collect.Maps#newHashMap()
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static <K, V> HashMap<K, V> newHashMap() {
         return new HashMap<>();
@@ -91,7 +91,7 @@ public class CollectionUtils {
      * @param <V>          V
      * @return HashMap
      * @see com.google.common.collect.Maps#newHashMapWithExpectedSize
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static <K, V> HashMap<K, V> newHashMapWithExpectedSize(int expectedSize) {
         return new HashMap<>(capacity(expectedSize));
@@ -107,7 +107,7 @@ public class CollectionUtils {
      * @param <K>               k
      * @param <V>               v
      * @return V
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static <K, V> V computeIfAbsent(Map<K, V> concurrentHashMap, K key, Function<? super K, ? extends V> mappingFunction) {
         V v = concurrentHashMap.get(key);
@@ -123,7 +123,7 @@ public class CollectionUtils {
      * default (0.75).
      *
      * @see com.google.common.collect.Maps#capacity(int)
-     * @since 3.3.3
+     * @since 3.4.0
      */
     private static int capacity(int expectedSize) {
         if (expectedSize < 3) {

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKit.java

@@ -175,7 +175,7 @@ public final class ReflectionKit {
      * </p>
      *
      * @param clazz 反射类
-     * @deprecated 3.3.3
+     * @deprecated 3.4.0
      */
     @Deprecated
     public static List<Field> doGetFieldList(Class<?> clazz) {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/MybatisEnumTypeHandler.java

@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
  *
  * @author hubin
  * @since 2017-10-11
- * @deprecated 3.3.3 @2020-06-23 use {@link com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler}
+ * @deprecated 3.4.0 @2020-06-23 use {@link com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler}
  */
 @Deprecated
 public class MybatisEnumTypeHandler<E extends Enum<?>> extends BaseTypeHandler<Enum<?>> {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/parsers/DynamicTableNameParser.java

@@ -33,7 +33,7 @@ import java.util.Map;
  *
  * @author jobob
  * @since 2019-04-23
- * @deprecated 3.3.3 @2020-07-30 use {@link MybatisPlusInterceptor} {@link DynamicTableNameInnerInterceptor}
+ * @deprecated 3.4.0 @2020-07-30 use {@link MybatisPlusInterceptor} {@link DynamicTableNameInnerInterceptor}
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/parsers/ITableNameHandler.java

@@ -25,7 +25,7 @@ import org.apache.ibatis.reflection.MetaObject;
  *
  * @author jobob
  * @since 2019-04-23
- * @deprecated 3.3.3 @2020-07-30 use {@link TableNameHandler} {@link MybatisPlusInterceptor} {@link DynamicTableNameInnerInterceptor}
+ * @deprecated 3.4.0 @2020-07-30 use {@link TableNameHandler} {@link MybatisPlusInterceptor} {@link DynamicTableNameInnerInterceptor}
  */
 @Deprecated
 public interface ITableNameHandler {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/IllegalSQLInterceptor.java

@@ -81,7 +81,7 @@ import java.util.concurrent.ConcurrentHashMap;
  *
  * @author willenfoo
  * @since 2018-03-22
- * @deprecated 3.3.3 @2020-07-30 use {@link MybatisPlusInterceptor} {@link IllegalSQLInnerInterceptor}
+ * @deprecated 3.4.0 please use {@link MybatisPlusInterceptor} {@link IllegalSQLInnerInterceptor}
  */
 @Deprecated
 @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})})

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

@@ -19,7 +19,7 @@ import java.util.*;
 
 /**
  * @author miemie
- * @since 2020-06-16
+ * @since 3.4.0
  */
 @SuppressWarnings({"rawtypes"})
 @Intercepts(

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

@@ -54,7 +54,7 @@ import java.util.Map;
  *
  * @author yuxiaobin
  * @since 2017/5/24
- * @deprecated 3.3.3 @2020-07-30 use {@link MybatisPlusInterceptor} {@link OptimisticLockerInnerInterceptor}
+ * @deprecated 3.4.0 please use {@link MybatisPlusInterceptor} {@link OptimisticLockerInnerInterceptor}
  */
 @Deprecated
 @Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})

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

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
  *
  * @author hubin
  * @since 2016-01-23
- * @deprecated 3.3.3 @2020-06-30 use {@link MybatisPlusInterceptor} {@link PaginationInnerInterceptor}
+ * @deprecated 3.4.0 please use {@link MybatisPlusInterceptor} {@link PaginationInnerInterceptor}
  */
 @Setter
 @Deprecated

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/SqlExplainInterceptor.java

@@ -36,7 +36,7 @@ import org.apache.ibatis.session.RowBounds;
  *
  * @author hubin
  * @since 2016-08-16
- * @deprecated 3.3.3 @2020-07-30 use {@link MybatisPlusInterceptor} {@link BlockAttackInnerInterceptor}
+ * @deprecated 3.4.0 please use {@link MybatisPlusInterceptor} {@link BlockAttackInnerInterceptor}
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TableNameHandler.java

@@ -17,7 +17,7 @@ package com.baomidou.mybatisplus.extension.plugins.handler;
 
 /**
  * @author miemie
- * @since 2020-07-16
+ * @since 3.4.0
  */
 public interface TableNameHandler {
 

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/handler/TenantLineHandler.java

@@ -21,7 +21,7 @@ import net.sf.jsqlparser.expression.Expression;
  * 租户处理器( TenantId 行级 )
  *
  * @author hubin
- * @since 2017-08-31
+ * @since 3.4.0
  */
 public interface TenantLineHandler {
 

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptor.java

@@ -32,7 +32,7 @@ import java.sql.Connection;
  * 攻击 SQL 阻断解析器,防止全表更新与删除
  *
  * @author hubin
- * @since 2020-06-24
+ * @since 3.4.0
  */
 public class BlockAttackInnerInterceptor extends JsqlParserSupport implements InnerInterceptor {
 

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java

@@ -40,7 +40,7 @@ import java.util.Map;
  * 动态表名
  *
  * @author jobob
- * @since 2019-04-23
+ * @since 3.4.0
  */
 @Data
 @NoArgsConstructor

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptor.java

@@ -75,7 +75,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * <p>7.where条件使用了 使用子查询</p>
  *
  * @author willenfoo
- * @since 2020-06-24
+ * @since 3.4.0
  */
 public class IllegalSQLInnerInterceptor extends JsqlParserSupport implements InnerInterceptor {
 

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/InnerInterceptor.java

@@ -30,7 +30,7 @@ import java.util.Properties;
 
 /**
  * @author miemie
- * @since 2020-06-16
+ * @since 3.4.0
  */
 @SuppressWarnings({"rawtypes"})
 public interface InnerInterceptor {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/OptimisticLockerInnerInterceptor.java

@@ -53,7 +53,7 @@ import java.util.Map;
  * <p>SQL: update tbl_test set name='abc',version=2 where id=100001 and version=1;</p>
  *
  * @author yuxiaobin
- * @since 2020-06-24
+ * @since 3.4.0
  */
 @SuppressWarnings({"unchecked"})
 public class OptimisticLockerInnerInterceptor implements InnerInterceptor {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
  * 默认对 left join 进行优化,虽然能优化count,但是加上分页的话如果1对多本身结果条数就是不正确的
  *
  * @author hubin
- * @since 2020-06-16
+ * @since 3.4.0
  */
 @Data
 @NoArgsConstructor

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java

@@ -49,7 +49,7 @@ import java.util.Properties;
 
 /**
  * @author hubin
- * @since 2020-06-20
+ * @since 3.4.0
  */
 @Data
 @NoArgsConstructor

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantHandler.java

@@ -26,7 +26,7 @@ import net.sf.jsqlparser.expression.ValueListExpression;
  *
  * @author hubin
  * @since 2017-08-31
- * @deprecated 3.3.3 @2020-07-24 use {@link MybatisPlusInterceptor} {@link TenantLineInnerInterceptor} {@link TenantLineHandler}
+ * @deprecated 3.4.0 please use {@link MybatisPlusInterceptor} {@link TenantLineInnerInterceptor} {@link TenantLineHandler}
  */
 @Deprecated
 public interface TenantHandler {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParser.java

@@ -44,7 +44,7 @@ import java.util.List;
  *
  * @author hubin
  * @since 2017-09-01
- * @deprecated 3.3.3 @2020-07-24
+ * @deprecated 3.4.0
  */
 @Data
 @Deprecated

+ 3 - 3
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlHelper.java

@@ -158,7 +158,7 @@ public final class SqlHelper {
      * @param log         日志对象
      * @param consumer    consumer
      * @return 操作结果
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static boolean executeBatch(Class<?> entityClass, Log log, Consumer<SqlSession> consumer) {
         SqlSessionFactory sqlSessionFactory = sqlSessionFactory(entityClass);
@@ -203,7 +203,7 @@ public final class SqlHelper {
      * @param consumer    consumer
      * @param <E>         T
      * @return 操作结果
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static <E> boolean executeBatch(Class<?> entityClass, Log log, Collection<E> list, int batchSize, BiConsumer<SqlSession, E> consumer) {
         Assert.isFalse(batchSize < 1, "batchSize must not be less than one");
@@ -231,7 +231,7 @@ public final class SqlHelper {
      * @param consumer    consumer(更新处理) notNull
      * @param <E>         E
      * @return 操作结果
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public static <E> boolean saveOrUpdateBatch(Class<?> entityClass, Log log, Collection<E> list, int batchSize, BiPredicate<SqlSession,E> predicate, BiConsumer<SqlSession, E> consumer) {
         TableInfo tableInfo = TableInfoHelper.getTableInfo(entityClass);

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlParserUtils.java

@@ -49,7 +49,7 @@ public class SqlParserUtils {
      * @param sqlParser        Count SQL 解析类
      * @param originalSql      需要计算Count SQL
      * @return SqlInfo
-     * @deprecated 3.3.3
+     * @deprecated 3.4.0
      */
     @Deprecated
     public static SqlInfo getOptimizeCountSql(boolean optimizeCountSql, ISqlParser sqlParser, String originalSql) {

+ 11 - 25
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -15,42 +15,28 @@
  */
 package com.baomidou.mybatisplus.generator.config.builder;
 
-import java.io.File;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
-import com.baomidou.mybatisplus.generator.config.ConstVal;
-import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
-import com.baomidou.mybatisplus.generator.config.GlobalConfig;
-import com.baomidou.mybatisplus.generator.config.IDbQuery;
-import com.baomidou.mybatisplus.generator.config.IKeyWordsHandler;
-import com.baomidou.mybatisplus.generator.config.INameConvert;
-import com.baomidou.mybatisplus.generator.config.PackageConfig;
-import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.TemplateConfig;
+import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.querys.H2Query;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
+import java.io.File;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * 配置汇总 传递给文件生成工具
  *
@@ -804,7 +790,7 @@ public class ConfigBuilder {
      *
      * @param comment 注释
      * @return 注释
-     * @since 3.3.3
+     * @since 3.4.0
      */
     public String formatComment(String comment) {
         return StringUtils.isBlank(comment) ? StringPool.EMPTY : comment.replaceAll("\r\n", "\t");