refactor code builder module complete third step with 2 test cases not passed

Author: wuseal

src/main/kotlin/extensions/nstd/DataClassCodeBuilderForNoConstructorMemberFields.kt

@@ -0,0 +1,64 @@
+package extensions.nstd
+
+import wu.seal.jsontokotlin.model.builder.IKotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
+import wu.seal.jsontokotlin.utils.addIndent
+import wu.seal.jsontokotlin.utils.getCommentCode
+import wu.seal.jsontokotlin.utils.toAnnotationComments
+
+/**
+ * kotlin class code generator
+ *
+ * Created by Nstd on 2020/6/29 15:40.
+ */
+class DataClassCodeBuilderForNoConstructorMemberFields(private val kotlinDataClassCodeBuilder: IKotlinDataClassCodeBuilder) :
+    IKotlinDataClassCodeBuilder {
+
+    override fun DataClass.genBody(): String {
+        val delegateBody = kotlinDataClassCodeBuilder.run { genBody() }
+        val noConstructorMemberFields = genNoConstructorProperties()
+        return buildString {
+            if (delegateBody.isEmpty()) {
+                append(noConstructorMemberFields)
+            } else{
+                appendLine(noConstructorMemberFields)
+                append(delegateBody)
+            }
+        }
+    }
+
+    override fun DataClass.genClassComment(): String {
+        return kotlinDataClassCodeBuilder.run { genClassComment() }
+    }
+
+    override fun DataClass.genClassAnnotations(): String {
+        return kotlinDataClassCodeBuilder.run { genClassAnnotations() }
+    }
+
+    override fun DataClass.genClassName(): String {
+        return kotlinDataClassCodeBuilder.run { genClassName() }
+    }
+
+
+    override fun DataClass.genParentClass(): String {
+        return kotlinDataClassCodeBuilder.run { genParentClass() }
+    }
+
+    override fun DataClass.genPrimaryConstructorProperties(): String {
+        return ""
+    }
+
+    private fun DataClass.genNoConstructorProperties(): String {
+        return buildString {
+            properties.filterNot { excludedProperties.contains(it.name) }.forEachIndexed { index, property ->
+                val addIndentCode = property.getCode().addIndent(indent)
+                val commentCode = getCommentCode(property.comment)
+                if (fromJsonSchema && commentCode.isNotBlank()) {
+                    append(commentCode.toAnnotationComments(indent))
+                }
+                append(addIndentCode)
+                if (!fromJsonSchema && commentCode.isNotBlank()) append(" // ").append(commentCode)
+            }
+        }
+    }
+}

src/main/kotlin/extensions/nstd/ReplaceConstructorParametersByMemberVariablesSupport.kt

@@ -3,6 +3,7 @@ package extensions.nstd
 import extensions.Extension
 import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
 import wu.seal.jsontokotlin.model.builder.KotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
@@ -36,19 +37,19 @@ object ReplaceConstructorParametersByMemberVariablesSupport : Extension() {
 
         return jHorizontalLinearLayout {
             jCheckBox(
-                    "Replace constructor parameters by member variables",
-                    getConfig(configKey).toBoolean(),
-                    { isSelected -> setConfig(configKey, isSelected.toString()) }
+                "Replace constructor parameters by member variables",
+                getConfig(configKey).toBoolean(),
+                { isSelected -> setConfig(configKey, isSelected.toString()) }
             )
             fillSpace()
         }
     }
 
     override fun intercept(kotlinClass: KotlinClass): KotlinClass {
-        CodeBuilderConfig.instance.setConfig(
-                KotlinDataClassCodeBuilder.CONF_KOTLIN_IS_USE_CONSTRUCTOR_PARAMETER,
-                !getConfig(configKey).toBoolean()
-        )
+        if (getConfig(configKey).toBoolean())
+            if (kotlinClass is DataClass) {
+                return kotlinClass.copy(codeBuilder = DataClassCodeBuilderForNoConstructorMemberFields(kotlinClass.codeBuilder))
+            }
         return kotlinClass
     }
 }

src/main/kotlin/extensions/wu/seal/DataClassCodeBuilderDisableDataClass.kt

@@ -0,0 +1,37 @@
+package extensions.wu.seal
+
+import wu.seal.jsontokotlin.model.builder.IKotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
+
+/**
+ * kotlin class code generator with internal modifier before class
+ *
+ * Created by Seal on 2020/7/7 21:40.
+ */
+class DataClassCodeBuilderDisableDataClass(private val kotlinDataClassCodeBuilder: IKotlinDataClassCodeBuilder) :
+    IKotlinDataClassCodeBuilder {
+    override fun DataClass.genClassComment(): String {
+        return kotlinDataClassCodeBuilder.run { genClassComment() }
+    }
+
+    override fun DataClass.genClassAnnotations(): String {
+        return kotlinDataClassCodeBuilder.run { genClassAnnotations() }
+    }
+
+    override fun DataClass.genClassName(): String {
+        val originClassName = kotlinDataClassCodeBuilder.run { genClassName() }
+        return originClassName.replace("data ", "")
+    }
+
+    override fun DataClass.genParentClass(): String {
+        return kotlinDataClassCodeBuilder.run { genParentClass() }
+    }
+
+    override fun DataClass.genBody(): String {
+        return kotlinDataClassCodeBuilder.run { genBody() }
+    }
+
+    override fun DataClass.genPrimaryConstructorProperties(): String {
+        return kotlinDataClassCodeBuilder.run { genPrimaryConstructorProperties() }
+    }
+}

src/main/kotlin/extensions/wu/seal/DataClassCodeBuilderForInternalClass.kt

@@ -0,0 +1,37 @@
+package extensions.wu.seal
+
+import wu.seal.jsontokotlin.model.builder.IKotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
+
+/**
+ * kotlin class code generator with internal modifier before class
+ *
+ * Created by Seal on 2020/7/7 21:40.
+ */
+class DataClassCodeBuilderForInternalClass(private val kotlinDataClassCodeBuilder: IKotlinDataClassCodeBuilder) :
+    IKotlinDataClassCodeBuilder {
+
+    override fun DataClass.genClassName(): String {
+        val originClassName = kotlinDataClassCodeBuilder.run { genClassName() }
+        return "internal $originClassName"
+    }
+    override fun DataClass.genClassComment(): String {
+        return kotlinDataClassCodeBuilder.run { genClassComment() }
+    }
+
+    override fun DataClass.genClassAnnotations(): String {
+        return kotlinDataClassCodeBuilder.run { genClassAnnotations() }
+    }
+
+    override fun DataClass.genParentClass(): String {
+        return kotlinDataClassCodeBuilder.run { genParentClass() }
+    }
+
+    override fun DataClass.genBody(): String {
+        return kotlinDataClassCodeBuilder.run { genBody() }
+    }
+
+    override fun DataClass.genPrimaryConstructorProperties(): String {
+        return kotlinDataClassCodeBuilder.run { genPrimaryConstructorProperties() }
+    }
+}

src/main/kotlin/extensions/wu/seal/DisableDataClassSupport.kt

@@ -3,6 +3,7 @@ package extensions.wu.seal
 import extensions.Extension
 import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
 import wu.seal.jsontokotlin.model.builder.KotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
@@ -18,16 +19,19 @@ object DisableDataClassSupport : Extension() {
     override fun createUI(): JPanel {
 
         return jHorizontalLinearLayout {
-            jCheckBox("Disable Kotlin Data Class", getConfig(configKey).toBoolean(), { isSelected -> setConfig(configKey, isSelected.toString()) })
+            jCheckBox(
+                "Disable Kotlin Data Class",
+                getConfig(configKey).toBoolean(),
+                { isSelected -> setConfig(configKey, isSelected.toString()) })
             fillSpace()
         }
     }
 
     override fun intercept(kotlinClass: KotlinClass): KotlinClass {
-        CodeBuilderConfig.instance.setConfig(
-                KotlinDataClassCodeBuilder.CONF_KOTLIN_IS_DATA_CLASS,
-                !getConfig(configKey).toBoolean()
-        )
+        if (getConfig(configKey).toBoolean())
+            if (kotlinClass is DataClass) {
+                return kotlinClass.copy(codeBuilder = DataClassCodeBuilderDisableDataClass(kotlinClass.codeBuilder))
+            }
         return kotlinClass
     }
 }

src/main/kotlin/extensions/wu/seal/InternalModifierSupport.kt

@@ -1,7 +1,7 @@
 package extensions.wu.seal
 
 import extensions.Extension
-import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
@@ -23,10 +23,10 @@ object InternalModifierSupport : Extension() {
     }
 
     override fun intercept(kotlinClass: KotlinClass): KotlinClass {
-        CodeBuilderConfig.instance.setConfig(
-            CONFIG_KEY,
-            getConfig(CONFIG_KEY).toBoolean()
-        )
+        if (getConfig(CONFIG_KEY).toBoolean())
+            if (kotlinClass is DataClass) {
+                return kotlinClass.copy(codeBuilder = DataClassCodeBuilderForInternalClass(kotlinClass.codeBuilder))
+            }
         return kotlinClass
     }
 }

src/main/kotlin/extensions/yuan/varenyzc/BuildFromJsonObjectSupport.kt

@@ -3,6 +3,7 @@ package extensions.yuan.varenyzc
 import extensions.Extension
 import wu.seal.jsontokotlin.model.builder.CodeBuilderConfig
 import wu.seal.jsontokotlin.model.builder.KotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
 import wu.seal.jsontokotlin.ui.jCheckBox
 import wu.seal.jsontokotlin.ui.jHorizontalLinearLayout
@@ -20,16 +21,21 @@ object BuildFromJsonObjectSupport : Extension() {
                 getConfig(configKey).toBoolean(),
                 { isSelected -> setConfig(configKey, isSelected.toString()) }
             )
-            add(jLink("Know about this extension", "https://github.com/wuseal/JsonToKotlinClass/blob/master/build_from_jsonobject_tip.md"))
+            add(
+                jLink(
+                    "Know about this extension",
+                    "https://github.com/wuseal/JsonToKotlinClass/blob/master/build_from_jsonobject_tip.md"
+                )
+            )
             fillSpace()
         }
     }
 
     override fun intercept(kotlinClass: KotlinClass): KotlinClass {
-        CodeBuilderConfig.instance.setConfig(
-            KotlinDataClassCodeBuilder.CONF_BUILD_FROM_JSON_OBJECT,
-            getConfig(configKey).toBoolean()
-        )
+        if (getConfig(configKey).toBoolean())
+            if (kotlinClass is DataClass) {
+                return kotlinClass.copy(codeBuilder = DataClassCodeBuilderForAddingBuildFromJsonObject(kotlinClass.codeBuilder))
+            }
         return kotlinClass
     }
 

src/main/kotlin/extensions/yuan/varenyzc/DataClassCodeBuilderForAddingBuildFromJsonObject.kt

@@ -0,0 +1,97 @@
+package extensions.yuan.varenyzc
+
+import wu.seal.jsontokotlin.model.builder.IKotlinDataClassCodeBuilder
+import wu.seal.jsontokotlin.model.classscodestruct.DataClass
+import wu.seal.jsontokotlin.utils.newLine
+import wu.seal.jsontokotlin.utils.times
+
+/**
+ * kotlin class code generator for adding buildFromJsonObject function
+ *
+ * Created by Seal on 2020/7/7 21:45.
+ */
+class DataClassCodeBuilderForAddingBuildFromJsonObject(private val kotlinDataClassCodeBuilder: IKotlinDataClassCodeBuilder) :
+    IKotlinDataClassCodeBuilder {
+
+    private val baseTypeList = listOf<String>("Int", "String", "Boolean", "Double", "Float", "Long")
+
+    override fun DataClass.genBody(): String {
+        val delegateBody = kotlinDataClassCodeBuilder.run { genBody() }
+        val buildFromJsonObjectFunctionCode = genBuildFromJsonObjectCode()
+        return buildString {
+            if (delegateBody.isEmpty()) {
+                append(buildFromJsonObjectFunctionCode)
+            }else{
+                appendLine(delegateBody)
+                append(buildFromJsonObjectFunctionCode)
+            }
+        }
+    }
+
+    private fun DataClass.genBuildFromJsonObjectCode(): String {
+        return buildString {
+            append(indent * 1).append("companion object {").newLine()
+            append(indent * 2).append("@JvmStatic").newLine()
+            append(indent * 2).append("fun buildFromJson(jsonObject: JSONObject?): $name? {").newLine().newLine()
+            append(indent * 3).append("jsonObject?.run {").newLine()
+            append(indent * 4).append("return $name(").newLine()
+            properties.filterNot { excludedProperties.contains(it.name) }.forEachIndexed { index, property ->
+                when {
+                    baseTypeList.contains(property.type.replace("?", "")) -> {
+                        append(indent * 5).append("opt${property.type.replace("?", "")}(\"${property.originName}\")")
+                    }
+                    property.type.contains("List<") -> {
+                        val type = property.type.substring(property.type.indexOf('<') + 1, property.type.indexOf('>'))
+                        append(indent * 5).append("Array${property.type.replace("?", "")}().apply {").newLine()
+                        append(indent * 6).append("optJSONArray(\"${property.originName}\")?.let {").newLine()
+                        append(indent * 7).append("for(i in 0 until it.length()) {").newLine()
+                        append(indent * 8).append("this.add($type.buildFromJson(it.getJSONObject(i)))").newLine()
+                        append(indent * 7).append("}").newLine()
+                        append(indent * 6).append("}").newLine()
+                        append(indent * 5).append("}")
+                    }
+                    else -> {
+                        append(indent * 5).append(
+                            "${
+                                property.type.replace(
+                                    "?",
+                                    ""
+                                )
+                            }.buildFromJson(optJSONObject(\"${property.originName}\"))"
+                        )
+                    }
+                }
+
+                if (index < properties.size - 1) {
+                    append(",")
+                }
+                newLine()
+            }
+            append(indent * 4).append(")").newLine()
+            append(indent * 3).append("}").newLine()
+            append(indent * 3).append("return null").newLine()
+            append(indent * 2).append("}").newLine()
+            append(indent * 1).append("}")
+        }
+    }
+
+    override fun DataClass.genClassName(): String {
+        return  kotlinDataClassCodeBuilder.run { genClassName() }
+    }
+
+    override fun DataClass.genClassComment(): String {
+        return kotlinDataClassCodeBuilder.run { genClassComment() }
+    }
+
+    override fun DataClass.genClassAnnotations(): String {
+        return kotlinDataClassCodeBuilder.run { genClassAnnotations() }
+    }
+
+    override fun DataClass.genParentClass(): String {
+        return kotlinDataClassCodeBuilder.run { genParentClass() }
+    }
+
+    override fun DataClass.genPrimaryConstructorProperties(): String {
+        return kotlinDataClassCodeBuilder.run { genPrimaryConstructorProperties() }
+    }
+}

src/main/kotlin/extensions/yuan/varenyzc/NeedNonNullableClassesSupport.kt

@@ -1,6 +1,5 @@
 package extensions.yuan.varenyzc
 
-import com.intellij.util.ui.JBDimension
 import extensions.Extension
 import wu.seal.jsontokotlin.model.classscodestruct.DataClass
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass

src/main/kotlin/wu/seal/jsontokotlin/model/builder/ICodeBuilder.kt

@@ -1,13 +1,18 @@
 package wu.seal.jsontokotlin.model.builder
 
 import wu.seal.jsontokotlin.model.classscodestruct.KotlinClass
+import wu.seal.jsontokotlin.utils.getIndent
 
 /**
  * Code generator interface
  *
  * Created by Nstd on 2020/6/29 15:27.
  */
 interface ICodeBuilder<C : KotlinClass> {
+
+    val indent: String
+        get() = getIndent()
+
     /**
      * get the code (include referenced classes) string for writing into file or printing out
      */