生成器代码优化.

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -68,23 +68,23 @@ public class AutoGenerator {
     /**
      * 数据库表配置
      */
-    private StrategyConfig strategy;
+    private StrategyConfig strategy = new StrategyConfig();
     /**
      * 包 相关配置
      */
-    private PackageConfig packageInfo;
+    private PackageConfig packageInfo = new PackageConfig();
     /**
      * 模板 相关配置
      */
-    private TemplateConfig template;
+    private TemplateConfig template = new TemplateConfig();
     /**
      * 全局 相关配置
      */
-    private GlobalConfig globalConfig;
+    private GlobalConfig globalConfig = new GlobalConfig();
     /**
      * 模板引擎
      */
-    private AbstractTemplateEngine templateEngine;
+    private AbstractTemplateEngine templateEngine = new VelocityTemplateEngine(); // 为了兼容之前逻辑，采用 Velocity 引擎 【 默认 】
 
     /**
      * 生成代码
@@ -98,10 +98,6 @@ public class AutoGenerator {
                 injectionConfig.setConfig(config);
             }
         }
-        if (null == templateEngine) {
-            // 为了兼容之前逻辑，采用 Velocity 引擎 【 默认 】
-            templateEngine = new VelocityTemplateEngine();
-        }
         // 模板引擎初始化执行文件输出
         templateEngine.init(this.pretreatmentConfigBuilder(config)).mkdirs().batchOutput().open();
         logger.debug("==========================文件生成完成！！！==========================");

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java

@@ -16,6 +16,7 @@
 package com.baomidou.mybatisplus.generator.config;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.Data;
@@ -90,4 +91,18 @@ public class PackageConfig {
     public String joinPackage(String subPackage) {
         return StringUtils.isBlank(parent) ? subPackage : (parent + StringPool.DOT + subPackage);
     }
+
+    public Map<String, String> initPackageInfo() {
+        Map<String, String> initMap = CollectionUtils.newHashMapWithExpectedSize(7);
+        initMap.put(ConstVal.MODULE_NAME, this.getModuleName());
+        initMap.put(ConstVal.ENTITY, this.joinPackage(this.getEntity()));
+        initMap.put(ConstVal.MAPPER, this.joinPackage(this.getMapper()));
+        initMap.put(ConstVal.XML, this.joinPackage(this.getXml()));
+        initMap.put(ConstVal.SERVICE, this.joinPackage(this.getService()));
+        initMap.put(ConstVal.SERVICE_IMPL, this.joinPackage(this.getServiceImpl()));
+        initMap.put(ConstVal.CONTROLLER, this.joinPackage(this.getController()));
+        return initMap;
+    }
+
+
 }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

@@ -419,4 +419,40 @@ public class StrategyConfig {
         }
         return this.superEntityColumns;
     }
+
+    public void validate(){
+        boolean isInclude = this.getInclude().size() > 0;
+        boolean isExclude = this.getExclude().size() > 0;
+        if (isInclude && isExclude) {
+            throw new IllegalArgumentException("<strategy> 标签中 <include> 与 <exclude> 只能配置一项！");
+        }
+        if (this.getNotLikeTable() != null && this.getLikeTable() != null) {
+            throw new IllegalArgumentException("<strategy> 标签中 <likeTable> 与 <notLikeTable> 只能配置一项！");
+        }
+    }
+
+    public boolean matchIncludeTable(String tableName) {
+        return matchTable(tableName, this.getInclude());
+    }
+
+    public boolean matchExcludeTable(String tableName) {
+        return matchTable(tableName, this.getExclude());
+    }
+
+    private boolean matchTable(String tableName, Set<String> matchTables) {
+        return matchTables.stream().anyMatch(t -> tableNameMatches(t, tableName));
+    }
+
+    /**
+     * 表名匹配
+     *
+     * @param setTableName 设置表名
+     * @param dbTableName  数据库表单
+     * @return ignore
+     */
+    private boolean tableNameMatches(String setTableName, String dbTableName) {
+        return setTableName.equalsIgnoreCase(dbTableName)
+            || StringUtils.matches(setTableName, dbTableName);
+    }
+
 }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/TemplateConfig.java

@@ -15,11 +15,17 @@
  */
 package com.baomidou.mybatisplus.generator.config;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 
+import java.io.File;
+import java.util.Map;
+
 /**
  * 模板路径配置项
  *
@@ -48,7 +54,7 @@ public class TemplateConfig {
     public String getEntity(boolean kotlin) {
         return kotlin ? entityKt : entity;
     }
-    
+
     /**
      * 禁用模板
      *
@@ -80,5 +86,41 @@ public class TemplateConfig {
         }
         return this;
     }
-    
+
+    public Map<String, String> initTemplate(GlobalConfig globalConfig, Map<String, String> packageInfo) {
+        Map<String, String> initMap = CollectionUtils.newHashMapWithExpectedSize(6);
+        String outputDir = globalConfig.getOutputDir();
+        setPathInfo(initMap, packageInfo, this.getEntity(globalConfig.isKotlin()), outputDir, ConstVal.ENTITY_PATH, ConstVal.ENTITY);
+        setPathInfo(initMap, packageInfo, this.getMapper(), outputDir, ConstVal.MAPPER_PATH, ConstVal.MAPPER);
+        setPathInfo(initMap, packageInfo, this.getXml(), outputDir, ConstVal.XML_PATH, ConstVal.XML);
+        setPathInfo(initMap, packageInfo, this.getService(), outputDir, ConstVal.SERVICE_PATH, ConstVal.SERVICE);
+        setPathInfo(initMap, packageInfo, this.getServiceImpl(), outputDir, ConstVal.SERVICE_IMPL_PATH, ConstVal.SERVICE_IMPL);
+        setPathInfo(initMap, packageInfo, this.getController(), outputDir, ConstVal.CONTROLLER_PATH, ConstVal.CONTROLLER);
+        return initMap;
+    }
+
+    private void setPathInfo(Map<String, String> pathInfo, Map<String, String> packageInfo, String template, String outputDir, String path, String module) {
+        if (StringUtils.isNotBlank(template)) {
+            pathInfo.put(path, joinPath(outputDir, packageInfo.get(module)));
+        }
+    }
+
+    /**
+     * 连接路径字符串
+     *
+     * @param parentDir   路径常量字符串
+     * @param packageName 包名
+     * @return 连接后的路径
+     */
+    private String joinPath(String parentDir, String packageName) {
+        if (StringUtils.isBlank(parentDir)) {
+            parentDir = System.getProperty(ConstVal.JAVA_TMPDIR);
+        }
+        if (!StringUtils.endsWith(parentDir, File.separator)) {
+            parentDir += File.separator;
+        }
+        packageName = packageName.replaceAll("\\.", StringPool.BACK_SLASH + File.separator);
+        return parentDir + packageName;
+    }
+
 }

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

@@ -17,7 +17,6 @@ package com.baomidou.mybatisplus.generator.config.builder;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 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.*;
@@ -31,7 +30,6 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import java.io.File;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -75,12 +73,12 @@ public class ConfigBuilder {
      * 包配置详情
      */
     @Setter(value = AccessLevel.NONE)
-    private Map<String, String> packageInfo;
+    private final Map<String, String> packageInfo = new HashMap<>();
     /**
      * 路径配置信息
      */
     @Setter(value = AccessLevel.NONE)
-    private Map<String, String> pathInfo;
+    private final Map<String, String> pathInfo = new HashMap<>();
     /**
      * 策略配置
      */
@@ -96,7 +94,7 @@ public class ConfigBuilder {
     /**
      * 过滤正则
      */
-    private static final Pattern REGX = Pattern.compile("[~!/@#$%^&*()-_=+\\\\|[{}];:'\",<.>?]+");
+    private static final Pattern REGX = Pattern.compile("[~!/@#$%^&*()-=+\\\\|[{}];:'\",<.>?]+");
     /**
      * 表数据查询
      */
@@ -115,54 +113,14 @@ public class ConfigBuilder {
         this.connection = dataSourceConfig.getConn();
         this.dataSourceConfig = dataSourceConfig;
         this.dbQuery = (DecoratorDbQuery) dataSourceConfig.getDbQuery();
-        // 全局配置
-        this.globalConfig = Optional.ofNullable(globalConfig).orElseGet(GlobalConfig::new);
-        // 模板配置
-        this.template = Optional.ofNullable(template).orElseGet(TemplateConfig::new);
-        handlerPackage(this.template, this.globalConfig.getOutputDir(), packageConfig == null ? new PackageConfig() : packageConfig);
-        // 策略配置
-        this.strategyConfig = Optional.ofNullable(strategyConfig).orElseGet(StrategyConfig::new);
+        this.globalConfig = globalConfig;
+        this.template = template;
+        this.packageInfo.putAll(packageConfig.initPackageInfo());
+        this.pathInfo.putAll(Optional.ofNullable(packageConfig.getPathInfo()).orElseGet(() -> this.template.initTemplate(this.globalConfig, packageInfo)));
+        this.strategyConfig = strategyConfig;
+        this.strategyConfig.validate();
         this.tableInfoList.addAll(getTablesInfo());
-    }
-
-    /**
-     * 处理包配置
-     *
-     * @param template  TemplateConfig
-     * @param outputDir
-     * @param config    PackageConfig
-     */
-    private void handlerPackage(TemplateConfig template, String outputDir, PackageConfig config) {
-        // 包信息
-        packageInfo = CollectionUtils.newHashMapWithExpectedSize(7);
-        packageInfo.put(ConstVal.MODULE_NAME, config.getModuleName());
-        packageInfo.put(ConstVal.ENTITY, config.joinPackage(config.getEntity()));
-        packageInfo.put(ConstVal.MAPPER, config.joinPackage(config.getMapper()));
-        packageInfo.put(ConstVal.XML, config.joinPackage(config.getXml()));
-        packageInfo.put(ConstVal.SERVICE, config.joinPackage(config.getService()));
-        packageInfo.put(ConstVal.SERVICE_IMPL, config.joinPackage(config.getServiceImpl()));
-        packageInfo.put(ConstVal.CONTROLLER, config.joinPackage(config.getController()));
-
-        // 自定义路径
-        Map<String, String> configPathInfo = config.getPathInfo();
-        if (null != configPathInfo) {
-            pathInfo = configPathInfo;
-        } else {
-            // 生成路径信息
-            pathInfo = CollectionUtils.newHashMapWithExpectedSize(6);
-            setPathInfo(pathInfo, template.getEntity(getGlobalConfig().isKotlin()), outputDir, ConstVal.ENTITY_PATH, ConstVal.ENTITY);
-            setPathInfo(pathInfo, template.getMapper(), outputDir, ConstVal.MAPPER_PATH, ConstVal.MAPPER);
-            setPathInfo(pathInfo, template.getXml(), outputDir, ConstVal.XML_PATH, ConstVal.XML);
-            setPathInfo(pathInfo, template.getService(), outputDir, ConstVal.SERVICE_PATH, ConstVal.SERVICE);
-            setPathInfo(pathInfo, template.getServiceImpl(), outputDir, ConstVal.SERVICE_IMPL_PATH, ConstVal.SERVICE_IMPL);
-            setPathInfo(pathInfo, template.getController(), outputDir, ConstVal.CONTROLLER_PATH, ConstVal.CONTROLLER);
-        }
-    }
-
-    private void setPathInfo(Map<String, String> pathInfo, String template, String outputDir, String path, String module) {
-        if (StringUtils.isNotBlank(template)) {
-            pathInfo.put(path, joinPath(outputDir, packageInfo.get(module)));
-        }
+        processTable();
     }
 
     /**
@@ -242,12 +200,6 @@ public class ConfigBuilder {
     private List<TableInfo> getTablesInfo() {
         boolean isInclude = strategyConfig.getInclude().size() > 0;
         boolean isExclude = strategyConfig.getExclude().size() > 0;
-        if (isInclude && isExclude) {
-            throw new RuntimeException("<strategy> 标签中 <include> 与 <exclude> 只能配置一项！");
-        }
-        if (strategyConfig.getNotLikeTable() != null && strategyConfig.getLikeTable() != null) {
-            throw new RuntimeException("<strategy> 标签中 <likeTable> 与 <notLikeTable> 只能配置一项！");
-        }
         //所有的表信息
         List<TableInfo> tableList = new ArrayList<>();
 
@@ -255,8 +207,6 @@ public class ConfigBuilder {
         List<TableInfo> includeTableList = new ArrayList<>();
         List<TableInfo> excludeTableList = new ArrayList<>();
 
-        //不存在的表名
-        Set<String> notExistTables = new HashSet<>();
         try {
             String tablesSql = dbQuery.tablesSql();
             StringBuilder sql = new StringBuilder(tablesSql);
@@ -291,72 +241,45 @@ public class ConfigBuilder {
                         continue;
                     }
                     tableInfo.setComment(tableComment);
-                    if (isInclude) {
-                        for (String includeTable : strategyConfig.getInclude()) {
-                            // 忽略大小写等于 或 正则 true
-                            if (tableNameMatches(includeTable, tableName)) {
-                                includeTableList.add(tableInfo);
-                            } else {
-                                //过滤正则表名
-                                if (!REGX.matcher(includeTable).find()) {
-                                    notExistTables.add(includeTable);
-                                }
-                            }
-                        }
-                    } else if (isExclude) {
-                        for (String excludeTable : strategyConfig.getExclude()) {
-                            // 忽略大小写等于 或 正则 true
-                            if (tableNameMatches(excludeTable, tableName)) {
-                                excludeTableList.add(tableInfo);
-                            } else {
-                                //过滤正则表名
-                                if (!REGX.matcher(excludeTable).find()) {
-                                    notExistTables.add(excludeTable);
-                                }
-                            }
-                        }
+                    if (isInclude && strategyConfig.matchIncludeTable(tableName)) {
+                        includeTableList.add(tableInfo);
+                    } else if (isExclude && strategyConfig.matchExcludeTable(tableName)) {
+                        excludeTableList.add(tableInfo);
                     }
                     tableList.add(tableInfo);
                 }
             }
-            // 将已经存在的表移除，获取配置中数据库不存在的表
-            for (TableInfo tabInfo : tableList) {
-                notExistTables.remove(tabInfo.getName());
-            }
-            if (notExistTables.size() > 0) {
-                System.err.println("表 " + notExistTables + " 在数据库中不存在！！！");
-            }
-
-            // 需要反向生成的表信息
-            if (isExclude) {
-                tableList.removeAll(excludeTableList);
-                includeTableList = tableList;
-            }
-            if (!isInclude && !isExclude) {
-                includeTableList = tableList;
+            //TODO 我要把这个打印不存在表的功能和正则匹配功能删掉，就算是苗老板来了也拦不住的那种
+            if (isExclude || isInclude) {
+                Set<String> notExistTables = new HashSet<>();
+                notExistTables.addAll(strategyConfig.getExclude());
+                notExistTables.addAll(strategyConfig.getInclude());
+                notExistTables = notExistTables.stream().filter(s -> !REGX.matcher(s).find()).collect(Collectors.toSet());
+                // 将已经存在的表移除，获取配置中数据库不存在的表
+                for (TableInfo tabInfo : tableList) {
+                    if (notExistTables.isEmpty()) {
+                        break;
+                    }
+                    notExistTables.remove(tabInfo.getName());
+                }
+                if (notExistTables.size() > 0) {
+                    System.err.println("表 " + notExistTables + " 在数据库中不存在！！！");
+                }
+                // 需要反向生成的表信息
+                if (isExclude) {
+                    tableList.removeAll(excludeTableList);
+                } else {
+                    tableList = includeTableList;
+                }
             }
             // 性能优化，只处理需执行表字段 github issues/219
-            includeTableList.forEach(this::convertTableFields);
+            tableList.forEach(this::convertTableFields);
         } catch (SQLException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        processTable();
         return tableList;
     }
 
-
-    /**
-     * 表名匹配
-     *
-     * @param setTableName 设置表名
-     * @param dbTableName  数据库表单
-     * @return ignore
-     */
-    private boolean tableNameMatches(String setTableName, String dbTableName) {
-        return setTableName.equalsIgnoreCase(dbTableName)
-            || StringUtils.matches(setTableName, dbTableName);
-    }
-
     /**
      * 将字段信息与表信息关联
      *
@@ -433,7 +356,7 @@ public class ConfigBuilder {
                     field.setColumnType(dataSourceConfig.getTypeConvert().processTypeConvert(globalConfig, field));
                     field.setComment(dbQuery.getFiledComment(results));
                     // 填充逻辑判断
-                    getStrategyConfig().getTableFillList()
+                    strategyConfig.getTableFillList()
                         .stream()
                         //忽略大写字段问题
                         .filter(tf -> tf.getFieldName().equalsIgnoreCase(field.getName()))
@@ -447,32 +370,13 @@ public class ConfigBuilder {
                 }
             }
         } catch (SQLException e) {
-            System.err.println("SQL Exception：" + e.getMessage());
+            throw new RuntimeException(e);
         }
         tableInfo.setFields(fieldList);
         tableInfo.setCommonFields(commonFieldList);
         return tableInfo;
     }
 
-
-    /**
-     * 连接路径字符串
-     *
-     * @param parentDir   路径常量字符串
-     * @param packageName 包名
-     * @return 连接后的路径
-     */
-    private String joinPath(String parentDir, String packageName) {
-        if (StringUtils.isBlank(parentDir)) {
-            parentDir = System.getProperty(ConstVal.JAVA_TMPDIR);
-        }
-        if (!StringUtils.endsWith(parentDir, File.separator)) {
-            parentDir += File.separator;
-        }
-        packageName = packageName.replaceAll("\\.", StringPool.BACK_SLASH + File.separator);
-        return parentDir + packageName;
-    }
-
     /**
      * 格式化数据库注释内容
      *
@@ -482,6 +386,7 @@ public class ConfigBuilder {
      * @since 3.4.0
      * @deprecated 3.4.1
      */
+    @Deprecated
     public String formatComment(String comment) {
         return dbQuery.formatComment(comment);
     }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/StrategyConfigTest.java

@@ -197,6 +197,29 @@ class StrategyConfigTest {
         Assertions.assertEquals("bbbb", strategyConfig.getNameConvert().propertyNameConvert(tableField));
     }
 
+    @Test
+    void matchExcludeTableTest(){
+        StrategyConfig strategyConfig = new StrategyConfig();
+        strategyConfig.setExclude("system", "user_1", "test[a|b]");
+        Assertions.assertTrue(strategyConfig.matchExcludeTable("system"));
+        Assertions.assertFalse(strategyConfig.matchExcludeTable("test_exclude"));
+        Assertions.assertTrue(strategyConfig.matchExcludeTable("testa"));
+        Assertions.assertTrue(strategyConfig.matchExcludeTable("testb"));
+        Assertions.assertFalse(strategyConfig.matchExcludeTable("testc"));
+    }
+
+    @Test
+    void matchIncludeTableTest(){
+        StrategyConfig strategyConfig = new StrategyConfig();
+        strategyConfig.setInclude("system", "user_1", "test[a|b]");
+        Assertions.assertTrue(strategyConfig.matchIncludeTable("system"));
+        Assertions.assertFalse(strategyConfig.matchIncludeTable("test_exclude"));
+        Assertions.assertTrue(strategyConfig.matchIncludeTable("testa"));
+        Assertions.assertTrue(strategyConfig.matchIncludeTable("testb"));
+        Assertions.assertFalse(strategyConfig.matchIncludeTable("testc"));
+    }
+
+
     @Data
     static class SuperBean {