miemie 7 vuotta sitten
vanhempi
commit
5ea7d72ea9

+ 5 - 28
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/InjectionConfig.java

@@ -21,6 +21,9 @@ import java.util.Map;
 import com.baomidou.mybatisplus.generator.config.FileOutConfig;
 import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 /**
  * <p>
  * 抽象的对外接口
@@ -29,6 +32,8 @@ import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
  * @author hubin
  * @since 2016-12-07
  */
+@Data
+@Accessors(chain = true)
 public abstract class InjectionConfig {
 
     /**
@@ -50,32 +55,4 @@ public abstract class InjectionConfig {
      * 注入自定义 Map 对象
      */
     public abstract void initMap();
-
-    public ConfigBuilder getConfig() {
-        return config;
-    }
-
-    public InjectionConfig setConfig(ConfigBuilder config) {
-        this.config = config;
-        return this;
-    }
-
-    public Map<String, Object> getMap() {
-        return map;
-    }
-
-    public InjectionConfig setMap(Map<String, Object> map) {
-        this.map = map;
-        return this;
-    }
-
-    public List<FileOutConfig> getFileOutConfigList() {
-        return fileOutConfigList;
-    }
-
-    public InjectionConfig setFileOutConfigList(List<FileOutConfig> fileOutConfigList) {
-        this.fileOutConfigList = fileOutConfigList;
-        return this;
-    }
-
 }

+ 11 - 4
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java

@@ -21,11 +21,19 @@ import java.sql.SQLException;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.generator.config.converts.*;
-import com.baomidou.mybatisplus.generator.config.querys.*;
+import com.baomidou.mybatisplus.generator.config.converts.DB2TypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.OracleTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.PostgreSqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.SqlServerTypeConvert;
+import com.baomidou.mybatisplus.generator.config.querys.DB2Query;
+import com.baomidou.mybatisplus.generator.config.querys.MariadbQuery;
+import com.baomidou.mybatisplus.generator.config.querys.MySqlQuery;
+import com.baomidou.mybatisplus.generator.config.querys.OracleQuery;
+import com.baomidou.mybatisplus.generator.config.querys.PostgreSqlQuery;
+import com.baomidou.mybatisplus.generator.config.querys.SqlServerQuery;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -37,7 +45,6 @@ import lombok.experimental.Accessors;
  * @since 2016/8/30
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class DataSourceConfig {
 

+ 5 - 10
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/FileOutConfig.java

@@ -17,6 +17,9 @@ package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 
+import lombok.Data;
+import lombok.experimental.Accessors;
+
 /**
  * <p>
  * 输出文件配置
@@ -25,6 +28,8 @@ import com.baomidou.mybatisplus.generator.config.po.TableInfo;
  * @author hubin
  * @since 2017-01-18
  */
+@Data
+@Accessors(chain = true)
 public abstract class FileOutConfig {
 
     /**
@@ -44,14 +49,4 @@ public abstract class FileOutConfig {
      * 输出文件
      */
     public abstract String outputFile(TableInfo tableInfo);
-
-    public String getTemplatePath() {
-        return templatePath;
-    }
-
-    public FileOutConfig setTemplatePath(String templatePath) {
-        this.templatePath = templatePath;
-        return this;
-    }
-
 }

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

@@ -17,8 +17,8 @@ package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
+
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -30,7 +30,6 @@ import lombok.experimental.Accessors;
  * @since 2016-12-02
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class GlobalConfig {