优化细节

Author: jenly1314

src/main/java/com/king/java/field/plugin/action/GenerateFieldAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/king/java/field/plugin/action/QuickGenerateFieldAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/king/java/field/plugin/component/ConfigComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/king/java/field/plugin/entity/FieldParseConfig.java

@@ -16,6 +16,11 @@
 package com.king.java.field.plugin.entity;
 
 import com.king.java.field.plugin.dialog.GenerateFieldDialog;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * 字段解析配置
@@ -48,6 +53,14 @@ public class FieldParseConfig {
      * 是否生成 toString 方法
      */
     private boolean generateToString;
+    /**
+     * 字段类型转换配置；key为原始类型，value表示需要目标类型；如：key = int，value = Integer 时，则会在生成字段类型时，自动将 int 转换为 Integer
+     */
+    private Map<String,String> filedTypeConvertMap;
+    /**
+     * 是否将数组转换为列表
+     */
+    private boolean convertArrayToList = true;
 
     public int getFieldColumn() {
         return fieldColumn;
@@ -97,6 +110,32 @@ public void setGenerateGetterAndSetter(boolean generateGetterAndSetter) {
         this.generateGetterAndSetter = generateGetterAndSetter;
     }
 
+    @NotNull
+    public Map<String, String> getFiledTypeConvertMap() {
+        if(filedTypeConvertMap == null){
+            filedTypeConvertMap = new LinkedHashMap<>(16);
+            filedTypeConvertMap.put("varchar", "String");
+            filedTypeConvertMap.put("tinytext", "String");
+            filedTypeConvertMap.put("text", "String");
+            filedTypeConvertMap.put("string", "String");
+            filedTypeConvertMap.put("bool", "boolean");
+            filedTypeConvertMap.put("integer", "Integer");
+        }
+        return filedTypeConvertMap;
+    }
+
+    public void setFiledTypeConvertMap(Map<String, String> filedTypeConvertMap) {
+        this.filedTypeConvertMap = filedTypeConvertMap;
+    }
+
+    public boolean isConvertArrayToList() {
+        return convertArrayToList;
+    }
+
+    public void setConvertArrayToList(boolean convertArrayToList) {
+        this.convertArrayToList = convertArrayToList;
+    }
+
     @Override
     public String toString() {
         return "FieldParseConfig{" +
@@ -106,6 +145,8 @@ public String toString() {
                 ", fieldModifier='" + fieldModifier + '\'' +
                 ", generateGetterAndSetter=" + generateGetterAndSetter +
                 ", generateToString=" + generateToString +
+                ", filedTypeConvertMap=" + filedTypeConvertMap +
+                ", convertArrayToList=" + convertArrayToList +
                 '}';
     }
 }

src/main/java/com/king/java/field/plugin/entity/FieldProperty.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/king/java/field/plugin/generator/CodeGeneratorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:[email protected]">Jenly</a>
@@ -43,9 +45,7 @@ public void onGenerate(Project project, PsiClass psiClass, FieldParseConfig file
         for (FieldProperty fieldProperty : fieldProperties) {
             StringBuilder sb = new StringBuilder();
             // 注释
-            if (StringUtils.isNotBlank(fieldProperty.getComment())) {
-                sb.append("/**\n\t* ").append(fieldProperty.getComment().replace("\n", "\n* ")).append("\n*/");
-            }
+            sb.append("/**\n\t* ").append(fieldProperty.getComment().replace("\n", "\n* ")).append("\n*/");
             // 字段
             sb.append(String.format("\n%s %s %s;", fieldProperty.getModifier(), fieldProperty.getType(), fieldProperty.getName()));
             PsiField psiField = factory.createFieldFromText(sb.toString(), psiClass);
@@ -124,6 +124,7 @@ private List<FieldProperty> parse(FieldParseConfig filedParseConfig, String text
         // 首先按行分割
         String[] lines = text.split("\n");
         FieldProperty fieldProperty = null;
+        Map<String, String> filedTypeConvertMap = filedParseConfig.getFiledTypeConvertMap();
         for (String singleLine : lines) {
             if (TextUtils.isEmpty(singleLine) && fieldProperty == null) {
                 continue;
@@ -143,15 +144,74 @@ private List<FieldProperty> parse(FieldParseConfig filedParseConfig, String text
                 fieldProperty = new FieldProperty();
                 fieldProperty.setModifier(filedParseConfig.getFieldModifier());
                 fieldProperty.setName(stringArr[filedParseConfig.getFieldColumn()].trim());
-                fieldProperty.setType(stringArr[filedParseConfig.getFieldTypeColumn()].trim());
+                fieldProperty.setType(convertFieldType(stringArr[filedParseConfig.getFieldTypeColumn()].trim(), filedTypeConvertMap, filedParseConfig.isConvertArrayToList()));
 
                 if (filedParseConfig.getFieldCommentColumn() < length) {
                     fieldProperty.setComment(stringArr[filedParseConfig.getFieldCommentColumn()].trim());
+                } else{
+                    fieldProperty.setComment("");
                 }
 
                 fieldPropertyList.add(fieldProperty);
             }
         }
         return fieldPropertyList;
     }
+
+    /**
+     * 字段类型转换
+     * @param fieldType
+     * @param fieldTypeConvertMap
+     * @param convertArrayToList
+     * @return
+     */
+    private String convertFieldType(String fieldType, Map<String, String> fieldTypeConvertMap, boolean convertArrayToList) {
+        if(fieldType.endsWith("[][]")){
+            // 二维数组转换List： T[][] -> List<List<T>>
+            String type = fieldType.replace("[]","");
+            if (convertArrayToList) {
+                if (convertArrayToList) {
+                    return String.format(Locale.getDefault(), "List<List<%s>>", convertWrapperType(fieldTypeConvertMap.getOrDefault(type, type)));
+                }
+            }
+            return String.format(Locale.getDefault(), "%s[][]", fieldTypeConvertMap.getOrDefault(type, type));
+        }else if(fieldType.endsWith("[]")){
+            // 一维数组转换成List： T[] -> List<T>
+            String type = fieldType.replace("[]","");
+            if (convertArrayToList) {
+                return String.format(Locale.getDefault(), "List<%s>", convertWrapperType(fieldTypeConvertMap.getOrDefault(type, type)));
+            }
+            return String.format(Locale.getDefault(), "%s[]", fieldTypeConvertMap.getOrDefault(type, type));
+        }
+
+        return fieldTypeConvertMap.getOrDefault(fieldType, fieldType);
+    }
+
+    /**
+     * 转为包装类
+     * @param type
+     * @return
+     */
+    private String convertWrapperType(String type) {
+        switch (type){
+            case "byte":
+                return "Byte";
+            case "short":
+                return "Short";
+            case "int":
+                return "Integer";
+            case "float":
+                return "Float";
+            case "long":
+                return "Long";
+            case "double":
+                return "Double";
+            case "char":
+                return "Char";
+           case "boolean":
+                return "Boolean";
+            default:
+                return type;
+        }
+    }
 }

src/main/java/com/king/java/field/plugin/generator/ICodeGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Jenly Yu
+ * Copyright (C) 2020 Jenly Yu, https://github.com/jenly1314/JavaFieldGenerator
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.