Merge branch 'master' into dev

src/main/java/com/baomidou/mybatisplus/annotations/KeySequence.java

@@ -47,6 +47,6 @@ public @interface KeySequence {
      * id的类型
      * </p>
      */
-    Class idClazz() default Long.class;
+    Class clazz() default Long.class;
 
 }

src/main/java/com/baomidou/mybatisplus/annotations/TableField.java

@@ -65,13 +65,13 @@ public @interface TableField {
 
     /**
      * <p>
-     * 字段验证
+     * 字段验证策略
      * </p>
      * <p>
      * 默认 非 null 判断
      * </p>
      */
-    FieldStrategy validate() default FieldStrategy.NOT_NULL;
+    FieldStrategy strategy() default FieldStrategy.NOT_NULL;
 
     /**
      * <p>

src/main/java/com/baomidou/mybatisplus/entity/TableFieldInfo.java

@@ -111,8 +111,8 @@ public class TableFieldInfo {
          * 优先使用单个字段注解，否则使用全局配置<br>
          * 自定义字段验证策略 fixed-239
 		 */
-        if (FieldStrategy.NOT_NULL != tableField.validate()) {
-            this.fieldStrategy = tableField.validate();
+        if (FieldStrategy.NOT_NULL != tableField.strategy()) {
+            this.fieldStrategy = tableField.strategy();
         } else {
             this.fieldStrategy = globalConfig.getFieldStrategy();
         }

src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -403,7 +403,7 @@ public class TableInfoHelper {
             throw new IllegalArgumentException("not configure IKeyGenerator implementation class.");
         }
         String id = baseStatementId + SelectKeyGenerator.SELECT_KEY_SUFFIX;
-        Class<?> resultTypeClass = tableInfo.getKeySequence().idClazz();
+        Class<?> resultTypeClass = tableInfo.getKeySequence().clazz();
         StatementType statementType = StatementType.PREPARED;
         String keyProperty = tableInfo.getKeyProperty();
         String keyColumn = tableInfo.getKeyColumn();

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -57,7 +57,7 @@ public class H2User implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserDateVersion.java

@@ -58,7 +58,7 @@ public class H2UserDateVersion implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserLogicDelete.java

@@ -43,7 +43,7 @@ public class H2UserLogicDelete {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserMetaObj.java

@@ -59,7 +59,7 @@ public class H2UserMetaObj implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserNoVersion.java

@@ -56,7 +56,7 @@ public class H2UserNoVersion implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     private Integer testType;
 
     private String desc;

src/test/java/com/baomidou/mybatisplus/test/mysql/entity/User.java

@@ -55,7 +55,7 @@ public class User implements Serializable {
     private BigDecimal price;
 
     /* 测试下划线字段命名类型, 字段填充 */
-    @TableField(value = "test_type", validate = FieldStrategy.IGNORED)
+    @TableField(value = "test_type", strategy = FieldStrategy.IGNORED)
     @TableLogic(value = "-2") // 该注解为了测试逻辑删除、这里设置 -2 为删除值
     private Integer testType;