Release version 1.2.1

Fix insert improt class code upon package declare
Format property name and class name to camelcase

Author: seal

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>wu.seal.tool.jsontokotlin</id>
   <name>JsonToKotlinClass</name>
-  <version>1.2</version>
+  <version>1.2.1</version>
   <vendor email="[email protected]" url="https://www.github.com/wuseal">Seal</vendor>
 
   <description><![CDATA[
@@ -11,6 +11,10 @@
     ]]></description>
 
   <change-notes><![CDATA[
+    1.2.1:
+      * Fix insert improt class code upon package declare
+      * Format property name and class name to camelcase name
+    1.2:
       * Add support for generate anotations for target json lib --gson<br>
       * Add Comment option to switch the comment content to append<br>
     ]]>

src/wu/seal/jsontokotlin/ClassName.kt

@@ -20,27 +20,55 @@ object KClassName : IKClassName {
 
     private val ilegalCharactor = listOf<String>(
             "\\+", "\\-", "\\*", "/", "%", "=", "&", "|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)"
-            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "^", "#", "\\", "/", " "
+            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "^", "#", "\\", "/"
     )
 
     private val suffix = "X"
 
 
     override fun getLegalClassName(rawClassName: String): String {
 
-        val pattern = "${ilegalCharactor}"
+        /**
+         * keep " " character
+         */
+        val pattern = "$ilegalCharactor".replace(" ", "")
 
         val temp = rawClassName.replace(Regex(pattern), "").let {
 
             return@let removeStartNumber(it)
 
         }
 
-        return if (temp in ilegalClassNameList) {
-            return temp + suffix
+        val upperCamelCase = toUpperCamelCase(temp)
+
+        val legalName = toBeLegalName(upperCamelCase)
+
+        return legalName
+    }
+
+    private fun toBeLegalName(name: String): String {
+        val legalName = if (name in ilegalClassNameList) {
+            name + suffix
         } else {
-            temp
+            name
+        }
+        return legalName
+    }
+
+    private fun toUpperCamelCase(temp: String): String {
+
+        val stringBuilder = StringBuilder()
+
+        temp.split(Regex("[_ ]")).forEach {
+            if (it.isNotBlank()) {
+                stringBuilder.append(it.substring(0, 1).toUpperCase().plus(it.substring(1)))
+            }
         }
+
+        val upperCamelCaseName = stringBuilder.toString()
+
+        return upperCamelCaseName
+
     }
 
     /**

src/wu/seal/jsontokotlin/ConfigManager.kt

@@ -5,7 +5,7 @@ import com.intellij.ide.util.PropertiesComponent
 /**
  * ConfigManager
  * main purpose to obtain the detail corresponding config And the entry of modify
- * Created by LENOVO on 2017/9/13.
+ * Created by Seal.Wu on 2017/9/13.
  */
 interface IConfigManager {
 
@@ -16,7 +16,7 @@ interface IConfigManager {
         get() = "target_json_converter_lib_key"
 
     private val IS_COMMENT_OFF: String
-        get() = "need comment_key"
+        get() = "need_comment_key"
 
 
     var isPropertiesVar: Boolean

src/wu/seal/jsontokotlin/ImportClassWriter.kt

@@ -54,9 +54,9 @@ object ImportClassWriter : IImportClassWriter {
         val text = editFile.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)
+            val packageIndex = text.indexOf("package ")
+            val importIndex = Math.max(text.lastIndexOf("import"), packageIndex)
+            val insertIndex = if (importIndex == -1) 0 else editFile.getLineEndOffset(editFile.getLineNumber(importIndex))
 
             CommandProcessor.getInstance().executeCommand(project, {
                 ApplicationManager.getApplication().runWriteAction {

src/wu/seal/jsontokotlin/KotlinMaker.java

@@ -12,7 +12,6 @@
  * Created by seal.wu on 2017/8/21.
  */
 public class KotlinMaker {
-    private final static Gson gson = new Gson();
 
     private String className;
     private JsonElement inputElement;

src/wu/seal/jsontokotlin/NoneSupporter.kt

@@ -10,11 +10,18 @@ interface INoneLibSupporter {
      * create property String block
      */
     fun getNoneLibSupporterProperty(rawPropertyName: String, propertyType: String): String
+
+
+    fun getNoneLibSupporterClassName(rawClassName: String)
+
 }
 
 
 object NoneSupporter : INoneLibSupporter {
 
+    override fun getNoneLibSupporterClassName(rawClassName: String) {
+    }
+
 
     override fun getNoneLibSupporterProperty(rawPropertyName: String, propertyType: String): String {
 

src/wu/seal/jsontokotlin/PropertyName.kt

@@ -15,12 +15,11 @@ interface IPropertyNameMaker {
     /**
      * make legal property name from a input raw string
      */
-    fun makePropertyName(rawString: String, needTransformtToIlegalNameMaker: Boolean): String
+    fun makePropertyName(rawString: String, needTransformToLegalName: Boolean): String
 
 
 }
 
-
 object PropertyNameMaker : IPropertyNameMaker {
 
 
@@ -32,33 +31,73 @@ object PropertyNameMaker : IPropertyNameMaker {
 
     private val ilegalCharactor = listOf<String>(
             "\\+", "\\-", "\\*", "/", "%", "=", "&", "|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)"
-            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "^", "#", "\\", "/", " "
+            , ",", ".", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "^", "#", "\\", "/"
     )
 
+    @JvmStatic
+    fun main(args: Array<String>) {
+        println(PropertyNameMaker.ilegalCharactor)
+    }
+
     private val suffix = "X"
 
     override fun makePropertyName(rawString: String): String {
 
         return rawString
     }
 
-    override fun makePropertyName(rawString: String, needTransformtToIlegalNameMaker: Boolean): String {
+    override fun makePropertyName(rawString: String, needTransformToLegalName: Boolean): String {
+
+        if (needTransformToLegalName) {
+
+            /**
+             * keep character " "
+             */
+            val pattern = "$ilegalCharactor".replace(" ", "")
 
+            val temp = rawString.replace(Regex(pattern), "").let {
 
-        val pattern = "$ilegalCharactor"
+                return@let removeStartNumber(it)
 
-        val temp = rawString.replace(Regex(pattern), "").let {
+            }
 
-            return@let removeStartNumber(it)
+            val lowerCamelCaseName = toLowerCamelCase(temp)
 
+            val legalName = toBeLegalName(lowerCamelCaseName)
+
+            return legalName
+
+        } else {
+            return rawString
         }
 
+    }
 
-        return if (temp in ilegalPropertyNameList) {
-            return temp + suffix
+    private fun toBeLegalName(name: String): String {
+        val legalName = if (name in ilegalPropertyNameList) {
+            name + suffix
         } else {
-            temp
+            name
         }
+        return legalName
+    }
+
+    private fun toLowerCamelCase(temp: String): String {
+
+        val stringBuilder = StringBuilder()
+
+        temp.split(Regex("[_ ]")).forEach {
+            if (it.isNotBlank()) {
+                stringBuilder.append(it.substring(0, 1).toUpperCase().plus(it.substring(1)))
+            }
+        }
+
+        val camelCaseName = stringBuilder.toString()
+
+        val lowerCamelCaseName = camelCaseName.substring(0, 1).toLowerCase().plus(camelCaseName.substring(1))
+
+        return lowerCamelCaseName
+
     }
 
     /**