Add support for jsonArray string

Some optimize

Author: seal

README.md

@@ -16,6 +16,56 @@ I am a plugin for Kotlin to convert Json String into Kotlin data class code (Jso
 
 ![alt text](https://plugins.jetbrains.com/files/9960/screenshot_17276.png)
 
+### Generate Example
+* example with none json lib support and comment option on
+
+    ```kotlin
+        data class FD(
+                val programmers: List<Programmer>,
+                val authors: List<Author>,
+                val musicians: List<Musician>
+        )
+        
+        data class Musician(
+                val firstName: String, //Eric
+                val lastName: String, //Clapton
+                val instrument: String //guitar
+        )
+        
+        data class Author(
+                val firstName: String, //Isaac
+                val lastName: String, //Asimov
+                val genre: String //science fiction
+        )
+        
+        data class Programmer(
+                val firstName: String, //Brett
+                val lastName: String, //McLaughlin
+                val email: String //aaaa
+        )
+
+    ```
+* example with gson option on
+
+    ```kotlin
+
+        data class FD(
+        		@SerializedName("214123addre++/-*ssbook") val addressbook: List<addressbook>
+        )
+        
+        data class addressbook(
+        		@SerializedName("*-/-+address") val address: address,
+        		@SerializedName("name") val name: String, //Ann Michaels
+        		@SerializedName("phoneNumbers") val phoneNumbers: List<String>
+        )
+        
+        data class address(
+        		@SerializedName("city") val city: List<String>,
+        		@SerializedName("*-/32432-*/4street") val street: List<String>,
+        		@SerializedName("zip") val zip: List<Int>
+        )
+
+    ```
 
 ### More Detail Document
 * http://blog.csdn.net/wuseal/article/details/77508585

src/wu/seal/jsontokotlin/ClassName.kt

@@ -20,7 +20,7 @@ object KClassName : IKClassName {
 
     private val ilegalCharactor = listOf<String>(
             "\\+", "\\-", "\\*", "/", "%", "=", "&", "|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)"
-            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";","'", "\\`","\\~" ,"\\$", "^", "#", "\\", "/", " "
+            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "^", "#", "\\", "/", " "
     )
 
     private val suffix = "X"
@@ -30,12 +30,29 @@ object KClassName : IKClassName {
 
         val pattern = "${ilegalCharactor}"
 
-        val temp = rawClassName.replace(Regex(pattern), "")
+        val temp = rawClassName.replace(Regex(pattern), "").let {
+
+            return@let removeStartNumber(it)
+
+        }
 
         return if (temp in ilegalClassNameList) {
             return temp + suffix
         } else {
             temp
         }
     }
+
+    /**
+     * remove the start number characters in this string
+     */
+    private fun removeStartNumber(it: String): String {
+        return if (it.indexOfFirst {
+            return@indexOfFirst it in '0'..'9'
+        } == 0) {
+            it.replaceFirst(Regex("\\d{1,}"), "")
+        } else {
+            it
+        }
+    }
 }

src/wu/seal/jsontokotlin/GsonSupporter.kt

@@ -1,13 +1,14 @@
 package wu.seal.jsontokotlin
 
 /**
+ * Gson Support about
  * Created by Sea.Wu on 2017/9/18.
  */
 
 /**
  * When target Json lib is Gson, this prove fun to create Last Property String block
  */
-interface IGsonSupportor {
+interface IGsonSupporter {
     /**
      * create property String block to fit Gson at most
      */
@@ -16,7 +17,7 @@ interface IGsonSupportor {
 }
 
 
-object GsonSupportor : IGsonSupportor {
+object GsonSupporter : IGsonSupporter {
 
     /**
      * When adapter Gson lib at most ,We should import the Anotation Class

src/wu/seal/jsontokotlin/ImportClassWriter.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.Project
 
 /**
- * to be Import class declare code insert helper
+ * to be a helper to insert Import class declare code
  * Created by Seal.Wu on 2017/9/18.
  */
 
@@ -52,15 +52,15 @@ object ImportClassWriter : IImportClassWriter {
 
     override fun insertGsonImportClass(project: Project, editFile: Document) {
         val text = editFile.text
-        if (GsonSupportor.gsonAnotationImportString !in text) {
+        if (GsonSupporter.gsonAnotationImportString !in text) {
 
             val index = Math.max(text.lastIndexOf("import"), 0)
             val tobeInsertEndline = editFile.getLineNumber(index)
             val insertIndex = if (index == 0) index else editFile.getLineEndOffset(tobeInsertEndline)
 
             CommandProcessor.getInstance().executeCommand(project, {
                 ApplicationManager.getApplication().runWriteAction {
-                    editFile.insertString(insertIndex, "\n" + GsonSupportor.gsonAnotationImportString + "\n")
+                    editFile.insertString(insertIndex, "\n" + GsonSupporter.gsonAnotationImportString + "\n")
 
                 }
             }, "insertKotlin", "JsonToKotlin")

src/wu/seal/jsontokotlin/JsonElementTranslator.kt

@@ -0,0 +1,58 @@
+package wu.seal.jsontokotlin
+
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonParser
+import java.util.*
+
+/**
+ * Target Json Element Maker form a String or an Element for generating Code
+ * Created by Seal.Wu on 2017/9/19.
+ */
+interface ITargetJsonElement {
+    /**
+     * get excpected jsonElement for generating kotlin code
+     */
+    fun getTargetJsonElementForGeneratingCode(): JsonElement
+}
+
+
+class TargetJsonElement : ITargetJsonElement {
+    private val jsonElement: JsonElement
+
+    constructor(jsonString: String) {
+        this.jsonElement = JsonParser().parse(jsonString)
+
+    }
+
+    constructor(jsonElement: JsonElement) {
+        this.jsonElement = jsonElement
+    }
+
+    override fun getTargetJsonElementForGeneratingCode(): JsonElement {
+        if (this.jsonElement.isJsonArray) {
+            val jsonElementNotArray = getArrayChildElement(this.jsonElement.asJsonArray)
+            if (jsonElementNotArray.isJsonObject) {
+                return jsonElementNotArray
+            }
+        }else if (this.jsonElement.isJsonObject) {
+            return this.jsonElement
+        }
+        throw IllegalFormatFlagsException("Unsupported Json String")
+    }
+
+
+    private fun getArrayChildElement(jsonArray: JsonArray): JsonElement {
+        if (jsonArray.size() >= 1) {
+            val jsonElement1 = jsonArray[0]
+            if (jsonElement1.isJsonArray) {
+                return getArrayChildElement(jsonElement1.asJsonArray)
+            } else {
+                return jsonElement1
+            }
+        } else {
+            return Gson().toJsonTree(Any())
+        }
+    }
+}

src/wu/seal/jsontokotlin/KotlinMaker.java

@@ -20,12 +20,12 @@ public class KotlinMaker {
     private Set<String> toBeAppend = new HashSet<String>();
 
     public KotlinMaker(String className, String inputText) {
-        this.inputElement = gson.fromJson(inputText, JsonElement.class);
+        this.inputElement = new TargetJsonElement(inputText).getTargetJsonElementForGeneratingCode();
         this.className = className;
     }
 
     public KotlinMaker(String className, JsonElement jsonElement) {
-        this.inputElement = jsonElement;
+        this.inputElement = new TargetJsonElement(jsonElement).getTargetJsonElementForGeneratingCode();
         this.className = className;
     }
 
@@ -71,7 +71,7 @@ private void appendJsonObject(StringBuilder stringBuilder, JsonObject jsonObject
                 addProperty(stringBuilder, property, type, jsonElementValue.getAsString());
             } else if (jsonElementValue.isJsonObject()) {
                 type = getJsonObjectType(property, (JsonObject) jsonElementValue);
-                addProperty(stringBuilder, property, type, null);
+                addProperty(stringBuilder, property, type, "");
             } else if (jsonElementValue.isJsonNull()) {
                 addProperty(stringBuilder, property, type, null);
             }

src/wu/seal/jsontokotlin/MakeKotlinClassAction.java

@@ -1,9 +1,6 @@
 package wu.seal.jsontokotlin;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
+import com.google.gson.*;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -25,6 +22,7 @@
 import javax.swing.text.JTextComponent;
 import java.awt.*;
 import java.awt.event.ActionEvent;
+import java.util.IllegalFormatFlagsException;
 
 /**
  * Created by Seal.Wu on 2017/8/18.
@@ -54,13 +52,11 @@ public void actionPerformed(AnActionEvent event) {
         }
         final Messages.InputDialog inputDialog = new Messages.InputDialog(project, "Please input the Json Data", "Input Json"
                 , Messages.getInformationIcon(), "", new InputValidator() {
-            private final Gson gson = new Gson();
-
             @Override
             public boolean checkInput(String inputString) {
                 try {
-                    JsonElement jsonElement = gson.fromJson(inputString, JsonObject.class);
-                    return true;
+                    JsonElement jsonElement = new JsonParser().parse(inputString);
+                    return jsonElement.isJsonObject() || jsonElement.isJsonArray();
                 } catch (JsonSyntaxException e) {
                     return false;
                 }
@@ -123,8 +119,14 @@ protected JComponent createScrollableTextComponent() {
         final Document document = editor.getDocument();
         ImportClassWriter.INSTANCE.insertImportClassCode(project, document);
 
-        final KotlinMaker maker = new KotlinMaker(className, jsonString);
-        final VirtualFile virtualFile = FileDocumentManager.getInstance().getFile(document);
+        final KotlinMaker maker;
+        try {
+            maker = new KotlinMaker(className, jsonString);
+        } catch (IllegalFormatFlagsException e) {
+            e.printStackTrace();
+            Messages.showErrorDialog(e.getMessage(), "Unsupport Json");
+            return;
+        }
 
         CommandProcessor.getInstance().executeCommand(project, new Runnable() {
             @Override
@@ -144,7 +146,7 @@ public void run() {
                         } else {
                             offset = document.getTextLength() - 1;
                         }
-                        document.insertString(offset, maker.makeKotlinData());
+                        document.insertString(Math.max(offset, 0), maker.makeKotlinData());
 
                     }
                 });

src/wu/seal/jsontokotlin/NoneSupporter.kt

@@ -1,6 +1,7 @@
 package wu.seal.jsontokotlin
 
 /**
+ *
  * Created by Seal.Wu on 2017/9/18.
  */
 

src/wu/seal/jsontokotlin/Panel.kt

@@ -51,6 +51,9 @@ class PropertyPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(
 }
 
 
+/**
+ * Comment Config Panel
+ */
 class CommentConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(layout, isDoubleBuffered) {
 
     constructor(layout: LayoutManager?) : this(layout, false)
@@ -88,7 +91,9 @@ class CommentConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JP
 
 }
 
-
+/**
+ * Target JsonLib ConfigPanel
+ */
 class TargetJsonLibConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(layout, isDoubleBuffered) {
 
     constructor(layout: LayoutManager?) : this(layout, false)

src/wu/seal/jsontokotlin/Property.kt

@@ -27,10 +27,10 @@ class KProperty(val rawPropertyName: String, val propertyType: String, val prope
 
         } else if (ConfigManager.targetJsonConverterLib == TargetJsonConverter.Gson) {
 
-            blockBulder.append(GsonSupportor.getGsonSupportorProperty(rawPropertyName, propertyType))
+            blockBulder.append(GsonSupporter.getGsonSupportorProperty(rawPropertyName, propertyType))
         }
 
-        if (!ConfigManager.isCommentOff) {
+        if (!ConfigManager.isCommentOff && propertyValue.isNotBlank()) {
             blockBulder.append(" //").append(propertyValue)
         }