ソースを参照

:art: 调整部分 javadoc 的格式;清理一些警告

Cat73 6 年 前
コミット
2d78311db5
45 ファイル変更52 行追加185 行削除
  1. 0 4
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/DbType.java
  2. 4 5
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/EnumValue.java
  3. 0 2
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldFill.java
  4. 2 4
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java
  5. 1 3
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/IdType.java
  6. 1 7
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/KeySequence.java
  7. 0 2
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlCondition.java
  8. 1 7
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlParser.java
  9. 10 42
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableField.java
  10. 0 6
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableId.java
  11. 0 6
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableLogic.java
  12. 0 6
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableName.java
  13. 1 5
      mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/Version.java
  14. 10 9
      mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java
  15. 1 1
      mybatis-plus-boot-starter/src/main/resources/META-INF/spring.factories
  16. 0 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/SampleTest.java
  17. 1 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/GenerateCode4H2Database.java
  18. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2Delete1Eq1Test.java
  19. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandler.java
  20. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java
  21. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java
  22. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java
  23. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/SqlRunnerTest.java
  24. 3 5
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/DBConfig.java
  25. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java
  26. 1 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuSuperEntity.java
  27. 1 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuSuperEntityCamel.java
  28. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntity.java
  29. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntityCamel.java
  30. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/AgeEnum.java
  31. 1 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/GenderEnum.java
  32. 1 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/GradeEnum.java
  33. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java
  34. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/SuperMapper.java
  35. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2Addr.java
  36. 7 10
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java
  37. 4 6
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserService.java
  38. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserServiceImpl.java
  39. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlMetaObjectHandler.java
  40. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java
  41. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/config/MybatisPlusConfig.java
  42. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresMetaObjectHandler.java
  43. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java
  44. 0 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/config/MybatisPlusConfig.java
  45. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/reflection/ExampleObjectFactory.java

+ 0 - 4
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/DbType.java

@@ -18,9 +18,7 @@ package com.baomidou.mybatisplus.annotation;
 import lombok.Getter;
 import lombok.Getter;
 
 
 /**
 /**
- * <p>
  * MybatisPlus 数据库类型
  * MybatisPlus 数据库类型
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-23
  * @since 2018-06-23
@@ -97,9 +95,7 @@ public enum DbType {
     }
     }
 
 
     /**
     /**
-     * <p>
      * 获取数据库类型(默认 MySql)
      * 获取数据库类型(默认 MySql)
-     * </p>
      *
      *
      * @param dbType 数据库类型字符串
      * @param dbType 数据库类型字符串
      */
      */

+ 4 - 5
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/EnumValue.java

@@ -22,13 +22,11 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
- * 支持普通枚举类字段, 只用在enum类的字段上<br>
- * 当实体类的属性是普通枚举,且是其中一个字段,使用该注解来标注枚举类里的那个属性对应字段<br>
- * </p>
+ * 支持普通枚举类字段, 只用在enum类的字段上
+ * <p>当实体类的属性是普通枚举,且是其中一个字段,使用该注解来标注枚举类里的那个属性对应字段</p>
  * <p>
  * <p>
  * 使用方式参考 com.baomidou.mybatisplus.test.h2.H2StudentMapperTest
  * 使用方式参考 com.baomidou.mybatisplus.test.h2.H2StudentMapperTest
- *
+ * <pre>
  * &#64;TableName("student")
  * &#64;TableName("student")
  * class Student {
  * class Student {
  *     private Integer id;
  *     private Integer id;
@@ -45,6 +43,7 @@ import java.lang.annotation.Target;
  *     private final int code;
  *     private final int code;
  *     private final String descp;
  *     private final String descp;
  * }
  * }
+ * </pre>
  * </p>
  * </p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin

+ 0 - 2
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldFill.java

@@ -16,9 +16,7 @@
 package com.baomidou.mybatisplus.annotation;
 package com.baomidou.mybatisplus.annotation;
 
 
 /**
 /**
- * <p>
  * 字段填充策略枚举类
  * 字段填充策略枚举类
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-06-27
  * @since 2017-06-27

+ 2 - 4
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java

@@ -16,9 +16,7 @@
 package com.baomidou.mybatisplus.annotation;
 package com.baomidou.mybatisplus.annotation;
 
 
 /**
 /**
- * <p>
  * 字段策略枚举类
  * 字段策略枚举类
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2016-09-09
  * @since 2016-09-09
@@ -38,8 +36,8 @@ public enum FieldStrategy {
     NOT_EMPTY,
     NOT_EMPTY,
     /**
     /**
      * 默认的,一般只用于注解里
      * 默认的,一般只用于注解里
-     * 1. 在全局里代表 NOT_NULL
-     * 2. 在注解里代表 跟随全局
+     * <p>1. 在全局里代表 NOT_NULL</p>
+     * <p>2. 在注解里代表 跟随全局</p>
      */
      */
     DEFAULT
     DEFAULT
 }
 }

+ 1 - 3
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/IdType.java

@@ -18,9 +18,7 @@ package com.baomidou.mybatisplus.annotation;
 import lombok.Getter;
 import lombok.Getter;
 
 
 /**
 /**
- * <p>
  * 生成ID类型枚举类
  * 生成ID类型枚举类
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2015-11-10
  * @since 2015-11-10
@@ -37,7 +35,7 @@ public enum IdType {
     NONE(1),
     NONE(1),
     /**
     /**
      * 用户输入ID
      * 用户输入ID
-     * 该类型可以通过自己注册自动填充插件进行填充
+     * <p>该类型可以通过自己注册自动填充插件进行填充</p>
      */
      */
     INPUT(2),
     INPUT(2),
 
 

+ 1 - 7
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/KeySequence.java

@@ -23,10 +23,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 序列主键策略
  * 序列主键策略
- * oracle
- * </p>
+ * <p>oracle</p>
  *
  *
  * @author zashitou
  * @author zashitou
  * @since 2017.4.20
  * @since 2017.4.20
@@ -38,16 +36,12 @@ import java.lang.annotation.Target;
 public @interface KeySequence {
 public @interface KeySequence {
 
 
     /**
     /**
-     * <p>
      * 序列名
      * 序列名
-     * </p>
      */
      */
     String value() default "";
     String value() default "";
 
 
     /**
     /**
-     * <p>
      * id的类型
      * id的类型
-     * </p>
      */
      */
     Class clazz() default Long.class;
     Class clazz() default Long.class;
 
 

+ 0 - 2
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlCondition.java

@@ -16,9 +16,7 @@
 package com.baomidou.mybatisplus.annotation;
 package com.baomidou.mybatisplus.annotation;
 
 
 /**
 /**
- * <p>
  * SQL 比较条件常量定义类
  * SQL 比较条件常量定义类
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-01-05
  * @since 2018-01-05

+ 1 - 7
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/SqlParser.java

@@ -23,12 +23,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 租户注解
  * 租户注解
- * </p>
- * <p>
- * 目前只支持注解在 mapper 的方法上
- * </p>
+ * <p>目前只支持注解在 mapper 的方法上</p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-01-13
  * @since 2018-01-13
@@ -39,9 +35,7 @@ import java.lang.annotation.Target;
 public @interface SqlParser {
 public @interface SqlParser {
 
 
     /**
     /**
-     * <p>
      * 过滤 SQL 解析,默认 false
      * 过滤 SQL 解析,默认 false
-     * </p>
      */
      */
     boolean filter() default false;
     boolean filter() default false;
 }
 }

+ 10 - 42
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableField.java

@@ -19,9 +19,7 @@ import java.lang.annotation.*;
 
 
 
 
 /**
 /**
- * <p>
  * 表字段标识
  * 表字段标识
- * </p>
  *
  *
  * @author hubin sjy tantan
  * @author hubin sjy tantan
  * @since 2016-09-09
  * @since 2016-09-09
@@ -32,82 +30,52 @@ import java.lang.annotation.*;
 public @interface TableField {
 public @interface TableField {
 
 
     /**
     /**
-     * <p>
      * 字段值(驼峰命名方式,该值可无)
      * 字段值(驼峰命名方式,该值可无)
-     * </p>
      */
      */
     String value() default "";
     String value() default "";
 
 
     /**
     /**
-     * <p>
      * 当该Field为类对象时, 可使用#{对象.属性}来映射到数据表.
      * 当该Field为类对象时, 可使用#{对象.属性}来映射到数据表.
-     * </p>
-     * <p>
-     * 支持:@TableField(el = "role, jdbcType=BIGINT)<br>
-     * 支持:@TableField(el = "role, typeHandler=com.baomidou.springcloud.typehandler.PhoneTypeHandler")
-     * </p>
+     * <p>支持:@TableField(el = "role, jdbcType=BIGINT)</p>
+     * <p>支持:@TableField(el = "role, typeHandler=com.baomidou.springcloud.typehandler.PhoneTypeHandler")</p>
      */
      */
     String el() default "";
     String el() default "";
 
 
     /**
     /**
-     * <p>
      * 是否为数据库表字段
      * 是否为数据库表字段
-     * </p>
-     * <p>
-     * 默认 true 存在,false 不存在
-     * </p>
+     * <p>默认 true 存在,false 不存在</p>
      */
      */
     boolean exist() default true;
     boolean exist() default true;
 
 
     /**
     /**
-     * <p>
      * 字段 where 实体查询比较条件
      * 字段 where 实体查询比较条件
-     * </p>
-     * <p>
-     * 默认 `=` 等值
-     * </p>
+     * <p>默认 `=` 等值</p>
      */
      */
     String condition() default "";
     String condition() default "";
 
 
     /**
     /**
-     * <p>
      * 字段 update set 部分注入, 该注解优于 el 注解使用
      * 字段 update set 部分注入, 该注解优于 el 注解使用
-     * </p>
-     * <p>
-     * 例如:@TableField(.. , update="%s+1") 其中 %s 会填充为字段
-     * 输出 SQL 为:update 表 set 字段=字段+1 where ...
-     * </p>
-     * <p>
-     * 例如:@TableField(.. , update="now()") 使用数据库时间
-     * 输出 SQL 为:update 表 set 字段=now() where ...
-     * </p>
+     * <p>例如:@TableField(.. , update="%s+1") 其中 %s 会填充为字段</p>
+     * <p>输出 SQL 为:update 表 set 字段=字段+1 where ...</p>
+     * <p>例如:@TableField(.. , update="now()") 使用数据库时间</p>
+     * <p>输出 SQL 为:update 表 set 字段=now() where ...</p>
      */
      */
     String update() default "";
     String update() default "";
 
 
     /**
     /**
-     * <p>
      * 字段验证策略
      * 字段验证策略
-     * </p>
-     * <p>
-     * 默认追随全局配置
-     * </p>
+     * <p>默认追随全局配置</p>
      */
      */
     FieldStrategy strategy() default FieldStrategy.DEFAULT;
     FieldStrategy strategy() default FieldStrategy.DEFAULT;
 
 
     /**
     /**
-     * <p>
      * 字段自动填充策略
      * 字段自动填充策略
-     * </p>
      */
      */
     FieldFill fill() default FieldFill.DEFAULT;
     FieldFill fill() default FieldFill.DEFAULT;
 
 
     /**
     /**
-     * <p>
      * 是否进行 select 查询
      * 是否进行 select 查询
-     * </p>
-     * <p>
-     * 大字段可设置为 false 不加入 select 查询范围
-     * </p>
+     * <p>大字段可设置为 false 不加入 select 查询范围</p>
      */
      */
     boolean select() default true;
     boolean select() default true;
 
 

+ 0 - 6
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableId.java

@@ -22,9 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 表主键标识
  * 表主键标识
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2016-01-23
  * @since 2016-01-23
@@ -35,16 +33,12 @@ import java.lang.annotation.Target;
 public @interface TableId {
 public @interface TableId {
 
 
     /**
     /**
-     * <p>
      * 字段值(驼峰命名方式,该值可无)
      * 字段值(驼峰命名方式,该值可无)
-     * </p>
      */
      */
     String value() default "";
     String value() default "";
 
 
     /**
     /**
-     * <p>
      * 主键ID
      * 主键ID
-     * </p>
      * {@link IdType}
      * {@link IdType}
      */
      */
     IdType type() default IdType.NONE;
     IdType type() default IdType.NONE;

+ 0 - 6
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableLogic.java

@@ -22,9 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 表字段逻辑处理注解(逻辑删除)
  * 表字段逻辑处理注解(逻辑删除)
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-09-09
  * @since 2017-09-09
@@ -35,16 +33,12 @@ import java.lang.annotation.Target;
 public @interface TableLogic {
 public @interface TableLogic {
 
 
     /**
     /**
-     * <p>
      * 默认逻辑未删除值(该值可无、会自动获取全局配置)
      * 默认逻辑未删除值(该值可无、会自动获取全局配置)
-     * </p>
      */
      */
     String value() default "";
     String value() default "";
 
 
     /**
     /**
-     * <p>
      * 默认逻辑删除值(该值可无、会自动获取全局配置)
      * 默认逻辑删除值(该值可无、会自动获取全局配置)
-     * </p>
      */
      */
     String delval() default "";
     String delval() default "";
 
 

+ 0 - 6
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/TableName.java

@@ -22,9 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 数据库表相关
  * 数据库表相关
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2016-01-23
  * @since 2016-01-23
@@ -35,16 +33,12 @@ import java.lang.annotation.Target;
 public @interface TableName {
 public @interface TableName {
 
 
     /**
     /**
-     * <p>
      * 实体对应的表名
      * 实体对应的表名
-     * </p>
      */
      */
     String value() default "";
     String value() default "";
 
 
     /**
     /**
-     * <p>
      * 实体映射结果集
      * 实体映射结果集
-     * </p>
      */
      */
     String resultMap() default "";
     String resultMap() default "";
 
 

+ 1 - 5
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/Version.java

@@ -22,9 +22,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.annotation.Target;
 
 
 /**
 /**
- * <p>
  * 乐观锁注解、标记 @Verison 在字段上
  * 乐观锁注解、标记 @Verison 在字段上
- * </p>
  *
  *
  * @author TaoYu
  * @author TaoYu
  * @since 2016-01-23
  * @since 2016-01-23
@@ -32,6 +30,4 @@ import java.lang.annotation.Target;
 @Documented
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD})
 @Target({ElementType.FIELD})
-public @interface Version {
-
-}
+public @interface Version {}

+ 10 - 9
mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java

@@ -57,6 +57,7 @@ import java.util.List;
  * configuration file is specified as a property, those will be considered,
  * configuration file is specified as a property, those will be considered,
  * otherwise this auto-configuration will attempt to register mappers based on
  * otherwise this auto-configuration will attempt to register mappers based on
  * the interface definitions in or under the root auto-configuration package.
  * the interface definitions in or under the root auto-configuration package.
+ * </p>
  *
  *
  * @author Eddú Meléndez
  * @author Eddú Meléndez
  * @author Josh Long
  * @author Josh Long
@@ -81,9 +82,9 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
     private final DatabaseIdProvider databaseIdProvider;
     private final DatabaseIdProvider databaseIdProvider;
 
 
     private final List<ConfigurationCustomizer> configurationCustomizers;
     private final List<ConfigurationCustomizer> configurationCustomizers;
-    
+
     private final ApplicationContext applicationContext;
     private final ApplicationContext applicationContext;
-    
+
 
 
     public MybatisPlusAutoConfiguration(MybatisPlusProperties properties,
     public MybatisPlusAutoConfiguration(MybatisPlusProperties properties,
                                         ObjectProvider<Interceptor[]> interceptorsProvider,
                                         ObjectProvider<Interceptor[]> interceptorsProvider,
@@ -98,12 +99,12 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
         this.configurationCustomizers = configurationCustomizersProvider.getIfAvailable();
         this.configurationCustomizers = configurationCustomizersProvider.getIfAvailable();
         this.applicationContext = applicationContext;
         this.applicationContext = applicationContext;
     }
     }
-    
+
     @Override
     @Override
     public void afterPropertiesSet() {
     public void afterPropertiesSet() {
         checkConfigFileExists();
         checkConfigFileExists();
     }
     }
-    
+
     private void checkConfigFileExists() {
     private void checkConfigFileExists() {
         if (this.properties.isCheckConfigLocation() && StringUtils.hasText(this.properties.getConfigLocation())) {
         if (this.properties.isCheckConfigLocation() && StringUtils.hasText(this.properties.getConfigLocation())) {
             Resource resource = this.resourceLoader.getResource(this.properties.getConfigLocation());
             Resource resource = this.resourceLoader.getResource(this.properties.getConfigLocation());
@@ -211,19 +212,19 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
 
 
         @Override
         @Override
         public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
         public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-        
+
             if (!AutoConfigurationPackages.has(this.beanFactory)) {
             if (!AutoConfigurationPackages.has(this.beanFactory)) {
                 logger.debug("Could not determine auto-configuration package, automatic mapper scanning disabled.");
                 logger.debug("Could not determine auto-configuration package, automatic mapper scanning disabled.");
                 return;
                 return;
             }
             }
-        
+
             logger.debug("Searching for mappers annotated with @Mapper");
             logger.debug("Searching for mappers annotated with @Mapper");
-        
+
             List<String> packages = AutoConfigurationPackages.get(this.beanFactory);
             List<String> packages = AutoConfigurationPackages.get(this.beanFactory);
             if (logger.isDebugEnabled()) {
             if (logger.isDebugEnabled()) {
                 packages.forEach(pkg -> logger.debug("Using auto-configuration base package '{}'", pkg));
                 packages.forEach(pkg -> logger.debug("Using auto-configuration base package '{}'", pkg));
             }
             }
-        
+
             ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry);
             ClassPathMapperScanner scanner = new ClassPathMapperScanner(registry);
             if (this.resourceLoader != null) {
             if (this.resourceLoader != null) {
                 scanner.setResourceLoader(this.resourceLoader);
                 scanner.setResourceLoader(this.resourceLoader);
@@ -256,7 +257,7 @@ public class MybatisPlusAutoConfiguration implements InitializingBean {
     @Import({AutoConfiguredMapperScannerRegistrar.class})
     @Import({AutoConfiguredMapperScannerRegistrar.class})
     @ConditionalOnMissingBean(MapperFactoryBean.class)
     @ConditionalOnMissingBean(MapperFactoryBean.class)
     public static class MapperScannerRegistrarNotFoundConfiguration implements InitializingBean {
     public static class MapperScannerRegistrarNotFoundConfiguration implements InitializingBean {
-    
+
         @Override
         @Override
         public void afterPropertiesSet() {
         public void afterPropertiesSet() {
             logger.debug("No {} found.", MapperFactoryBean.class.getName());
             logger.debug("No {} found.", MapperFactoryBean.class.getName());

+ 1 - 1
mybatis-plus-boot-starter/src/main/resources/META-INF/spring.factories

@@ -1,3 +1,3 @@
 # Auto Configure
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration
+  com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration

+ 0 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/SampleTest.java

@@ -14,9 +14,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 
 public class SampleTest {
 public class SampleTest {
 
 
-    private final ObjectMapper mapper = new ObjectMapper();
-
-
     @Test
     @Test
     public void testTableInfoHelper2() {
     public void testTableInfoHelper2() {
         TableInfo info = TableInfoHelper.initTableInfo(null, CommonLogicData.class);
         TableInfo info = TableInfoHelper.initTableInfo(null, CommonLogicData.class);

+ 1 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/GenerateCode4H2Database.java

@@ -17,8 +17,7 @@ import com.baomidou.mybatisplus.generator.config.querys.H2Query;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 
 /**
 /**
- * <p>
- * </p>
+ * <p></p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @date 2019/1/8
  * @date 2019/1/8

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2Delete1Eq1Test.java

@@ -15,9 +15,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus H2 Junit Test
  * Mybatis Plus H2 Junit Test
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-05
  * @since 2018-06-05

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandler.java

@@ -23,9 +23,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 
 
 
 
 /**
 /**
- * <p>
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-06-25
  * @since 2017-06-25

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java

@@ -21,9 +21,7 @@ import com.baomidou.mybatisplus.test.h2.entity.mapper.H2StudentMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus H2 Junit Test
  * Mybatis Plus H2 Junit Test
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-05
  * @since 2018-06-05

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -24,9 +24,7 @@ import java.util.Map;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toList;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus H2 Junit Test
  * Mybatis Plus H2 Junit Test
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-05
  * @since 2018-06-05

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -24,9 +24,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
 import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus H2 Junit Test
  * Mybatis Plus H2 Junit Test
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/SqlRunnerTest.java

@@ -21,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 
 
 /**
 /**
- *  SqlRunner测试
+ * SqlRunner测试
  * @author nieqiurong 2018/8/25 11:05.
  * @author nieqiurong 2018/8/25 11:05.
  */
  */
 @FixMethodOrder(MethodSorters.JVM)
 @FixMethodOrder(MethodSorters.JVM)

+ 3 - 5
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/DBConfig.java

@@ -14,9 +14,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import java.io.IOException;
 import java.io.IOException;
 
 
 /**
 /**
- * <p>
  * H2 Memory Database config
  * H2 Memory Database config
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1
@@ -39,7 +37,7 @@ public class DBConfig {
     public DataSourceTransactionManager transactionManager(DataSource ds) {
     public DataSourceTransactionManager transactionManager(DataSource ds) {
         return new DataSourceTransactionManager(ds);
         return new DataSourceTransactionManager(ds);
     }
     }
-    
+
     @Bean
     @Bean
     public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws IOException {
     public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws IOException {
         final DataSourceInitializer initializer = new DataSourceInitializer();
         final DataSourceInitializer initializer = new DataSourceInitializer();
@@ -48,7 +46,7 @@ public class DBConfig {
         initializer.setEnabled(true);
         initializer.setEnabled(true);
         return initializer;
         return initializer;
     }
     }
-    
+
     private DatabasePopulator databasePopulator() throws IOException {
     private DatabasePopulator databasePopulator() throws IOException {
         ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator();
         ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator();
         resourceDatabasePopulator.setContinueOnError(false);
         resourceDatabasePopulator.setContinueOnError(false);
@@ -57,5 +55,5 @@ public class DBConfig {
         );
         );
         return resourceDatabasePopulator;
         return resourceDatabasePopulator;
     }
     }
-    
+
 }
 }

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java

@@ -28,9 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus Config
  * Mybatis Plus Config
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1

+ 1 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuSuperEntity.java

@@ -9,10 +9,8 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
 /**
 /**
- * <p>
  * 多层集成测试
  * 多层集成测试
- * github #170
- * </p>
+ * <p>github #170</p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @since 2017/12/7
  * @since 2017/12/7

+ 1 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuSuperEntityCamel.java

@@ -7,10 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 
 
 
 
 /**
 /**
- * <p>
  * 多层集成测试
  * 多层集成测试
- * github #170
- * </p>
+ * <p>github #170</p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @since 2017/12/7
  * @since 2017/12/7

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntity.java

@@ -23,9 +23,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 /**
 /**
- * <p>
  * 测试父类情况
  * 测试父类情况
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2016-06-26
  * @since 2016-06-26

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntityCamel.java

@@ -21,9 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 
 
 
 
 /**
 /**
- * <p>
  * 测试父类情况
  * 测试父类情况
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2016-06-26
  * @since 2016-06-26

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/AgeEnum.java

@@ -3,9 +3,7 @@ package com.baomidou.mybatisplus.test.h2.entity.enums;
 import com.baomidou.mybatisplus.core.enums.IEnum;
 import com.baomidou.mybatisplus.core.enums.IEnum;
 
 
 /**
 /**
- * <p>
  * 通用枚举注入演示,注意需要实现 IEnums 也需要扫描枚举包
  * 通用枚举注入演示,注意需要实现 IEnums 也需要扫描枚举包
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-08-15
  * @since 2018-08-15

+ 1 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/GenderEnum.java

@@ -1,8 +1,7 @@
 package com.baomidou.mybatisplus.test.h2.entity.enums;
 package com.baomidou.mybatisplus.test.h2.entity.enums;
 
 
 /**
 /**
- * <p>
- * </p>
+ * <p></p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @date 2018/8/30
  * @date 2018/8/30

+ 1 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/GradeEnum.java

@@ -3,8 +3,7 @@ package com.baomidou.mybatisplus.test.h2.entity.enums;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.annotation.EnumValue;
 
 
 /**
 /**
- * <p>
- * </p>
+ * <p></p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @date 2018/8/30
  * @date 2018/8/30

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java

@@ -13,9 +13,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Addr;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 
 
 /**
 /**
- * <p>
  * 这里继承自定义父类 SuperMapper
  * 这里继承自定义父类 SuperMapper
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/SuperMapper.java

@@ -1,9 +1,7 @@
 package com.baomidou.mybatisplus.test.h2.entity.mapper;
 package com.baomidou.mybatisplus.test.h2.entity.mapper;
 
 
 /**
 /**
- * <p>
  * 自定义父类 SuperMapper
  * 自定义父类 SuperMapper
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-06-26
  * @since 2017-06-26

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2Addr.java

@@ -8,9 +8,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 
 
 /**
 /**
- * <p>
  * h2address entity.
  * h2address entity.
- * </p>
  *
  *
  * @author yuxiaobin
  * @author yuxiaobin
  * @since 2017/5/25
  * @since 2017/5/25

+ 7 - 10
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -26,9 +26,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
 /**
 /**
- * <p>
  * 测试用户类
  * 测试用户类
- * </p>
  *
  *
  * @author hubin sjy
  * @author hubin sjy
  */
  */
@@ -117,13 +115,12 @@ public class H2User extends SuperEntity {
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {
-        return null == this ? "h2user is null." : new StringBuilder()
-            .append("h2user:{name=").append(name).append(",")
-            .append("age=").append(age).append(",")
-            .append("price=").append(price).append(",")
-            .append("testType=").append(testType).append(",")
-            .append("desc=").append(desc).append(",")
-            .append("testDate=").append(testDate).append(",")
-            .append("version=").append(version).toString();
+        return "h2user:{name=" + name + "," +
+            "age=" + age + "," +
+            "price=" + price + "," +
+            "testType=" + testType + "," +
+            "desc=" + desc + "," +
+            "testDate=" + testDate + "," +
+            "version=" + version;
     }
     }
 }
 }

+ 4 - 6
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserService.java

@@ -23,9 +23,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 
 
 /**
 /**
- * <p>
  * Service层测试
  * Service层测试
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-01-30
  * @since 2017-01-30
@@ -47,12 +45,12 @@ public interface IH2UserService extends IService<H2User> {
     int selectCountWithParamInSelectItems(Map<String, Object> param);
     int selectCountWithParamInSelectItems(Map<String, Object> param);
 
 
     List<Map> mySelectMaps();
     List<Map> mySelectMaps();
-    
+
     void testBatchTransactional();
     void testBatchTransactional();
-    
+
     void testSimpleTransactional();
     void testSimpleTransactional();
-    
+
     void testSaveOrUpdateBatchTransactional();
     void testSaveOrUpdateBatchTransactional();
-    
+
     void testSimpleAndBatchTransactional();
     void testSimpleAndBatchTransactional();
 }
 }

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserServiceImpl.java

@@ -29,9 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
- * <p>
  * Service层测试
  * Service层测试
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-01-30
  * @since 2017-01-30

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlMetaObjectHandler.java

@@ -22,9 +22,7 @@ import org.apache.ibatis.reflection.MetaObject;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 
 
 /**
 /**
- * <p>
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-06-25
  * @since 2017-06-25

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -38,9 +38,7 @@ import static java.util.stream.Collectors.toMap;
 
 
 
 
 /**
 /**
- * <p>
  * Mybatis Plus mysql Junit Test
  * Mybatis Plus mysql Junit Test
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-05
  * @since 2018-06-05

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/config/MybatisPlusConfig.java

@@ -28,9 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus Config
  * Mybatis Plus Config
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresMetaObjectHandler.java

@@ -22,9 +22,7 @@ import org.apache.ibatis.reflection.MetaObject;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 
 
 /**
 /**
- * <p>
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
  * 测试,自定义元对象字段填充控制器,实现公共字段自动写入
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2017-06-25
  * @since 2017-06-25

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java

@@ -32,9 +32,7 @@ import com.baomidou.mybatisplus.test.base.mapper.pg.PgDataMapper;
 import com.baomidou.mybatisplus.test.postgres.config.PostgresDb;
 import com.baomidou.mybatisplus.test.postgres.config.PostgresDb;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus mysql Junit Test
  * Mybatis Plus mysql Junit Test
- * </p>
  *
  *
  * @author hubin
  * @author hubin
  * @since 2018-06-05
  * @since 2018-06-05

+ 0 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/config/MybatisPlusConfig.java

@@ -23,9 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
- * <p>
  * Mybatis Plus Config
  * Mybatis Plus Config
- * </p>
  *
  *
  * @author Caratacus
  * @author Caratacus
  * @since 2017/4/1
  * @since 2017/4/1

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/reflection/ExampleObjectFactory.java

@@ -16,7 +16,7 @@ public class ExampleObjectFactory extends DefaultObjectFactory {
 
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ExampleObjectFactory.class);
     private static final Logger LOGGER = LoggerFactory.getLogger(ExampleObjectFactory.class);
 
 
-    public Object create(Class type) {
+    public <T> T create(Class<T> type) {
         LOGGER.debug("生成一个对象 type = [" + type + "]");
         LOGGER.debug("生成一个对象 type = [" + type + "]");
         return super.create(type);
         return super.create(type);
     }
     }