TableInfoHelper去除无用方法

src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -599,7 +599,7 @@ public class AutoSqlInjector implements ISqlInjector {
                 columns.append("</otherwise></choose>");
             }
         } else {
-			/*
+            /*
 			 * 普通查询
 			 */
             if (entityWrapper) {

src/main/java/com/baomidou/mybatisplus/service/IService.java

@@ -98,6 +98,7 @@ public interface IService<T> {
      * <p>
      * 批量修改或插入全部字段
      * </p>
+     *
      * @param entityList 实体对象列表
      * @return boolean
      */
@@ -105,6 +106,7 @@ public interface IService<T> {
 
     /**
      * 批量修改或插入全部字段
+     *
      * @param entityList 实体对象列表
      * @param batchSize
      * @return boolean
@@ -236,6 +238,7 @@ public interface IService<T> {
 
     /**
      * 插入或修改一条记录的全部字段
+     *
      * @param entity 实体对象
      * @return boolean
      */

src/main/java/com/baomidou/mybatisplus/service/impl/ServiceImpl.java

@@ -197,36 +197,37 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
 
     @Transactional
     public boolean insertOrUpdateBatch(List<T> entityList, int batchSize) {
-        return insertOrUpdateBatch(entityList, batchSize,true);
+        return insertOrUpdateBatch(entityList, batchSize, true);
     }
 
     @Transactional
-    public boolean insertOrUpdateAllColumnBatch(List<T> entityList){
-        return insertOrUpdateBatch(entityList, 30,false);
+    public boolean insertOrUpdateAllColumnBatch(List<T> entityList) {
+        return insertOrUpdateBatch(entityList, 30, false);
     }
 
     @Transactional
-    public boolean insertOrUpdateAllColumnBatch(List<T> entityList, int batchSize){
-        return insertOrUpdateBatch(entityList, batchSize,false);
+    public boolean insertOrUpdateAllColumnBatch(List<T> entityList, int batchSize) {
+        return insertOrUpdateBatch(entityList, batchSize, false);
     }
 
     /**
      * 批量插入修改
+     *
      * @param entityList 实体对象列表
-     * @param batchSize 批量刷新个数
-     * @param selective 是否滤掉空字段
+     * @param batchSize  批量刷新个数
+     * @param selective  是否滤掉空字段
      * @return boolean
      */
-    private boolean insertOrUpdateBatch(List<T> entityList, int batchSize, boolean selective){
+    private boolean insertOrUpdateBatch(List<T> entityList, int batchSize, boolean selective) {
         if (CollectionUtils.isEmpty(entityList)) {
             throw new IllegalArgumentException("Error: entityList must not be empty");
         }
         try (SqlSession batchSqlSession = sqlSessionBatch()) {
             int size = entityList.size();
             for (int i = 0; i < size; i++) {
-                if(selective) {
+                if (selective) {
                     insertOrUpdate(entityList.get(i));
-                }else {
+                } else {
                     insertOrUpdateAllColumn(entityList.get(i));
                 }
                 if (i >= 1 && i % batchSize == 0) {
@@ -289,20 +290,21 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     }
 
     @Transactional
-    public boolean updateAllColumnBatchById(List<T> entityList){
+    public boolean updateAllColumnBatchById(List<T> entityList) {
         return updateAllColumnBatchById(entityList, 30);
     }
 
     @Transactional
-    public boolean updateAllColumnBatchById(List<T> entityList, int batchSize){
+    public boolean updateAllColumnBatchById(List<T> entityList, int batchSize) {
         return updateBatchById(entityList, batchSize, false);
     }
 
     /**
      * 根据主键ID进行批量修改
+     *
      * @param entityList 实体对象列表
-     * @param batchSize 批量刷新个数
-     * @param selective 是否滤掉空字段
+     * @param batchSize  批量刷新个数
+     * @param selective  是否滤掉空字段
      * @return boolean
      */
     private boolean updateBatchById(List<T> entityList, int batchSize, boolean selective) {

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

@@ -17,12 +17,9 @@ package com.baomidou.mybatisplus.toolkit;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.ibatis.builder.MapperBuilderAssistant;
@@ -46,7 +43,6 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.entity.TableFieldInfo;
 import com.baomidou.mybatisplus.entity.TableInfo;
-import com.baomidou.mybatisplus.enums.FieldFill;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.incrementer.IKeyGenerator;
@@ -67,27 +63,11 @@ public class TableInfoHelper {
      * 缓存反射类表信息
      */
     private static final Map<String, TableInfo> tableInfoCache = new ConcurrentHashMap<>();
-    /**
-     * 自动填充字段信息
-     */
-    private static final Map<FieldFill, Map<Class<?>, Set<String>>> fieldFillMap = new ConcurrentHashMap<>();
     /**
      * 默认表主键
      */
     private static final String DEFAULT_ID_NAME = "id";
 
-    /**
-     * <p>
-     * 获取自动填充信息
-     * <p>
-     *
-     * @param fieldFill
-     * @return
-     */
-    public static Map<Class<?>, Set<String>> getFieldFillMap(FieldFill fieldFill) {
-        return fieldFillMap.get(fieldFill);
-    }
-
     /**
      * <p>
      * 获取实体映射表信息
@@ -211,60 +191,9 @@ public class TableInfoHelper {
          * 注入
 		 */
         tableInfoCache.put(clazz.getName(), tableInfo);
-        //初始化填充字段缓存信息
-        //initFieldFillCache(clazz, tableInfo);
         return tableInfo;
     }
 
-    /**
-     * 初始化填充字段缓存信息
-     *
-     * @param clazz
-     * @param tableInfo
-     */
-    private static void initFieldFillCache(Class<?> clazz, TableInfo tableInfo) {
-        clazz = ClassUtils.getUserClass(clazz);
-        List<TableFieldInfo> tableFieldInfos = tableInfo.getFieldList();
-        if (CollectionUtils.isNotEmpty(tableFieldInfos)) {
-            for (TableFieldInfo tableFieldInfo : tableFieldInfos) {
-                FieldFill fieldFill = tableFieldInfo.getFieldFill();
-                if (null == fieldFill || FieldFill.DEFAULT.equals(fieldFill)) {
-                    continue;
-                }
-                switch (fieldFill) {
-                    case INSERT:
-                        initFieldFill(FieldFill.INSERT, clazz, tableFieldInfo);
-                        break;
-                    case UPDATE:
-                        initFieldFill(FieldFill.UPDATE, clazz, tableFieldInfo);
-                        break;
-                    case INSERT_UPDATE:
-                        initFieldFill(FieldFill.INSERT, clazz, tableFieldInfo);
-                        initFieldFill(FieldFill.UPDATE, clazz, tableFieldInfo);
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-     * 初始化填充
-     *
-     * @param fieldFill
-     * @param clazz
-     * @param tableFieldInfo
-     */
-    private static void initFieldFill(FieldFill fieldFill, Class<?> clazz, TableFieldInfo tableFieldInfo) {
-        Map<Class<?>, Set<String>> fillFieldMap = fieldFillMap.get(fieldFill);
-        if (MapUtils.isEmpty(fillFieldMap)) {
-            fillFieldMap = new HashMap<>();
-            fillFieldMap.put(clazz, new TreeSet<String>());
-            fieldFillMap.put(fieldFill, fillFieldMap);
-        }
-        Set<String> properties = fillFieldMap.get(clazz);
-        properties.add(tableFieldInfo.getProperty());
-    }
-
     /**
      * <p>
      * 判断主键注解是否存在

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

@@ -113,7 +113,7 @@ public class EntityWrapperTest {
 
     @Test
     public void test23() {
-		/*
+        /*
 		 * 无实体查询，只排序
 		 */
         ew.orderBy("id", false);

src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjAndVersionAndOptLockTest.java

@@ -215,6 +215,7 @@ public class H2MetaObjAndVersionAndOptLockTest extends H2Test {
         int row = userMapper.myInsertWithParam(user);
         Assert.assertEquals(1, row);
     }
+
     @Test
     public void testInsertObjectWithoutParam() {
         String name = "自定义insert带Param注解";

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -369,6 +369,7 @@ public class H2UserTest extends H2Test {
         int row = userService.myInsertWithParam(name, version);
         Assert.assertEquals(1, row);
     }
+
     @Test
     public void testInsertObjectWithoutParam() {
         String name = "自定义insert带Param注解";

src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java

@@ -49,6 +49,7 @@ public interface H2UserMapper extends SuperMapper<H2User> {
             "insert into h2user(name,version) values( #{user1.name}, #{user1.version})"
     )
     int myInsertWithParam(@Param("user1") H2User user1);
+
     @Insert(
             "insert into h2user(name,version) values( #{name}, #{version})"
     )

src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java

@@ -50,6 +50,7 @@ public interface H2UserVersionAndLogicDeleteMapper extends BaseMapper<H2UserVers
             "insert into h2user(name,version) values( #{user1.name}, #{user1.version})"
     )
     int myInsertWithParam(@Param("user1") H2UserVersionAndLogicDeleteEntity user1);
+
     @Insert(
             "insert into h2user(name,version) values( #{name}, #{version})"
     )