Optimize package name declare in source code

Fix custom annotation doesn't work when second update

Author: seal

JsonToKotlinClass.iml

@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-171.4694.70" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

src/wu/seal/jsontokotlin/supporter/CustomJsonLibSupporter.kt

@@ -1,5 +1,6 @@
 package wu.seal.jsontokotlin.supporter
 
+import wu.seal.jsontokotlin.ConfigManager
 import wu.seal.jsontokotlin.codeelements.KPropertyKeyword
 import wu.seal.jsontokotlin.codeelements.KPropertyName
 import wu.seal.jsontokotlin.codeelements.getDefaultValue
@@ -11,17 +12,18 @@ import wu.seal.jsontokotlin.codeelements.getDefaultValue
 
 object CustomJsonLibSupporter : IJsonLibSupporter {
 
-    private val propertyAnnotation = wu.seal.jsontokotlin.ConfigManager.customAnnotaionFormatString
+    private val propertyAnnotation
+        get() = ConfigManager.customAnnotaionFormatString
 
 
     override val annotationImportClassString: String
-        get() = wu.seal.jsontokotlin.ConfigManager.customAnnotaionImportClassString
+        get() = ConfigManager.customAnnotaionImportClassString
 
     override fun getJsonLibSupportPropertyBlockString(rawPropertyName: String, propertyType: String): String {
 
         val customJsonLibSupportPropertyBuilder = StringBuilder()
 
-        customJsonLibSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.CustomJsonLibSupporter.propertyAnnotation.format(rawPropertyName))
+        customJsonLibSupportPropertyBuilder.append(CustomJsonLibSupporter.propertyAnnotation.format(rawPropertyName))
 
         customJsonLibSupportPropertyBuilder.append(" ")
 
@@ -35,7 +37,7 @@ object CustomJsonLibSupporter : IJsonLibSupporter {
 
         customJsonLibSupportPropertyBuilder.append(propertyType)
 
-        if (wu.seal.jsontokotlin.ConfigManager.initWithDefaultValue) {
+        if (ConfigManager.initWithDefaultValue) {
             customJsonLibSupportPropertyBuilder.append(" = ").append(getDefaultValue(propertyType))
         }
 

src/wu/seal/jsontokotlin/supporter/FastjsonSupporter.kt

@@ -22,7 +22,7 @@ object FastjsonSupporter : IJsonLibSupporter {
 
         val fastjsonSupportPropertyBuilder = StringBuilder()
 
-        fastjsonSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.FastjsonSupporter.propertyAnnotation.format(rawPropertyName))
+        fastjsonSupportPropertyBuilder.append(FastjsonSupporter.propertyAnnotation.format(rawPropertyName))
 
         fastjsonSupportPropertyBuilder.append(" ")
 

src/wu/seal/jsontokotlin/supporter/GsonSupporter.kt

@@ -23,10 +23,10 @@ interface IGsonSupporter {
 
 fun main(args: Array<String>) {
     wu.seal.jsontokotlin.isTestModel = true
-    println("getGsonSupporterProperty:\n ${wu.seal.jsontokotlin.supporter.GsonSupporter.getGsonSupporterProperty("seal is **() good_man ", "Boy")}")
+    println("getGsonSupporterProperty:\n ${GsonSupporter.getGsonSupporterProperty("seal is **() good_man ", "Boy")}")
 }
 
-object GsonSupporter : wu.seal.jsontokotlin.supporter.IGsonSupporter {
+object GsonSupporter : IGsonSupporter {
 
     /**
      * When adapter Gson lib at most ,We should import the Anotation Class
@@ -39,7 +39,7 @@ object GsonSupporter : wu.seal.jsontokotlin.supporter.IGsonSupporter {
 
         val gsonSupportPropertyBuilder = StringBuilder()
 
-        gsonSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.GsonSupporter.anotaionOnProperty.format(rawPropertyName))
+        gsonSupportPropertyBuilder.append(GsonSupporter.anotaionOnProperty.format(rawPropertyName))
 
         gsonSupportPropertyBuilder.append(" ")
 

src/wu/seal/jsontokotlin/supporter/JacksonSupporter.kt

@@ -22,18 +22,18 @@ interface IJacksonSupporter {
 
 fun main(args: Array<String>) {
     wu.seal.jsontokotlin.isTestModel = true
-    println("getGsonSupporterProperty:\n ${wu.seal.jsontokotlin.supporter.JacksonSupporter.getJacksonSupporterProperty("seal is **() good_man ", "Boy")}")
+    println("getGsonSupporterProperty:\n ${JacksonSupporter.getJacksonSupporterProperty("seal is **() good_man ", "Boy")}")
 }
 
-object JacksonSupporter : wu.seal.jsontokotlin.supporter.IJacksonSupporter {
+object JacksonSupporter : IJacksonSupporter {
 
     private val anotaionOnProperty = "@JsonProperty(\"%s\")"
 
     override fun getJacksonSupporterProperty(rawPropertyName: String, propertyType: String): String {
 
         val jacksonSupportPropertyBuilder = StringBuilder()
 
-        jacksonSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.JacksonSupporter.anotaionOnProperty.format(rawPropertyName))
+        jacksonSupportPropertyBuilder.append(JacksonSupporter.anotaionOnProperty.format(rawPropertyName))
 
         jacksonSupportPropertyBuilder.append(" ")
 

src/wu/seal/jsontokotlin/supporter/LoganSquareSupporter.kt

@@ -22,7 +22,7 @@ object LoganSquareSupporter : IJsonLibSupporter {
 
         val loganSquareSupportPropertyBuilder = StringBuilder()
 
-        loganSquareSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.LoganSquareSupporter.propertyAnnotation.format(rawPropertyName))
+        loganSquareSupportPropertyBuilder.append(LoganSquareSupporter.propertyAnnotation.format(rawPropertyName))
 
         loganSquareSupportPropertyBuilder.append(" ")
 

src/wu/seal/jsontokotlin/supporter/MoShiSupporter.kt

@@ -20,7 +20,7 @@ object MoShiSupporter : IJsonLibSupporter {
     override fun getJsonLibSupportPropertyBlockString(rawPropertyName: String, propertyType: String): String {
         val moShijsonSupportPropertyBuilder = StringBuilder()
 
-        moShijsonSupportPropertyBuilder.append(wu.seal.jsontokotlin.supporter.MoShiSupporter.propertyAnnotation.format(rawPropertyName))
+        moShijsonSupportPropertyBuilder.append(MoShiSupporter.propertyAnnotation.format(rawPropertyName))
 
         moShijsonSupportPropertyBuilder.append(" ")
 

src/wu/seal/jsontokotlin/ui/JsonInputDialog.kt

@@ -1,6 +1,7 @@
 package wu.seal.jsontokotlin.ui
 
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.InputValidator
 import com.intellij.openapi.ui.Messages
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.JBLabel
@@ -17,7 +18,7 @@ import javax.swing.event.DocumentEvent
  */
 
 
-class MyInputValidator : com.intellij.openapi.ui.InputValidator {
+class MyInputValidator : InputValidator {
 
     lateinit var classNameField: JTextField
     override fun checkInput(inputString: String): Boolean {
@@ -42,7 +43,7 @@ val myInputValidator = MyInputValidator()
 /**
  * Json input Dialog
  */
-class JsonInputDialog(project: Project) : Messages.InputDialog(project, "Please input the class name and JSON data for generating Kotlin data class", "Make Kotlin Data Class", Messages.getInformationIcon(), "", myInputValidator) {
+class JsonInputDialog(project: Project) : Messages.InputDialog(project, "Please input the class name and JSON text for generating Kotlin data class", "Make Kotlin Data Class", Messages.getInformationIcon(), "", myInputValidator) {
 
     private lateinit var classNameInput: JTextField
 
@@ -76,7 +77,7 @@ class JsonInputDialog(project: Project) : Messages.InputDialog(project, "Please
         classNameInputContainer.preferredSize = JBDimension(500, 50)
 
 
-        val createScrollableTextComponent = createScrollableTextComponent()
+        val createScrollableTextComponent = createMyScrollableTextComponent()
         val jsonInputContainer = createLinearLayoutVertical()
         val jsonTitle = JBLabel("JSON Text:")
         jsonTitle.border = JBEmptyBorder(5, 0, 5, 0)
@@ -117,7 +118,7 @@ class JsonInputDialog(project: Project) : Messages.InputDialog(project, "Please
     }
 
 
-    protected override fun createScrollableTextComponent(): javax.swing.JComponent {
+    protected  fun createMyScrollableTextComponent(): javax.swing.JComponent {
         return com.intellij.ui.components.JBScrollPane(myField)
     }