浏览代码

修改starter主键类型,字段验证配置,不再兼容2.0.

nieqiurong 7 年之前
父节点
当前提交
04c524e84b

+ 9 - 10
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/FieldStrategy.java

@@ -27,8 +27,17 @@ import lombok.Getter;
  */
 @Getter
 public enum FieldStrategy {
+    /**
+     * 忽略判断
+     */
     IGNORED(0, "忽略判断"),
+    /**
+     * 非NULL判断
+     */
     NOT_NULL(1, "非 NULL 判断"),
+    /**
+     * 非空判断
+     */
     NOT_EMPTY(2, "非空判断");
 
     /**
@@ -46,14 +55,4 @@ public enum FieldStrategy {
         this.desc = desc;
     }
 
-    public static FieldStrategy getFieldStrategy(int key) {
-        FieldStrategy[] fss = FieldStrategy.values();
-        for (FieldStrategy fs : fss) {
-            if (fs.getKey() == key) {
-                return fs;
-            }
-        }
-        return FieldStrategy.NOT_NULL;
-    }
-
 }

+ 23 - 21
mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/IdType.java

@@ -27,10 +27,31 @@ import lombok.Getter;
  */
 @Getter
 public enum IdType {
-    AUTO(0, "数据库ID自增"), INPUT(1, "用户输入ID"),
+    /**
+     * 数据库ID自增
+     */
+    AUTO(0, "数据库ID自增"),
+    /**
+     * 用户输入ID
+     */
+    INPUT(1, "用户输入ID"),
 
     /* 以下2种类型、只有当插入对象ID 为空,才自动填充。 */
-    ID_WORKER(2, "全局唯一ID"), UUID(3, "全局唯一ID"), NONE(4, "该类型为未设置主键类型"),
+    /**
+     * 全局唯一ID
+     */
+    ID_WORKER(2, "全局唯一ID"),
+    /**
+     * 全局唯一ID
+     */
+    UUID(3, "全局唯一ID"),
+    /**
+     * 该类型为未设置主键类型
+     */
+    NONE(4, "该类型为未设置主键类型"),
+    /**
+     * 字符串全局唯一ID
+     */
     ID_WORKER_STR(5, "字符串全局唯一ID");
 
     /**
@@ -47,23 +68,4 @@ public enum IdType {
         this.key = key;
         this.desc = desc;
     }
-
-    /**
-     * <p>
-     * 主键策略 (默认 ID_WORKER)
-     * </p>
-     *
-     * @param idType ID 策略类型
-     * @return
-     */
-    public static IdType getIdType(int idType) {
-        IdType[] its = IdType.values();
-        for (IdType it : its) {
-            if (it.getKey() == idType) {
-                return it;
-            }
-        }
-        return ID_WORKER;
-    }
-
 }

+ 0 - 46
mybatis-plus-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -1,50 +1,4 @@
 {
-    "hints": [
-        {
-            "sourceType": "com.baomidou.mybatisplus.core.config.GlobalConfig$DbConfig",
-            "name": "mybatis-plus.global-config.db-config.id-type",
-            "type": "java.lang.Integer",
-            "description": "主键类型",
-            "values": [
-                {
-                    "value": "0",
-                    "description": "数据库ID自增"
-                },
-                {
-                    "value": "1",
-                    "description": "用户输入ID"
-                },
-                {
-                    "value": "2",
-                    "description": "分布式全局唯一ID"
-                },
-                {
-                    "value": "3",
-                    "description": "全局唯一ID-UUID"
-                }
-            ]
-        },
-        {
-            "sourceType": "com.baomidou.mybatisplus.core.config.GlobalConfig$DbConfig",
-            "name": "mybatis-plus.global-config.db-config.field-strategy",
-            "type": "java.lang.Integer",
-            "description": "字段验证策略",
-            "values": [
-                {
-                    "value": "0",
-                    "description": "忽略判断"
-                },
-                {
-                    "value": "1",
-                    "description": "非 NULL 判断"
-                },
-                {
-                    "value": "2",
-                    "description": "非空判断"
-                }
-            ]
-        }
-    ],
     "groups": [
         {
             "sourceType": "com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties",