Merge branch 'baomidou:3.0' into 3.0

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java

@@ -24,13 +24,6 @@ package com.baomidou.mybatisplus.annotation;
  * @since 2016-09-09
  */
 public enum FieldStrategy {
-    /**
-     * 忽略判断
-     *
-     * @deprecated 3.5.3.2 该字段存在语义理解问题效果等于{@link #ALWAYS}
-     */
-    @Deprecated
-    IGNORED,
     /**
      * 任何时候都加入 SQL
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrapper.java

@@ -20,7 +20,10 @@ import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.*;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 
 import java.util.Objects;
 
@@ -158,8 +161,6 @@ public abstract class Wrapper<T> implements ISqlSegment {
         switch (e.getWhereStrategy()) {
             case NOT_NULL:
                 return Objects.nonNull(tableInfo.getPropertyValue(entity, e.getProperty()));
-            case IGNORED:
-                return true;
             case ALWAYS:
                 return true;
             case NOT_EMPTY:

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -17,7 +17,6 @@ package com.baomidou.mybatisplus.core.config;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.handlers.AnnotationHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler;
@@ -85,7 +84,8 @@ public class GlobalConfig implements Serializable {
     /**
      * 注解控制器
      */
-    private AnnotationHandler annotationHandler = new AnnotationHandler(){};
+    private AnnotationHandler annotationHandler = new AnnotationHandler() {
+    };
     /**
      * 参与 TableInfo 的初始化
      */
@@ -198,24 +198,12 @@ public class GlobalConfig implements Serializable {
          * @since 3.1.2
          */
         private FieldStrategy updateStrategy = FieldStrategy.NOT_NULL;
-
-        /**
-         * 字段验证策略之 select
-         *
-         * @since 3.1.2
-         * @deprecated 3.4.4
-         */
-        @Deprecated
-        private FieldStrategy selectStrategy;
-
         /**
          * 字段验证策略之 where
-         * 替代selectStrategy，保持与{@link TableField#whereStrategy()}一致
          *
          * @since 3.4.4
          */
         private FieldStrategy whereStrategy = FieldStrategy.NOT_NULL;
-
         /**
          * 生成INSERT语句时忽略自增主键字段(默认不忽略,主键有值时写入主键值,无值自增).
          * <p>当设置为true时,执行生成SQL语句无论ID是否有值都会忽视 (此为3.4.3.1版本下策略,如果升级遇到问题可以考虑开启此配置来兼容升级)</p>
@@ -223,18 +211,6 @@ public class GlobalConfig implements Serializable {
          * @since 3.5.6
          */
         private boolean insertIgnoreAutoIncrementColumn = false;
-
-        /**
-         * 重写whereStrategy的get方法，适配低版本：
-         * - 如果用户自定义了selectStrategy则用用户自定义的，
-         * - 后续版本移除selectStrategy后，直接删除该方法即可。
-         *
-         * @return 字段作为查询条件时的验证策略
-         * @since 3.4.4
-         */
-        public FieldStrategy getWhereStrategy() {
-            return selectStrategy == null ? whereStrategy : selectStrategy;
-        }
     }
 
     /**

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

@@ -587,7 +587,7 @@ public class TableFieldInfo implements Constants {
         if (fieldStrategy == FieldStrategy.NEVER) {
             return null;
         }
-        if (isPrimitive || fieldStrategy == FieldStrategy.IGNORED || fieldStrategy == FieldStrategy.ALWAYS) {
+        if (isPrimitive || fieldStrategy == FieldStrategy.ALWAYS) {
             return sqlScript;
         }
         if (fieldStrategy == FieldStrategy.NOT_EMPTY && isCharSequence) {

mybatis-plus-spring/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -134,15 +134,6 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
 
     private ObjectWrapperFactory objectWrapperFactory;
 
-    /**
-     * 不再需要这个配置,放心删除
-     *
-     * @deprecated 2022-03-07
-     */
-    @Setter
-    @Deprecated
-    private String typeEnumsPackage;
-
     @Setter
     private GlobalConfig globalConfig;
 

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

@@ -75,7 +75,6 @@ public class MybatisPlusConfigLogicDelete {
             }
         });
         sqlSessionFactory.setGlobalConfig(globalConfig);
-        sqlSessionFactory.setTypeEnumsPackage("com.baomidou.mybatisplus.test.h2.enums");
         return sqlSessionFactory.getObject();
     }
 

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

@@ -23,7 +23,6 @@ public class MybatisXmlConfig {
         sqlSessionFactory.setDataSource(dataSource);
         sqlSessionFactory.setTypeAliasesPackage("com.baomidou.mybatisplus.test.h2.entity.persistent");
         sqlSessionFactory.setConfigLocation(new ClassPathResource("mybatis-config-object-factory.xml"));
-        sqlSessionFactory.setTypeEnumsPackage("com.baomidou.mybatisplus.test.h2.enums");
         return sqlSessionFactory.getObject();
     }