JiggTypeValueKindでしか使用していないTypeId定数を移動

Author: irof

jig-core/src/main/java/org/dddjava/jig/domain/model/data/types/TypeId.java

@@ -17,15 +17,6 @@ public record TypeId(String value) implements Comparable<TypeId> {
     public static final TypeId OBJECT = TypeId.valueOf("java.lang.Object");
     public static final TypeId ENUM = TypeId.valueOf("java.lang.Enum");
     public static final TypeId RECORD = TypeId.valueOf("java.lang.Record");
-    // 数値
-    public static final TypeId INT_PRIMITIVE = TypeId.valueOf("int");
-    public static final TypeId LONG_PRIMITIVE = TypeId.valueOf("long");
-    public static final TypeId INTEGER = TypeId.valueOf("java.lang.Integer");
-    public static final TypeId LONG = TypeId.valueOf("java.lang.Long");
-    public static final TypeId BIG_DECIMAL = TypeId.valueOf("java.math.BigDecimal");
-    // コレクション
-    public static final TypeId LIST = TypeId.valueOf("java.util.List");
-    public static final TypeId SET = TypeId.valueOf("java.util.Set");
     // 文字列
     public static final TypeId STRING = TypeId.valueOf("java.lang.String");
     // 日付

jig-core/src/main/java/org/dddjava/jig/domain/model/information/types/JigTypeValueKind.java

@@ -18,24 +18,34 @@ public enum JigTypeValueKind {
     コレクション,
     不明;
 
+    // 数値
+    private static final TypeId INT_PRIMITIVE = TypeId.valueOf("int");
+    private static final TypeId LONG_PRIMITIVE = TypeId.valueOf("long");
+    private static final TypeId INTEGER = TypeId.valueOf("java.lang.Integer");
+    private static final TypeId LONG = TypeId.valueOf("java.lang.Long");
+    private static final TypeId BIG_DECIMAL = TypeId.valueOf("java.math.BigDecimal");
+    // コレクション
+    private static final TypeId LIST = TypeId.valueOf("java.util.List");
+    private static final TypeId SET = TypeId.valueOf("java.util.Set");
+
     public static JigTypeValueKind from(JigType jigType) {
         TypeKind typeKind = jigType.typeKind();
         if (typeKind.isCategory()) {
             return 区分;
         }
 
         JigFields instanceJigFields = jigType.instanceJigFields();
-        if (matchFieldType(instanceJigFields, TypeId.LIST) || matchFieldType(instanceJigFields, TypeId.SET)) {
+        if (matchFieldType(instanceJigFields, LIST) || matchFieldType(instanceJigFields, SET)) {
             return コレクション;
         }
         if (matchFieldType(instanceJigFields, TypeId.STRING)) {
             return 文字列;
         }
-        if (matchFieldType(instanceJigFields, TypeId.BIG_DECIMAL)
-                || matchFieldType(instanceJigFields, TypeId.INTEGER)
-                || matchFieldType(instanceJigFields, TypeId.LONG)
-                || matchFieldType(instanceJigFields, TypeId.INT_PRIMITIVE)
-                || matchFieldType(instanceJigFields, TypeId.LONG_PRIMITIVE)) {
+        if (matchFieldType(instanceJigFields, BIG_DECIMAL)
+                || matchFieldType(instanceJigFields, INTEGER)
+                || matchFieldType(instanceJigFields, LONG)
+                || matchFieldType(instanceJigFields, INT_PRIMITIVE)
+                || matchFieldType(instanceJigFields, LONG_PRIMITIVE)) {
             return 数値;
         }
         if (matchFieldType(instanceJigFields, TypeId.LOCAL_DATE)) {