Release Version 1.4.1

Fix two issues

Author: seal

JsonToKotlin.iml

@@ -5,6 +5,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />

README.md

@@ -20,6 +20,9 @@ I am a plugin for Kotlin to convert Json String into Kotlin data class code (Jso
 ### Overview
 Hi,This is a very cool tool for Kotlin developers ,It can convert the Json String into Kotlin Data Class code ,and paste it into your editor file ,The tool could recognize the Primitive Type of Json String and make Type Identifier respectively ,It taste easily ,Just have test,guys! Just press short key ALT + K ,And then,start your Kotlin program travel ! JsonToKotlin make program more happy!
 ### Update Log
+#### 1.4.1
+  * Fix an issue about Fastjson property name [#Issue9](https://github.com/wuseal/JsonToKotlinClass/issues/9)
+  * Fix an issue about using in none network condition it will be stuck [#Issue10](https://github.com/wuseal/JsonToKotlinClass/issues/10) 
 #### 1.4
  * Add supporter for Jackson annotation generate,supporter json lib --Jackson.
  * Add supporter for Fastjson annotation generate,supporter json lib --Fastjson.

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>wu.seal.tool.jsontokotlin</id>
   <name>JsonToKotlinClass</name>
-  <version>1.4</version>
+  <version>1.4.1</version>
   <vendor email="[email protected]" url="https://www.github.com/wuseal">Seal</vendor>
 
   <description><![CDATA[
@@ -11,6 +11,9 @@
     ]]></description>
 
   <change-notes><![CDATA[
+    1.4.1:<br>
+      * Fix an issue about Fastjson property name [#ISSUE9](https://github.com/wuseal/JsonToKotlinClass/issues/9)<br>
+      * Fix an issue about using in none network condition it will be stuck [#ISSUE10](https://github.com/wuseal/JsonToKotlinClass/issues/10)<br>
     1.4:<br>
       * Add supporter for Jackson annotation generate,supporter json lib --Jackson.<br>
       * Add supporter for Fastjson annotation generate,supporter json lib --Fastjson.<br>

src/wu/seal/jsontokotlin/FastjsonSupporter.kt

@@ -25,7 +25,7 @@ object FastjsonSupporter:IJsonLibSupporter {
 
         fastjsonSupportPropertyBuilder.append(" ")
 
-        fastjsonSupportPropertyBuilder.append(KPropertyName.getName(rawPropertyName))
+        fastjsonSupportPropertyBuilder.append(KPropertyName.getName(removeStartIsCharactors(rawPropertyName)))
 
         fastjsonSupportPropertyBuilder.append(": ")
 
@@ -40,5 +40,16 @@ object FastjsonSupporter:IJsonLibSupporter {
         return fastjsonSupportPropertyBuilder.toString()
     }
 
+    private fun removeStartIsCharactors(rawPropertyName: String): String {
+        if (rawPropertyName.startsWith("is")) {
 
+            var modifyPropertyName = rawPropertyName.removePrefix("is")
+            while (modifyPropertyName.startsWith("is")) {
+                modifyPropertyName = modifyPropertyName.removePrefix("is")
+            }
+            return modifyPropertyName
+        } else {
+            return rawPropertyName
+        }
+    }
 }

src/wu/seal/jsontokotlin/JsonToKotlinApplication.kt

@@ -10,7 +10,7 @@ import wu.seal.jsontokotlin.statistics.sendHistoryActionInfo
  * Created by Seal.wu on 2017/8/21.
  */
 
-const val PLUGIN_VERSION = "1.4"
+const val PLUGIN_VERSION = "1.4.1"
 
 class JsonToKotlinApplication : ApplicationComponent {
 

src/wu/seal/jsontokotlin/KotlinMaker.kt

@@ -96,7 +96,7 @@ class KotlinMaker {
 fun main(args: Array<String>) {
     isTestModel = true
     val json1 = """{ "progr ammers": [
-                { "FirstName": "Brett", "lastName":"McLaughlin", "email": "aaaa" },
+                { "isFirstName": "Brett", "lastName":"McLaughlin", "email": "aaaa" },
                 { "firstName": "Jason", "lastName":"Hunter", "email": "bbbb" },
                 { "firstName": "Elliotte", "lastName":"Harold", "email": "cccc" }
                 ],

src/wu/seal/jsontokotlin/MakeKotlinClassAction.kt

@@ -75,7 +75,9 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             }
 
             Messages.showMessageDialog(project, "Kotlin Code insert successfully!", "Information", Messages.getInformationIcon())
-            sendActionInfo(gson.toJson(SuccessCompleteAction()))
+            Thread {
+                sendActionInfo(gson.toJson(SuccessCompleteAction()))
+            }.start()
         } catch(e: Exception) {
             getUncaughtExceptionHandler(jsonString) {
                 Messages.showErrorDialog("I am sorry,JsonToKotlin may occur a RuntimeException,You could try again later or recover to the old version", "Occur a fatal error")

test/wu/seal/jsontokotlin/FastjsonSupporterTest.kt

@@ -0,0 +1,36 @@
+package wu.seal.jsontokotlin
+
+import org.junit.*
+
+import org.junit.Assert.*
+
+/**
+ * Created by Seal.Wu on 2017/10/19.
+ */
+class FastjsonSupporterTest {
+    @org.junit.Test
+    fun getJsonLibSupportPropertyBlockString() {
+
+        isTestModel = true
+
+        val propertyStringBlock1 = FastjsonSupporter.getJsonLibSupportPropertyBlockString("ABC", "String")
+        val propertyStringBlock2 = FastjsonSupporter.getJsonLibSupportPropertyBlockString("isABC", "String")
+        val propertyStringBlock3 = FastjsonSupporter.getJsonLibSupportPropertyBlockString("isisisABC", "String")
+        val propertyStringBlock4 = FastjsonSupporter.getJsonLibSupportPropertyBlockString("ISABC", "String")
+        val propertyStringBlock5 = FastjsonSupporter.getJsonLibSupportPropertyBlockString("isISABC", "String")
+
+        println(propertyStringBlock1)
+        println(propertyStringBlock2)
+        println(propertyStringBlock3)
+        println(propertyStringBlock4)
+        println(propertyStringBlock5)
+
+        assertFalse(propertyStringBlock1.startsWith("is"))
+        assertFalse(propertyStringBlock2.startsWith("is"))
+        assertFalse(propertyStringBlock3.startsWith("is"))
+        assertFalse(propertyStringBlock4.startsWith("is"))
+        assertFalse(propertyStringBlock5.startsWith("is"))
+
+    }
+
+}