[优化] 移除自动刷新相关,只保留 MybatisMapperRefresh 类

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

@@ -48,12 +48,6 @@ public class GlobalConfig implements Serializable {
      * 是否开启 LOGO
      */
     private boolean banner = true;
-    /**
-     * 是否刷新 mapper
-     * @deprecated since 2018-11-26
-     */
-    @Deprecated
-    private boolean refresh = false;
     /**
      * 缓存 Sql 解析初始化
      */

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

@@ -16,15 +16,6 @@
  */
 package com.baomidou.mybatisplus.core.toolkit;
 
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.SqlSessionFactory;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
@@ -33,6 +24,14 @@ import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Mybatis全局缓存工具类
@@ -147,11 +146,6 @@ public class GlobalConfigUtils {
         return getGlobalConfig(configuration).getSuperMapperClass();
     }
 
-    public static boolean isRefresh(Configuration configuration) {
-        return getGlobalConfig(configuration).isRefresh();
-    }
-
-
     public static Set<String> getMapperRegistryCache(Configuration configuration) {
         return getGlobalConfig(configuration).getMapperRegistryCache();
     }

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

@@ -15,8 +15,6 @@
  */
 package com.baomidou.mybatisplus.extension.spring;
 
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.SystemClock;
 import org.apache.ibatis.binding.MapperRegistry;
@@ -41,7 +39,6 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.*;
 
-
 /**
  * 切莫用于生产环境（后果自负）
  * <p>Mybatis 映射文件热加载（发生变动后自动重新加载）.</p>
@@ -101,7 +98,6 @@ public class MybatisMapperRefresh implements Runnable {
 
     @Override
     public void run() {
-        final GlobalConfig globalConfig = GlobalConfigUtils.getGlobalConfig(configuration);
         /*
          * 启动 XML 热加载
          */
@@ -144,7 +140,6 @@ public class MybatisMapperRefresh implements Runnable {
                         for (String filePath : fileSet) {
                             File file = new File(filePath);
                             if (file.isFile() && file.lastModified() > beforeTime) {
-                                globalConfig.setRefresh(true);
                                 List<Resource> removeList = JAR_MAPPER.get(filePath);
                                 if (removeList != null && !removeList.isEmpty()) {
                                     for (Resource resource : removeList) {
@@ -155,10 +150,7 @@ public class MybatisMapperRefresh implements Runnable {
                                 }
                             }
                         }
-                        if (globalConfig.isRefresh()) {
-                            beforeTime = SystemClock.now();
-                        }
-                        globalConfig.setRefresh(true);
+                        beforeTime = SystemClock.now();
                     } catch (Exception exception) {
                         exception.printStackTrace();
                     }
@@ -214,7 +206,7 @@ public class MybatisMapperRefresh implements Runnable {
     /**
      * 清理parameterMap
      *
-     * @param list ignore
+     * @param list      ignore
      * @param namespace ignore
      */
     private void cleanParameterMap(List<XNode> list, String namespace) {
@@ -227,7 +219,7 @@ public class MybatisMapperRefresh implements Runnable {
     /**
      * 清理resultMap
      *
-     * @param list ignore
+     * @param list      ignore
      * @param namespace ignore
      */
     private void cleanResultMap(List<XNode> list, String namespace) {
@@ -259,7 +251,7 @@ public class MybatisMapperRefresh implements Runnable {
     /**
      * 清理selectKey
      *
-     * @param list ignore
+     * @param list      ignore
      * @param namespace ignore
      */
     private void cleanKeyGenerators(List<XNode> list, String namespace) {
@@ -273,7 +265,7 @@ public class MybatisMapperRefresh implements Runnable {
     /**
      * 清理sql节点缓存
      *
-     * @param list ignore
+     * @param list      ignore
      * @param namespace ignore
      */
     private void cleanSqlElement(List<XNode> list, String namespace) {

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

@@ -602,11 +602,6 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
         globalConfig.signGlobalConfig(sqlSessionFactory);
 
         if (!isEmpty(this.mapperLocations)) {
-            if (GlobalConfigUtils.isRefresh(configuration)) {
-                // TODO 设置自动刷新配置 减少配置
-                new MybatisMapperRefresh(this.mapperLocations, sqlSessionFactory, 2,
-                    2, true);
-            }
             for (Resource mapperLocation : this.mapperLocations) {
                 if (mapperLocation == null) {
                     continue;