Optional added

Mighty16 · Mighty16 · commit 07e4d4a5efd7 · 2018-02-03T22:23:07.000+03:00
diff --git a/src/com/mighty16/json/annotations/FastJsonAnnotation.java b/src/com/mighty16/json/annotations/FastJsonAnnotation.java
@@ -11,6 +11,6 @@ public String getSerializeName(String jsonKey) {
 
     @Override
     public String getImportString() {
-        return "com.alibaba.fastjson.JSON";
+        return "import com.alibaba.fastjson.JSON";
     }
 }
diff --git a/src/com/mighty16/json/annotations/GsonAnnotations.java b/src/com/mighty16/json/annotations/GsonAnnotations.java
@@ -11,6 +11,6 @@ public String getSerializeName(String jsonKey) {
 
     @Override
     public String getImportString() {
-        return "com.google.gson.annotations.SerializedName";
+        return "import com.google.gson.annotations.SerializedName";
     }
 }
diff --git a/src/com/mighty16/json/annotations/JacksonAnnotations.java b/src/com/mighty16/json/annotations/JacksonAnnotations.java
@@ -9,6 +9,6 @@ public String getSerializeName(String jsonKey) {
 
     @Override
     public String getImportString() {
-        return "com.fasterxml.jackson.annotation.JsonProperty";
+        return "import com.fasterxml.jackson.annotation.JsonProperty";
     }
 }
diff --git a/src/com/mighty16/json/annotations/MoshiAnnotations.java b/src/com/mighty16/json/annotations/MoshiAnnotations.java
@@ -11,6 +11,6 @@ public String getSerializeName(String jsonKey) {
 
     @Override
     public String getImportString() {
-        return "com.squareup.moshi.Json";
+        return "import com.squareup.moshi.Json";
     }
 }
diff --git a/src/com/mighty16/json/generator/MultipleFilesGenerator.java b/src/com/mighty16/json/generator/MultipleFilesGenerator.java
@@ -1,9 +1,6 @@
 package com.mighty16.json.generator;
 
-
-import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.wm.StatusBar;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.file.PsiDirectoryFactory;
 import com.mighty16.json.annotations.AnnotationGenerator;
@@ -31,7 +28,7 @@ public void generateFiles(PsiDirectory directory, List<ClassModel> classDataList
 
             builder.append(String.format(PACKAGE_BLOCK, classData.packageName));
             if (annotations != null) {
-                builder.append("import " + annotations.getImportString() + "\n\n");
+                builder.append(annotations.getImportString() + "\n\n");
             }
 
             String sourceText = builder.toString() + generateFileContentForClass(classData);
diff --git a/src/com/mighty16/json/generator/SingleFileGenerator.java b/src/com/mighty16/json/generator/SingleFileGenerator.java
@@ -34,7 +34,7 @@ public void generateFiles(PsiDirectory directory, List<ClassModel> classDataList
         int initialLength = resultFileContent.length();
 
         if (annotations != null) {
-            resultFileContent.insert(initialLength, "\n" + "import " + annotations.getImportString() + "\n\n");
+            resultFileContent.insert(initialLength, "\n" + annotations.getImportString() + "\n\n");
         }
 
         for (ClassModel classData : classDataList) {
diff --git a/src/com/mighty16/json/generator/SourceFilesGenerator.java b/src/com/mighty16/json/generator/SourceFilesGenerator.java
@@ -54,17 +54,12 @@ public String generateFileContentForClass(ClassModel classData) {
                     builder.append(annotations.getSerializeName(field.jsonName)).append("\n" + gapString);
                 }
 
-                String type;
-                if (!TextUtils.isEmpty(field.defaultValue)) {
-                    type = field.type + " = " + field.defaultValue;
-                } else {
-                    type = field.type;
-                }
+                String typeAndValue = resolver.getFieldTypeAndValue(field);
 
                 builder.append(resolver.getModifier(field.mutable) + " ")
                         .append(field.name)
                         .append(": ")
-                        .append(type);
+                        .append(typeAndValue);
                 if (i < size - 1) {
                     builder.append(",\n" + gapString);
                 }
@@ -74,30 +69,6 @@ public String generateFileContentForClass(ClassModel classData) {
         return builder.toString();
     }
 
-    public PsiDirectory createDirectory(PsiDirectory parent, String name) throws IncorrectOperationException {
-        PsiDirectory result = null;
-        for (PsiDirectory dir : parent.getSubdirectories()) {
-            if (dir.getName().equalsIgnoreCase(name)) {
-                result = dir;
-                break;
-            }
-        }
-        if (null == result) {
-            result = parent.createSubdirectory(name);
-        }
-        return result;
-    }
-
-    public PsiDirectory createPackage(PsiDirectory sourceDir, String qualifiedPackage) throws IncorrectOperationException {
-        PsiDirectory parent = sourceDir;
-        StringTokenizer token = new StringTokenizer(qualifiedPackage, ".");
-        while (token.hasMoreTokens()) {
-            String dirName = token.nextToken();
-            parent = createDirectory(parent, dirName);
-        }
-        return parent;
-    }
-
     private String getGapString(int count) {
         StringBuilder builder = new StringBuilder();
         for (int i = 0; i < count; i++) {
@@ -138,4 +109,4 @@ public interface Listener {
         void onFilesGenerated(int filesCount);
     }
 
-}
+}
diff --git a/src/com/mighty16/json/models/FieldModel.java b/src/com/mighty16/json/models/FieldModel.java
@@ -5,6 +5,7 @@ public class FieldModel {
     public String jsonName;
     public String name;
     public String type;
+    public boolean optional;
     public String originalValue;
     public boolean enabled;
     public boolean mutable;
@@ -16,5 +17,8 @@ public FieldModel(String jsonName, String name, String type, String originalValu
         this.type = type;
         this.originalValue = originalValue;
         this.enabled = true;
+        this.optional = false;
     }
+
+
 }
diff --git a/src/com/mighty16/json/resolver/KotlinResolver.java b/src/com/mighty16/json/resolver/KotlinResolver.java
@@ -1,6 +1,7 @@
 package com.mighty16.json.resolver;
 
 import com.intellij.openapi.fileTypes.FileType;
+import com.mighty16.json.models.FieldModel;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.HashMap;
@@ -78,6 +79,12 @@ public String getModifier(boolean mutable) {
         return mutable ? "var" : "val";
     }
 
+    @Override
+    public String getFieldTypeAndValue(FieldModel field) {
+        String type = field.optional ? field.type + "?" : field.type;
+        return field.defaultValue != null ? type + " = " + field.defaultValue : type;
+    }
+
     @Override
     public boolean isModifierMutable(String modifier) {
         return modifier.equals("var");
diff --git a/src/com/mighty16/json/resolver/LanguageResolver.java b/src/com/mighty16/json/resolver/LanguageResolver.java
@@ -1,6 +1,7 @@
 package com.mighty16.json.resolver;
 
 import com.intellij.openapi.fileTypes.FileType;
+import com.mighty16.json.models.FieldModel;
 
 public abstract class LanguageResolver {
 
@@ -22,6 +23,8 @@ public abstract class LanguageResolver {
 
     public abstract String getModifier(boolean mutable);
 
+    public abstract String getFieldTypeAndValue(FieldModel field);
+
     public abstract boolean isModifierMutable(String modifier);
 
     public abstract String getFileName(String className);
diff --git a/src/com/mighty16/json/ui/FieldsTableDelegate.java b/src/com/mighty16/json/ui/FieldsTableDelegate.java
@@ -25,7 +25,7 @@ public FieldsTableDelegate(JTable fieldsTable, HashMap<String, String> className
         this.fieldsTable = fieldsTable;
         this.languageResolver = resolver;
         this.classNames = classNames;
-        columns = new String[]{"Enabled", "Field name", "var/val", "Type", "Default value", "Original value"};
+        columns = new String[]{"Enabled", "Field name", "var/val", "Optional", "Default value", "Original value"};
     }
 
     public void setClass(ClassModel classModel) {
@@ -45,7 +45,9 @@ public void setClass(ClassModel classModel) {
         DefaultTableCellRenderer centerRenderer = new DefaultTableCellRenderer();
         centerRenderer.setHorizontalAlignment(JLabel.CENTER);
         for (int i = 1; i < columns.length; i++) {
-            fieldsTable.getColumnModel().getColumn(i).setCellRenderer(centerRenderer);
+            if (i!=3) {
+                fieldsTable.getColumnModel().getColumn(i).setCellRenderer(centerRenderer);
+            }
         }
     }
 
@@ -82,7 +84,7 @@ public Class<?> getColumnClass(int columnIndex) {
                 case 2:
                     return String.class;
                 case 3:
-                    return String.class;
+                    return Boolean.class;
                 case 4:
                     return String.class;
             }
@@ -100,12 +102,7 @@ public Object getValueAt(int rowIndex, int columnIndex) {
                 case 2:
                     return languageResolver.getModifier(fieldData.mutable);
                 case 3:
-                    String className = classNames.get(fieldData.type);
-                    if (className != null) {
-                        return className;
-                    } else {
-                        return fieldData.type;
-                    }
+                    return fieldData.optional;
                 case 4:
                     return fieldData.defaultValue;
                 case 5:
@@ -128,7 +125,7 @@ public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
                     fieldData.mutable = languageResolver.isModifierMutable((String) aValue);
                     break;
                 case 3:
-                    fieldData.type = (String) aValue;
+                    fieldData.optional = (Boolean) aValue;
                     break;
                 case 4:
                     fieldData.defaultValue = (String) aValue;
@@ -141,9 +138,6 @@ public boolean isCellEditable(int row, int col) {
             if (col == 5) {
                 return false;
             }
-//            if (col == 3) {
-//                return languageResolver.canChangeType(fieldsData.get(row).type);
-//            }
             return true;
         }
 
diff --git a/src/com/mighty16/json/ui/ModelTableDialog.form b/src/com/mighty16/json/ui/ModelTableDialog.form
diff --git a/src/com/mighty16/json/ui/ModelTableDialog.java b/src/com/mighty16/json/ui/ModelTableDialog.java

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ public String getSerializeName(String jsonKey) {`
`11`	`11`
`12`	`12`	`@Override`
`13`	`13`	`public String getImportString() {`
`14`		`- return "com.alibaba.fastjson.JSON";`
	`14`	`+ return "import com.alibaba.fastjson.JSON";`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public String getSerializeName(String jsonKey) {`
`9`	`9`
`10`	`10`	`@Override`
`11`	`11`	`public String getImportString() {`
`12`		`- return "com.fasterxml.jackson.annotation.JsonProperty";`
	`12`	`+ return "import com.fasterxml.jackson.annotation.JsonProperty";`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void generateFiles(PsiDirectory directory, List<ClassModel> classDataList`
`34`	`34`	`int initialLength = resultFileContent.length();`
`35`	`35`
`36`	`36`	`if (annotations != null) {`
`37`		`- resultFileContent.insert(initialLength, "\n" + "import " + annotations.getImportString() + "\n\n");`
	`37`	`+ resultFileContent.insert(initialLength, "\n" + annotations.getImportString() + "\n\n");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`for (ClassModel classData : classDataList) {`