优化简化代码

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine;
 import com.baomidou.mybatisplus.generator.engine.VelocityTemplateEngine;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +33,7 @@ import java.util.List;
  * @author YangHu, tangguo, hubin
  * @since 2016-08-30
  */
+@Getter
 public class AutoGenerator {
 
     private static final Logger logger = LoggerFactory.getLogger(AutoGenerator.class);
@@ -191,31 +193,8 @@ public class AutoGenerator {
         return config.getTableInfoList();
     }
 
-    public ConfigBuilder getConfig() {
-        return config;
-    }
-
     public InjectionConfig getInjectionConfig() {
         return injection;
     }
 
-    public DataSourceConfig getDataSource() {
-        return dataSource;
-    }
-
-    public StrategyConfig getStrategy() {
-        return strategy;
-    }
-
-    public PackageConfig getPackageInfo() {
-        return packageInfo;
-    }
-
-    public TemplateConfig getTemplate() {
-        return template;
-    }
-
-    public GlobalConfig getGlobalConfig() {
-        return globalConfig;
-    }
 }

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

@@ -18,6 +18,7 @@ package com.baomidou.mybatisplus.generator;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -26,7 +27,7 @@ import java.util.Map;
  * @author nieqiurong 2020/11/9.
  * @since 3.5.0
  */
-public interface ITemplate {
+public interface ITemplate extends Serializable {
 
     @NotNull
     Map<String, Object> renderData(@NotNull TableInfo tableInfo);

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

@@ -16,6 +16,8 @@
 package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
+import lombok.Getter;
+import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,21 +43,25 @@ public class GlobalConfig {
     /**
      * 生成文件的输出目录【 windows:D://  linux or mac:/tmp 】
      */
+    @Getter
     private String outputDir = System.getProperty("os.name").toLowerCase().contains("windows") ? "D://" : "/tmp";
 
     /**
      * 是否打开输出目录
      */
+    @Getter
     private boolean open = true;
 
     /**
      * 作者
      */
+    @Getter
     private String author = "baomidou";
 
     /**
      * 开启 Kotlin 模式（默认 false）
      */
+    @Getter
     private boolean kotlin;
 
     /**
@@ -65,6 +71,7 @@ public class GlobalConfig {
     /**
      * 开启 springdoc 模式（默认 false 与 swagger 不可同时使用）
      */
+    @Getter
     private boolean springdoc;
 
     /**
@@ -84,31 +91,13 @@ public class GlobalConfig {
      * 增加此开关的原因：在某些项目实践中，只需要生成service实现类，不需要抽象sevice接口
      * 针对某些项目，生成service接口，开发时反而麻烦，这种情况，可以将该属性设置为false
      */
+    @Getter
+    @Setter
     private boolean serviceInterface = true;
 
-    public String getOutputDir() {
-        return outputDir;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public boolean isKotlin() {
-        return kotlin;
-    }
-
     public boolean isSwagger() {
         // springdoc 设置优先于 swagger
-        return springdoc ? false : swagger;
-    }
-
-    public boolean isSpringdoc() {
-        return springdoc;
+        return !springdoc && swagger;
     }
 
     @NotNull
@@ -121,13 +110,6 @@ public class GlobalConfig {
         return commentDate.get();
     }
 
-    public boolean isServiceInterface() {
-        return serviceInterface;
-    }
-
-    public void setServiceInterface(boolean serviceInterface) {
-        this.serviceInterface = serviceInterface;
-    }
 
     /**
      * 全局配置构建
@@ -193,7 +175,6 @@ public class GlobalConfig {
 
         /**
          * 不生成service接口
-         * @return
          */
         public Builder disableServiceInterface() {
             this.globalConfig.serviceInterface = false;

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

@@ -35,7 +35,6 @@ public interface INameConvert {
      * 执行实体名称转换
      *
      * @param tableInfo 表信息对象
-     * @return
      */
     @NotNull
     String entityNameConvert(@NotNull TableInfo tableInfo);
@@ -44,7 +43,6 @@ public interface INameConvert {
      * 执行属性名称转换
      *
      * @param field 表字段对象，如果属性表字段命名不一致注意 convert 属性的设置
-     * @return
      */
     @NotNull
     String propertyNameConvert(@NotNull TableField field);
@@ -76,11 +74,11 @@ public interface INameConvert {
         private String processName(String name, NamingStrategy strategy, Set<String> prefix, Set<String> suffix) {
             String propertyName = name;
             // 删除前缀
-            if (prefix.size() > 0) {
+            if (!prefix.isEmpty()) {
                 propertyName = NamingStrategy.removePrefix(propertyName, prefix);
             }
             // 删除后缀
-            if (suffix.size() > 0) {
+            if (!suffix.isEmpty()) {
                 propertyName = NamingStrategy.removeSuffix(propertyName, suffix);
             }
             if (StringUtils.isBlank(propertyName)) {

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

@@ -30,7 +30,7 @@ public interface IOutputFile {
      *
      * @param filePath   默认文件路径
      * @param outputFile 输出文件类型
-     * @return
+     * @return {@link File}
      */
     File createFile(String filePath, OutputFile outputFile);
 }

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

@@ -17,6 +17,7 @@ package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -42,41 +43,49 @@ public class PackageConfig {
     /**
      * 父包模块名
      */
+    @Getter
     private String moduleName = "";
 
     /**
      * Entity包名
      */
+    @Getter
     private String entity = "entity";
 
     /**
      * Service包名
      */
+    @Getter
     private String service = "service";
 
     /**
      * Service Impl包名
      */
+    @Getter
     private String serviceImpl = "service.impl";
 
     /**
      * Mapper包名
      */
+    @Getter
     private String mapper = "mapper";
 
     /**
      * Mapper XML包名
      */
+    @Getter
     private String xml = "mapper.xml";
 
     /**
      * Controller包名
      */
+    @Getter
     private String controller = "controller";
 
     /**
      * 路径配置信息
      */
+    @Getter
     private Map<OutputFile, String> pathInfo;
 
     /**
@@ -141,38 +150,6 @@ public class PackageConfig {
         return getPackageInfo().get(module);
     }
 
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    public String getEntity() {
-        return entity;
-    }
-
-    public String getService() {
-        return service;
-    }
-
-    public String getServiceImpl() {
-        return serviceImpl;
-    }
-
-    public String getMapper() {
-        return mapper;
-    }
-
-    public String getXml() {
-        return xml;
-    }
-
-    public String getController() {
-        return controller;
-    }
-
-    public Map<OutputFile, String> getPathInfo() {
-        return pathInfo;
-    }
-
     /**
      * 构建者
      *

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

@@ -18,6 +18,7 @@ package com.baomidou.mybatisplus.generator.config;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.config.builder.*;
 import com.baomidou.mybatisplus.generator.config.po.LikeTable;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -46,6 +47,7 @@ public class StrategyConfig {
     /**
      * 是否跳过视图（默认 false）
      */
+    @Getter
     private boolean skipView;
 
     /**
@@ -93,11 +95,13 @@ public class StrategyConfig {
      *
      * @since 3.3.1
      */
+    @Getter
     private boolean enableSqlFilter = true;
 
     /**
      * 启用 schema 默认 false
      */
+    @Getter
     private boolean enableSchema;
 
     /**
@@ -257,8 +261,8 @@ public class StrategyConfig {
      * @since 3.5.0
      */
     public void validate() {
-        boolean isInclude = this.getInclude().size() > 0;
-        boolean isExclude = this.getExclude().size() > 0;
+        boolean isInclude = !this.getInclude().isEmpty();
+        boolean isExclude = !this.getExclude().isEmpty();
         if (isInclude && isExclude) {
             throw new IllegalArgumentException("<strategy> 标签中 <include> 与 <exclude> 只能配置一项！");
         }
@@ -316,10 +320,6 @@ public class StrategyConfig {
         return isCapitalMode;
     }
 
-    public boolean isSkipView() {
-        return skipView;
-    }
-
     @NotNull
     public Set<String> getTablePrefix() {
         return tablePrefix;
@@ -350,14 +350,6 @@ public class StrategyConfig {
         return exclude;
     }
 
-    public boolean isEnableSqlFilter() {
-        return enableSqlFilter;
-    }
-
-    public boolean isEnableSchema() {
-        return enableSchema;
-    }
-
     @Nullable
     public LikeTable getLikeTable() {
         return likeTable;

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

@@ -16,6 +16,7 @@
 package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,26 +44,31 @@ public class TemplateConfig {
     /**
      * 设置控制器模板路径
      */
+    @Getter
     private String controller;
 
     /**
      * 设置Mapper模板路径
      */
+    @Getter
     private String mapper;
 
     /**
      * 设置MapperXml模板路径
      */
+    @Getter
     private String xml;
 
     /**
      * 设置Service模板路径
      */
+    @Getter
     private String service;
 
     /**
      * 设置ServiceImpl模板路径
      */
+    @Getter
     private String serviceImpl;
 
     /**
@@ -119,7 +125,7 @@ public class TemplateConfig {
      * @since 3.3.2
      */
     public TemplateConfig disable(@NotNull TemplateType... templateTypes) {
-        if (templateTypes != null && templateTypes.length > 0) {
+        if (templateTypes != null) {
             for (TemplateType templateType : templateTypes) {
                 switch (templateType) {
                     case ENTITY:
@@ -160,26 +166,6 @@ public class TemplateConfig {
         return disable(TemplateType.values());
     }
 
-    public String getService() {
-        return service;
-    }
-
-    public String getServiceImpl() {
-        return serviceImpl;
-    }
-
-    public String getMapper() {
-        return mapper;
-    }
-
-    public String getXml() {
-        return xml;
-    }
-
-    public String getController() {
-        return controller;
-    }
-
     /**
      * 模板路径配置构建者
      *

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.function.ConverterFileName;
 import com.baomidou.mybatisplus.generator.util.ClassUtils;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -49,6 +50,7 @@ public class Controller implements ITemplate {
      *      <code>@Controller</code> -> <code>@RestController</code>
      * </pre>
      */
+    @Getter
     private boolean restStyle;
 
     /**
@@ -57,6 +59,7 @@ public class Controller implements ITemplate {
      *      <code>@RequestMapping("/managerUserActionHistory")</code> -> <code>@RequestMapping("/manager-user-action-history")</code>
      * </pre>
      */
+    @Getter
     private boolean hyphenStyle;
 
     /**
@@ -76,16 +79,9 @@ public class Controller implements ITemplate {
      *
      * @since 3.5.2
      */
+    @Getter
     private boolean fileOverride;
 
-    public boolean isRestStyle() {
-        return restStyle;
-    }
-
-    public boolean isHyphenStyle() {
-        return hyphenStyle;
-    }
-
     @Nullable
     public String getSuperClass() {
         return superClass;
@@ -96,10 +92,6 @@ public class Controller implements ITemplate {
         return converterFileName;
     }
 
-    public boolean isFileOverride() {
-        return fileOverride;
-    }
-
     @Override
     @NotNull
     public Map<String, Object> renderData(@NotNull TableInfo tableInfo) {

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

@@ -17,6 +17,7 @@ package com.baomidou.mybatisplus.generator.config.builder;
 
 import com.baomidou.mybatisplus.generator.config.IConfigBuilder;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import lombok.Getter;
 
 import java.util.function.Function;
 
@@ -26,6 +27,7 @@ import java.util.function.Function;
  * @author xusimin
  * @since 3.5.3
  */
+@Getter
 public class CustomFile {
 
     /**
@@ -58,30 +60,6 @@ public class CustomFile {
      */
     private boolean fileOverride;
 
-    public boolean isFileOverride() {
-        return fileOverride;
-    }
-
-    public Function<TableInfo, String> getFormatNameFunction() {
-        return formatNameFunction;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public String getTemplatePath() {
-        return templatePath;
-    }
-
-    public String getPackageName() {
-        return packageName;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
     /**
      * 构建者
      */

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

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.function.ConverterFileName;
 import com.baomidou.mybatisplus.generator.util.ClassUtils;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -73,6 +74,7 @@ public class Entity implements ITemplate {
     /**
      * 自定义基础的Entity类，公共字段
      */
+    @Getter
     private final Set<String> superEntityColumns = new HashSet<>();
 
     /**
@@ -84,6 +86,7 @@ public class Entity implements ITemplate {
     /**
      * 实体是否生成 serialVersionUID
      */
+    @Getter
     private boolean serialVersionUID = true;
 
     /**
@@ -91,6 +94,7 @@ public class Entity implements ITemplate {
      * -----------------------------------<br>
      * public static final String ID = "test_id";
      */
+    @Getter
     private boolean columnConstant;
 
     /**
@@ -98,23 +102,27 @@ public class Entity implements ITemplate {
      *
      * @since 3.3.2
      */
+    @Getter
     private boolean chain;
 
     /**
      * 【实体】是否为lombok模型（默认 false）<br>
      * <a href="https://projectlombok.org/">document</a>
      */
+    @Getter
     private boolean lombok;
 
     /**
      * Boolean类型字段是否移除is前缀（默认 false）<br>
      * 比如 : 数据库字段名称 : 'is_xxx',类型为 : tinyint. 在映射实体的时候则会去掉is,在实体类中映射最终结果为 xxx
      */
+    @Getter
     private boolean booleanColumnRemoveIsPrefix;
 
     /**
      * 是否生成实体时，生成字段注解（默认 false）
      */
+    @Getter
     private boolean tableFieldAnnotationEnable;
 
     /**
@@ -166,6 +174,7 @@ public class Entity implements ITemplate {
      *
      * @since 3.5.0
      */
+    @Getter
     private boolean activeRecord;
 
     /**
@@ -187,6 +196,7 @@ public class Entity implements ITemplate {
      *
      * @since 3.5.2
      */
+    @Getter
     private boolean fileOverride;
 
     /**
@@ -253,34 +263,6 @@ public class Entity implements ITemplate {
         return superClass;
     }
 
-    public Set<String> getSuperEntityColumns() {
-        return this.superEntityColumns;
-    }
-
-    public boolean isSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public boolean isColumnConstant() {
-        return columnConstant;
-    }
-
-    public boolean isChain() {
-        return chain;
-    }
-
-    public boolean isLombok() {
-        return lombok;
-    }
-
-    public boolean isBooleanColumnRemoveIsPrefix() {
-        return booleanColumnRemoveIsPrefix;
-    }
-
-    public boolean isTableFieldAnnotationEnable() {
-        return tableFieldAnnotationEnable;
-    }
-
     @Nullable
     public String getVersionColumnName() {
         return versionColumnName;
@@ -311,10 +293,6 @@ public class Entity implements ITemplate {
         return naming;
     }
 
-    public boolean isActiveRecord() {
-        return activeRecord;
-    }
-
     @Nullable
     public IdType getIdType() {
         return idType;
@@ -325,10 +303,6 @@ public class Entity implements ITemplate {
         return converterFileName;
     }
 
-    public boolean isFileOverride() {
-        return fileOverride;
-    }
-
     @Override
     @NotNull
     public Map<String, Object> renderData(@NotNull TableInfo tableInfo) {

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.function.ConverterFileName;
 import com.baomidou.mybatisplus.generator.util.ClassUtils;
+import lombok.Getter;
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.cache.decorators.LoggingCache;
 import org.jetbrains.annotations.NotNull;
@@ -71,6 +72,7 @@ public class Mapper implements ITemplate {
      *
      * @since 3.5.0
      */
+    @Getter
     private boolean baseResultMap;
 
     /**
@@ -78,6 +80,7 @@ public class Mapper implements ITemplate {
      *
      * @since 3.5.0
      */
+    @Getter
     private boolean baseColumnList;
 
     /**
@@ -85,6 +88,7 @@ public class Mapper implements ITemplate {
      *
      * @since 3.5.0
      */
+    @Getter
     private ConverterFileName converterMapperFileName = (entityName -> entityName + ConstVal.MAPPER);
 
     /**
@@ -92,6 +96,7 @@ public class Mapper implements ITemplate {
      *
      * @since 3.5.0
      */
+    @Getter
     private ConverterFileName converterXmlFileName = (entityName -> entityName + ConstVal.MAPPER);
 
     /**
@@ -99,6 +104,7 @@ public class Mapper implements ITemplate {
      *
      * @since 3.5.2
      */
+    @Getter
     private boolean fileOverride;
 
     /**
@@ -118,30 +124,10 @@ public class Mapper implements ITemplate {
         return mapperAnnotationClass != null;
     }
 
-    public boolean isBaseResultMap() {
-        return baseResultMap;
-    }
-
-    public boolean isBaseColumnList() {
-        return baseColumnList;
-    }
-
-    public ConverterFileName getConverterMapperFileName() {
-        return converterMapperFileName;
-    }
-
-    public ConverterFileName getConverterXmlFileName() {
-        return converterXmlFileName;
-    }
-
     public Class<? extends Cache> getCache() {
         return this.cache == null ? LoggingCache.class : this.cache;
     }
 
-    public boolean isFileOverride() {
-        return fileOverride;
-    }
-
     @Override
     @NotNull
     public Map<String, Object> renderData(@NotNull TableInfo tableInfo) {

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

@@ -19,6 +19,7 @@ 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.config.*;
+import lombok.Getter;
 
 import java.io.File;
 import java.util.HashMap;
@@ -36,6 +37,7 @@ class PathInfoHandler {
     /**
      * 输出文件Map
      */
+    @Getter
     private final Map<OutputFile, String> pathInfo = new HashMap<>();
 
     /**
@@ -76,10 +78,6 @@ class PathInfoHandler {
         putPathInfo(OutputFile.parent, ConstVal.PARENT);
     }
 
-    public Map<OutputFile, String> getPathInfo() {
-        return this.pathInfo;
-    }
-
     private void putPathInfo(String template, OutputFile outputFile, String module) {
         if (StringUtils.isNotBlank(template)) {
             putPathInfo(outputFile, module);

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.function.ConverterFileName;
 import com.baomidou.mybatisplus.generator.util.ClassUtils;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,6 +81,7 @@ public class Service implements ITemplate {
      *
      * @since 3.5.2
      */
+    @Getter
     private boolean fileOverride;
 
     @NotNull
@@ -92,10 +94,6 @@ public class Service implements ITemplate {
         return converterServiceImplFileName;
     }
 
-    public boolean isFileOverride() {
-        return fileOverride;
-    }
-
     @Override
     @NotNull
     public Map<String, Object> renderData(@NotNull TableInfo tableInfo) {

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/converts/select/Selector.java

@@ -15,6 +15,8 @@
  */
 package com.baomidou.mybatisplus.generator.config.converts.select;
 
+import lombok.Getter;
+
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -29,6 +31,10 @@ import java.util.function.Supplier;
  * Created at 2020/6/11 16:55
  */
 public class Selector<P, T> {
+    /**
+     *  当前选择器是否已经选择分支，如果已经存在分支被击中，则返回 true；否则返回 false
+     */
+    @Getter
     private boolean selected = false;
     private Function<P, T> factory;
 
@@ -93,15 +99,6 @@ public class Selector<P, T> {
         return or(() -> t);
     }
 
-    /**
-     * 当前选择器是否已经选择分支
-     *
-     * @return 如果已经存在分支被击中，则返回 true；否则返回 false
-     */
-    public boolean isSelected() {
-        return selected;
-    }
-
     @Override
     public String toString() {
         return String.format("Selector{success=%s}", selected);

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

@@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
  * 表名拼接
  *
  * @author nieqiuqiu
- * @date 2019-11-26
  * @since 3.3.0
  */
 public class LikeTable {

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import com.baomidou.mybatisplus.generator.config.builder.Entity;
 import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Serializable;
@@ -56,46 +57,55 @@ public class TableInfo {
     /**
      * 是否转换
      */
+    @Getter
     private boolean convert;
 
     /**
      * 表名称
      */
+    @Getter
     private String name;
 
     /**
      * 表注释
      */
+    @Getter
     private String comment;
 
     /**
      * 实体名称
      */
+    @Getter
     private String entityName;
 
     /**
      * mapper名称
      */
+    @Getter
     private String mapperName;
 
     /**
      * xml名称
      */
+    @Getter
     private String xmlName;
 
     /**
      * service名称
      */
+    @Getter
     private String serviceName;
 
     /**
      * serviceImpl名称
      */
+    @Getter
     private String serviceImplName;
 
     /**
      * controller名称
      */
+    @Getter
     private String controllerName;
 
     /**
@@ -106,6 +116,7 @@ public class TableInfo {
     /**
      * 是否有主键
      */
+    @Getter
     private boolean havePrimaryKey;
 
     /**
@@ -300,56 +311,16 @@ public class TableInfo {
         return importPackages;
     }
 
-    public boolean isConvert() {
-        return convert;
-    }
-
     public TableInfo setConvert(boolean convert) {
         this.convert = convert;
         return this;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public String getComment() {
-        return comment;
-    }
-
-    public String getEntityName() {
-        return entityName;
-    }
-
-    public String getMapperName() {
-        return mapperName;
-    }
-
-    public String getXmlName() {
-        return xmlName;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public String getServiceImplName() {
-        return serviceImplName;
-    }
-
-    public String getControllerName() {
-        return controllerName;
-    }
-
     @NotNull
     public List<TableField> getFields() {
         return fields;
     }
 
-    public boolean isHavePrimaryKey() {
-        return havePrimaryKey;
-    }
-
     @NotNull
     public List<TableField> getCommonFields() {
         return commonFields;
@@ -357,7 +328,6 @@ public class TableInfo {
 
     /**
      * 获取是否生成service接口
-     * @return
      */
     public boolean isServiceInterface() {
         return globalConfig.isServiceInterface();

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

@@ -271,7 +271,6 @@ public abstract class AbstractTemplateEngine {
      * @throws Exception 异常
      * @since 3.5.0
      */
-    @NotNull
     public abstract void writer(@NotNull Map<String, Object> objectMap, @NotNull String templatePath, @NotNull File outputFile) throws Exception;
 
     /**

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

@@ -17,6 +17,8 @@ package com.baomidou.mybatisplus.generator.jdbc;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.ibatis.type.JdbcType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +39,7 @@ public class DatabaseMetaDataWrapper {
 
     private static final Logger logger = LoggerFactory.getLogger(DatabaseMetaDataWrapper.class);
 
+    @Getter
     private final Connection connection;
 
     private final DatabaseMetaData databaseMetaData;
@@ -61,10 +64,6 @@ public class DatabaseMetaDataWrapper {
         }
     }
 
-    public Connection getConnection() {
-        return connection;
-    }
-
     public void closeConnection() {
         Optional.ofNullable(connection).ifPresent((con) -> {
             try {
@@ -170,6 +169,7 @@ public class DatabaseMetaDataWrapper {
         return table;
     }
 
+    @Getter
     public static class Table {
 
         private String name;
@@ -178,24 +178,13 @@ public class DatabaseMetaDataWrapper {
 
         private String tableType;
 
-        public String getRemarks() {
-            return remarks;
-        }
-
-        public String getTableType() {
-            return tableType;
-        }
-
-        public String getName() {
-            return name;
-        }
-
         public boolean isView() {
             return "VIEW".equals(tableType);
         }
 
     }
 
+    @Getter
     public static class Column {
 
         private boolean primaryKey;
@@ -216,50 +205,8 @@ public class DatabaseMetaDataWrapper {
 
         private JdbcType jdbcType;
 
+        @Setter
         private String typeName;
 
-        public String getName() {
-            return name;
-        }
-
-        public int getLength() {
-            return length;
-        }
-
-        public boolean isNullable() {
-            return nullable;
-        }
-
-        public String getRemarks() {
-            return remarks;
-        }
-
-        public String getDefaultValue() {
-            return defaultValue;
-        }
-
-        public int getScale() {
-            return scale;
-        }
-
-        public JdbcType getJdbcType() {
-            return jdbcType;
-        }
-
-        public boolean isPrimaryKey() {
-            return primaryKey;
-        }
-
-        public boolean isAutoIncrement() {
-            return autoIncrement;
-        }
-
-        public String getTypeName() {
-            return typeName;
-        }
-
-        public void setTypeName(String typeName) {
-            this.typeName = typeName;
-        }
     }
 }

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

@@ -20,8 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 /**
- * h2数据库关键字处理
- * http://www.h2database.com/html/advanced.html#keywords
+ * <a href="http://www.h2database.com/html/advanced.html#keywords">h2数据库关键字处理</a>
  *
  * @author nieqiurong 2020/5/7.
  * @since 3.3.2

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

@@ -21,7 +21,7 @@ import java.util.*;
 
 /**
  * mysql关键字处理
- * 这里选取了mysql8.0文档中的关键字和保留字（含移除）https://dev.mysql.com/doc/refman/8.0/en/keywords.html
+ * <a href="https://dev.mysql.com/doc/refman/8.0/en/keywords.html">这里选取了mysql8.0文档中的关键字和保留字（含移除）</a>
  *
  * @author nieqiurong 2020/5/7.
  * @since 3.3.2

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

@@ -20,8 +20,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 /**
- * postgresql关键字处理
- * https://www.postgresql.org/docs/11/sql-keywords-appendix.html
+ * <a href="https://www.postgresql.org/docs/11/sql-keywords-appendix.html">postgresql关键字处理</a>
  *
  * @author nieqiurong 2020/5/9.
  * @since 3.3.2

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

@@ -67,8 +67,8 @@ public abstract class AbstractDatabaseQuery implements IDatabaseQuery {
     }
 
     protected void filter(List<TableInfo> tableList, List<TableInfo> includeTableList, List<TableInfo> excludeTableList) {
-        boolean isInclude = strategyConfig.getInclude().size() > 0;
-        boolean isExclude = strategyConfig.getExclude().size() > 0;
+        boolean isInclude = !strategyConfig.getInclude().isEmpty();
+        boolean isExclude = !strategyConfig.getExclude().isEmpty();
         if (isExclude || isInclude) {
             Map<String, String> notExistTables = new HashSet<>(isExclude ? strategyConfig.getExclude() : strategyConfig.getInclude())
                 .stream()
@@ -82,7 +82,7 @@ public abstract class AbstractDatabaseQuery implements IDatabaseQuery {
                 //解决可能大小写不敏感的情况导致无法移除掉
                 notExistTables.remove(tabInfo.getName().toLowerCase());
             }
-            if (notExistTables.size() > 0) {
+            if (!notExistTables.isEmpty()) {
                 LOGGER.warn("表[{}]在数据库中不存在！！！", String.join(StringPool.COMMA, notExistTables.values()));
             }
             // 需要反向生成的表信息

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

@@ -60,8 +60,8 @@ public class DefaultQuery extends AbstractDatabaseQuery {
     @Override
     public @NotNull List<TableInfo> queryTables() {
         try {
-            boolean isInclude = strategyConfig.getInclude().size() > 0;
-            boolean isExclude = strategyConfig.getExclude().size() > 0;
+            boolean isInclude = !strategyConfig.getInclude().isEmpty();
+            boolean isExclude = !strategyConfig.getExclude().isEmpty();
             //所有的表信息
             List<TableInfo> tableList = new ArrayList<>();
             List<DatabaseMetaDataWrapper.Table> tables = this.getTables();

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

@@ -54,8 +54,8 @@ public class SQLQuery extends AbstractDatabaseQuery {
     @NotNull
     @Override
     public List<TableInfo> queryTables() {
-        boolean isInclude = strategyConfig.getInclude().size() > 0;
-        boolean isExclude = strategyConfig.getExclude().size() > 0;
+        boolean isInclude = !strategyConfig.getInclude().isEmpty();
+        boolean isExclude = !strategyConfig.getExclude().isEmpty();
         //所有的表信息
         List<TableInfo> tableList = new ArrayList<>();
 

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

@@ -19,9 +19,9 @@ import java.io.File;
 import java.io.IOException;
 
 /**
+ * 文件处理工具类 {@link FileUtils}
  *
  * @since 3.5.0
- * @see org.apache.commons.io.FileUtils
  */
 public class FileUtils {
 

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

@@ -36,7 +36,6 @@ public class RuntimeUtils {
      * 打开指定输出文件目录
      *
      * @param outDir 输出文件目录
-     * @throws IOException
      */
     public static void openDir(String outDir) throws IOException {
         File file = new File(outDir);