Fixed interceptors not work on nested classes

sealkingking · sealkingking · commit 33848edc9951 · 2018-06-25T23:03:40.000+08:00
Fixed issue #44
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/ConfigManager.kt b/src/main/kotlin/wu/seal/jsontokotlin/ConfigManager.kt
@@ -13,6 +13,7 @@ object ConfigManager : IConfigManager {
     private const val ENABLE_MAP_TYP_KEY = "json-to-kotlin-class-enable-map-type"
     private const val ENABLE_AUTO_REFORMAT = "json-to-kotlin-class-enable-auto-reformat"
     private const val ENABLE_MINIMAL_ANNOTATION = "json-to-kotlin-class-enable-minimal-annotation"
+    private const val PARENT_CLASS_TEMPLATE = "json-to-kotlin-class-parent-class-template"
 
     var indent: Int
         get() = if (TestConfig.isTestModel) TestConfig.indent else PropertiesComponent.getInstance().getInt(
@@ -52,4 +53,18 @@ object ConfigManager : IConfigManager {
                 PropertiesComponent.getInstance().setValue(ENABLE_MINIMAL_ANNOTATION, value, false)
             }
         }
+
+    var parenClassTemplate: String
+        get() = if (TestConfig.isTestModel) {
+            TestConfig.parenClassTemplate
+        } else {
+            PropertiesComponent.getInstance().getValue(PARENT_CLASS_TEMPLATE, "")
+        }
+        set(value) {
+            if (TestConfig.isTestModel) {
+                TestConfig.parenClassTemplate = value
+            } else {
+                PropertiesComponent.getInstance().setValue(PARENT_CLASS_TEMPLATE, value, "")
+            }
+        }
 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/ImportClassWriter.kt b/src/main/kotlin/wu/seal/jsontokotlin/ImportClassWriter.kt
@@ -2,8 +2,9 @@ package wu.seal.jsontokotlin
 
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.project.Project
-import sun.tools.java.ClassDeclaration
+import wu.seal.jsontokotlin.interceptor.InterceptorManager
 import wu.seal.jsontokotlin.supporter.*
+import wu.seal.jsontokotlin.utils.ImportClassDeclaration
 import wu.seal.jsontokotlin.utils.executeCouldRollBackAction
 
 /**
@@ -42,7 +43,7 @@ object ImportClassWriter : IImportClassWriter {
             TargetJsonConverter.Custom -> insertCustomImportClass(project, editFile)
 
             else -> {
-                println("No need to import any Class code")
+                writeImportClassDeclaration(editFile, "", project)
             }
         }
     }
@@ -67,13 +68,20 @@ object ImportClassWriter : IImportClassWriter {
     private fun insertImportClassString(editFile: Document, importClassString: String, project: Project?) {
 
         val text = editFile.text
-        importClassString.split("\n").forEach { importClassLineString ->
+
+        val interceptedImportClassDeclaration = ImportClassDeclaration.applyImportClassDeclarationInterceptors(
+            importClassString,
+            InterceptorManager.getEnabledImportClassDeclarationInterceptors()
+        )
+
+        interceptedImportClassDeclaration.split("\n").forEach { importClassLineString ->
 
             if (importClassLineString !in text) {
 
                 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))
+                val insertIndex =
+                    if (importIndex == -1) 0 else editFile.getLineEndOffset(editFile.getLineNumber(importIndex))
 
 
                 executeCouldRollBackAction(project) {
@@ -85,7 +93,7 @@ object ImportClassWriter : IImportClassWriter {
     }
 
     fun writeImportClassDeclaration(editFile: Document, classDeclaration: String, project: Project?) {
-        insertImportClassString(editFile,classDeclaration,project)
+        insertImportClassString(editFile, classDeclaration, project)
     }
 
 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/KotlinDataClassCodeMaker.kt b/src/main/kotlin/wu/seal/jsontokotlin/KotlinDataClassCodeMaker.kt
@@ -1,6 +1,6 @@
 package wu.seal.jsontokotlin
 
-import wu.seal.jsontokotlin.interceptor.IInterceptor
+import wu.seal.jsontokotlin.interceptor.IKotlinDataClassInterceptor
 import wu.seal.jsontokotlin.interceptor.InterceptorManager
 
 class KotlinDataClassCodeMaker(private val rootClassName: String, private val json: String) {
@@ -9,18 +9,18 @@ class KotlinDataClassCodeMaker(private val rootClassName: String, private val js
 
         return if (needMakeKotlinCodeByKotlinDataClass()) {
 
-            makeKotlinDataClassCode(InterceptorManager.getEnabledInterceptors())
+            makeKotlinDataClassCode(InterceptorManager.getEnabledKotlinDataClassInterceptors())
 
         } else {
             KotlinCodeMaker(rootClassName, json).makeKotlinData()
         }
     }
 
     private fun needMakeKotlinCodeByKotlinDataClass(): Boolean {
-        return InterceptorManager.getEnabledInterceptors().isNotEmpty()
+        return InterceptorManager.getEnabledKotlinDataClassInterceptors().isNotEmpty()
     }
 
-    fun makeKotlinDataClassCode(interceptors: List<IInterceptor>): String {
+    fun makeKotlinDataClassCode(interceptors: List<IKotlinDataClassInterceptor>): String {
         val kotlinDataClasses = KotlinDataClassMaker(rootClassName = rootClassName, json = json).makeKotlinDataClasses()
         val interceptedDataClasses = kotlinDataClasses.map {it.applyInterceptors(interceptors)}
         val code = interceptedDataClasses.joinToString("\n\n") {
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt b/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt
@@ -132,10 +132,10 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
 
                 offset = caret.offset
                 if (offset == 0) {
-                    offset = document.textLength - 1
+                    offset = document.textLength
                 }
             } else {
-                offset = document.textLength - 1
+                offset = document.textLength
             }
             document.insertString(
                 Math.max(offset, 0),
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/KotlinDataClass.kt b/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/KotlinDataClass.kt
@@ -1,6 +1,6 @@
 package wu.seal.jsontokotlin.classscodestruct
 
-import wu.seal.jsontokotlin.interceptor.IInterceptor
+import wu.seal.jsontokotlin.interceptor.IKotlinDataClassInterceptor
 import wu.seal.jsontokotlin.utils.classblockparse.ParsedKotlinDataClass
 import wu.seal.jsontokotlin.utils.getCommentCode
 import wu.seal.jsontokotlin.utils.getIndent
@@ -68,14 +68,22 @@ data class KotlinDataClass(
         return ParsedKotlinDataClass(annotationCodeList, name, parsedProperties)
     }
 
-    fun applyInterceptors(interceptors: List<IInterceptor>): KotlinDataClass {
+    fun applyInterceptors(interceptors: List<IKotlinDataClassInterceptor>): KotlinDataClass {
         var kotlinDataClass = this
         interceptors.forEach {
-            kotlinDataClass = it.intercept(kotlinDataClass)
+            kotlinDataClass = kotlinDataClass.applyInterceptorWithNestedClasses(it)
         }
         return kotlinDataClass
     }
 
+    fun applyInterceptorWithNestedClasses(interceptor: IKotlinDataClassInterceptor): KotlinDataClass {
+        if (nestedClasses.isNotEmpty()) {
+            val newNestedClasses = nestedClasses.map { it.applyInterceptorWithNestedClasses(interceptor) }
+            return interceptor.intercept(this).copy(nestedClasses = newNestedClasses)
+        }
+        return interceptor.intercept(this)
+    }
+
     companion object {
 
         fun fromParsedKotlinDataClass(parsedKotlinDataClass: ParsedKotlinDataClass): KotlinDataClass {
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/IImportClassDeclarationInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/IImportClassDeclarationInterceptor.kt
@@ -0,0 +1,12 @@
+package wu.seal.jsontokotlin.interceptor
+
+/**
+ * Insert import class code
+ */
+interface IImportClassDeclarationInterceptor {
+
+    /**
+     * intercept the import class declaration code insert to the origin import classes declaration code
+     */
+    fun intercept(originImportClasses: String):String
+}
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/IKotlinDataClassInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/IKotlinDataClassInterceptor.kt
@@ -5,7 +5,7 @@ import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
 /**
  * Interceptor for code transform
  */
-interface IInterceptor {
+interface IKotlinDataClassInterceptor {
 
     /**
      * intercept the kotlindataclass and modify the class,the function will return a new  Kotlin Data Class Object
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/InterceptorManager.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/InterceptorManager.kt
@@ -4,15 +4,28 @@ import wu.seal.jsontokotlin.ConfigManager
 
 object InterceptorManager {
 
-    fun getEnabledInterceptors() :List<IInterceptor>{
+    fun getEnabledKotlinDataClassInterceptors() :List<IKotlinDataClassInterceptor>{
 
-        val interceptors = mutableListOf<IInterceptor>()
+        val interceptors = mutableListOf<IKotlinDataClassInterceptor>()
         if (ConfigManager.enableMinimalAnnotation) {
-            interceptors.add(MinimalAnnotationInterceptor())
+            interceptors.add(MinimalAnnotationKotlinDataClassInterceptor())
         }
 
+        if (ConfigManager.parenClassTemplate.isNotBlank()) {
+            interceptors.add(ParentClassTemplateKotlinDataClassInterceptor())
+        }
         return interceptors
     }
 
 
+    fun getEnabledImportClassDeclarationInterceptors(): List<IImportClassDeclarationInterceptor>{
+
+        return mutableListOf<IImportClassDeclarationInterceptor>().apply {
+
+            if (ConfigManager.parenClassTemplate.isNotBlank()) {
+                add(ParentClassImportClassDeclarationInterceptor())
+            }
+        }
+    }
+
 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationKotlinDataClassInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationKotlinDataClassInterceptor.kt
@@ -5,7 +5,7 @@ import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
 /**
  * interceptor to make the code to be like the minimal annotation
  */
-class MinimalAnnotationInterceptor() : IInterceptor {
+class MinimalAnnotationKotlinDataClassInterceptor() : IKotlinDataClassInterceptor {
 
     override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
         val newProperties = kotlinDataClass.properties.map {
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassImportClassDeclarationInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassImportClassDeclarationInterceptor.kt
@@ -0,0 +1,15 @@
+package wu.seal.jsontokotlin.interceptor
+
+import wu.seal.jsontokotlin.ConfigManager
+
+
+/**
+ * insert parent class declaration code
+ */
+class ParentClassImportClassDeclarationInterceptor : IImportClassDeclarationInterceptor {
+
+    override fun intercept(originImportClasses: String): String {
+        val parentClassImportDeclaration = "import ${ConfigManager.parenClassTemplate.substringBeforeLast("(").trim()}"
+        return "$originImportClasses\n$parentClassImportDeclaration".trim()
+    }
+}
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassTemplateKotlinDataClassInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassTemplateKotlinDataClassInterceptor.kt
@@ -0,0 +1,15 @@
+package wu.seal.jsontokotlin.interceptor
+
+import wu.seal.jsontokotlin.ConfigManager
+import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
+
+class ParentClassTemplateKotlinDataClassInterceptor : IKotlinDataClassInterceptor {
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+
+        val parentClassTemplateSimple = ConfigManager.parenClassTemplate.substringAfterLast(".")
+        return kotlinDataClass.copy(parentClassTemplate = parentClassTemplateSimple)
+    }
+
+
+}
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/test/TestConfig.kt b/src/main/kotlin/wu/seal/jsontokotlin/test/TestConfig.kt
@@ -36,6 +36,8 @@ object TestConfig {
 
     var enableMinimalAnnotation = false
 
+    var parenClassTemplate = ""
+
     private var state = State()
 
     fun setToTestInitState() {
@@ -56,24 +58,10 @@ object TestConfig {
 
         indent = 4
 
+        parenClassTemplate = ""
     }
 
 
-    fun setToTestPureNestedClassInitState() {
-        isTestModel = true
-        isCommentOff = true
-        isPropertiesVar = false
-        targetJsonConvertLib = TargetJsonConverter.None
-        propertyTypeStrategy = PropertyTypeStrategy.NotNullable
-        initWithDefaultValue = false
-        isNestedClassModel = true
-        customPropertyAnnotationFormatString = ""
-        customClassAnnotationFormatString = ""
-        customAnnotaionImportClassString = ""
-        enableMinimalAnnotation = false
-
-    }
-
     fun saveState() {
         val newState = State()
         newState.isTestModel = isTestModel
@@ -88,6 +76,7 @@ object TestConfig {
         newState.customClassAnnotationFormatString = customClassAnnotationFormatString
         newState.customAnnotaionImportClassString = customAnnotaionImportClassString
         newState.enableMinimalAnnotation = enableMinimalAnnotation
+        newState.parenClassTemplate = parenClassTemplate
         state = newState
     }
 
@@ -103,6 +92,7 @@ object TestConfig {
         customClassAnnotationFormatString = state.customClassAnnotationFormatString
         customAnnotaionImportClassString = state.customAnnotaionImportClassString
         enableMinimalAnnotation = state.enableMinimalAnnotation
+        parenClassTemplate = state.parenClassTemplate
     }
 
     class State {
@@ -124,5 +114,7 @@ object TestConfig {
         var enableAutoReformat: Boolean = true
         var enableMinimalAnnotation = false
 
+        var parenClassTemplate = ""
+
     }
 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/ui/SettingsOtherTab.kt b/src/main/kotlin/wu/seal/jsontokotlin/ui/SettingsOtherTab.kt
@@ -50,18 +50,19 @@ class SettingsOtherTab(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPan
 
         val enableMinimalAnnotation = JBCheckBox("Only create annotations when needed")
         enableMinimalAnnotation.isSelected = ConfigManager.enableMinimalAnnotation
-        enableMinimalAnnotation.addActionListener { ConfigManager.enableMinimalAnnotation = enableMinimalAnnotation.isSelected }
+        enableMinimalAnnotation.addActionListener {
+            ConfigManager.enableMinimalAnnotation = enableMinimalAnnotation.isSelected
+        }
 
 
         val enableAutoReformat =
             JBCheckBox("Auto reformatting generated code according to code style.")
         val enableAutoReformatNoteLable = JBLabel("(Note that the Indent option bellow would be ignored.)")
-        enableAutoReformatNoteLable.border = JBEmptyBorder(0,25,0,0)
+        enableAutoReformatNoteLable.border = JBEmptyBorder(0, 25, 0, 0)
         enableAutoReformat.isSelected = ConfigManager.enableAutoReformat
         enableAutoReformat.addActionListener { ConfigManager.enableAutoReformat = enableAutoReformat.isSelected }
 
 
-
         val indentJPanel = JPanel()
         indentJPanel.layout = FlowLayout(FlowLayout.LEFT)
         indentJPanel.add(JBLabel("Indent (number of space): "))
@@ -94,6 +95,23 @@ class SettingsOtherTab(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPan
         indentField.text = ConfigManager.indent.toString()
         indentJPanel.add(indentField)
 
+        val parentClassPanel = JPanel()
+        parentClassPanel.border = JBEmptyBorder(0)
+        parentClassPanel.layout = FlowLayout(FlowLayout.LEFT)
+        parentClassPanel.add(JBLabel("Parent Class Template: "))
+        val parentClassField = JBTextField(20)
+        parentClassField.text = ConfigManager.parenClassTemplate
+        parentClassField.addFocusListener(object : FocusListener {
+            override fun focusGained(e: FocusEvent?) {
+            }
+
+            override fun focusLost(e: FocusEvent?) {
+                ConfigManager.parenClassTemplate = parentClassField.text
+            }
+
+        })
+        parentClassPanel.add(parentClassField)
+
         add(Box.createVerticalStrut(JBUI.scale(10)))
 
         addComponentIntoVerticalBoxAlignmentLeft(enableComment)
@@ -115,9 +133,14 @@ class SettingsOtherTab(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPan
         addComponentIntoVerticalBoxAlignmentLeft(enableAutoReformat)
         addComponentIntoVerticalBoxAlignmentLeft(enableAutoReformatNoteLable)
 
-        add(Box.createVerticalStrut(JBUI.scale(20)))
+        add(Box.createVerticalStrut(JBUI.scale(10)))
 
         addComponentIntoVerticalBoxAlignmentLeft(indentJPanel)
+
+        add(Box.createVerticalStrut(JBUI.scale(10)))
+
+        addComponentIntoVerticalBoxAlignmentLeft(parentClassPanel)
+
     }
 
 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/utils/ImportClassDeclaration.kt b/src/main/kotlin/wu/seal/jsontokotlin/utils/ImportClassDeclaration.kt
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt b/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationInterceptorTest.kt b/src/test/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationInterceptorTest.kt
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassImportClassDeclarationInterceptorTest.kt b/src/test/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassImportClassDeclarationInterceptorTest.kt
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassTemplateKotlinDataClassInterceptorTest.kt b/src/test/kotlin/wu/seal/jsontokotlin/interceptor/ParentClassTemplateKotlinDataClassInterceptorTest.kt

Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,10 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {`
`132`	`132`
`133`	`133`	`offset = caret.offset`
`134`	`134`	`if (offset == 0) {`
`135`		`- offset = document.textLength - 1`
	`135`	`+ offset = document.textLength`
`136`	`136`	`}`
`137`	`137`	`} else {`
`138`		`- offset = document.textLength - 1`
	`138`	`+ offset = document.textLength`
`139`	`139`	`}`
`140`	`140`	`document.insertString(`
`141`	`141`	`Math.max(offset, 0),`