Merge pull request #111 from kezhenxu94/master

kezhenxu94 · web-flow · commit 758e6faa4b81 · 2019-01-28T13:40:13.000+08:00
polishing code
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/IConfigManager.kt b/src/main/kotlin/wu/seal/jsontokotlin/IConfigManager.kt
@@ -95,11 +95,6 @@ interface IConfigManager {
             PropertiesComponent.getInstance().setValue(TARGET_JSON_CONVERTER_LIB_KEY, value.name)
         }
 
-    @Deprecated("Not use since Version 2.0")
-    var isPropertyNullable: Boolean
-        get() = PropertiesComponent.getInstance().isTrueValue(IS_PROPERTY_NULLABLE_KEY)
-        set(value) = PropertiesComponent.getInstance().setValue(IS_PROPERTY_NULLABLE_KEY, value)
-
     var propertyTypeStrategy: PropertyTypeStrategy
         get() = if (TestConfig.isTestModel) TestConfig.propertyTypeStrategy else PropertyTypeStrategy.valueOf(
             PropertiesComponent.getInstance().getValue(
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt b/src/main/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt
@@ -96,8 +96,8 @@ class KotlinCodeMaker {
         stringBuilder.append(" {")
         stringBuilder.append("\n")
         val nestedClassCode = toBeAppend.joinToString("\n\n") {
-            it.split("\n").joinToString("\n") {
-                indent + it
+            it.split("\n").joinToString("\n") { line ->
+                indent + line
             }
         }
         stringBuilder.append(nestedClassCode)
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/KotlinDataClassMaker.kt b/src/main/kotlin/wu/seal/jsontokotlin/KotlinDataClassMaker.kt
@@ -126,9 +126,9 @@ class KotlinDataClassMaker(private val rootClassName: String, private val json:
             newKotlinDataClass: ParsedKotlinDataClass
     ) {
         classes.forEach {
-            it.properties.forEach {
-                if (it.kotlinDataClassPropertyTypeRef == originDataClass) {
-                    it.kotlinDataClassPropertyTypeRef = newKotlinDataClass
+            it.properties.forEach { p ->
+                if (p.kotlinDataClassPropertyTypeRef == originDataClass) {
+                    p.kotlinDataClassPropertyTypeRef = newKotlinDataClass
                 }
             }
         }
@@ -140,17 +140,17 @@ class KotlinDataClassMaker(private val rootClassName: String, private val json:
     fun synchronizedPropertyTypeWithTypeRef(unSynchronizedTypeClasses: List<ParsedKotlinDataClass>): List<ParsedKotlinDataClass> {
         return unSynchronizedTypeClasses.map { dataClass: ParsedKotlinDataClass ->
 
-            val newProperties = dataClass.properties.map { it ->
-                if (it.kotlinDataClassPropertyTypeRef != ParsedKotlinDataClass.NONE) {
-                    val rawPropertyReferenceType = getRawType(getChildType(it.propertyType))
+            val newProperties = dataClass.properties.map { property ->
+                if (property.kotlinDataClassPropertyTypeRef != ParsedKotlinDataClass.NONE) {
+                    val rawPropertyReferenceType = getRawType(getChildType(property.propertyType))
                     val tobeReplaceNewType =
-                            it.propertyType.replace(rawPropertyReferenceType, it.kotlinDataClassPropertyTypeRef.name)
-                    if (it.propertyValue.isNotBlank()) {
-                        it.copy(propertyType = tobeReplaceNewType, propertyValue = getDefaultValue(tobeReplaceNewType))
+                            property.propertyType.replace(rawPropertyReferenceType, property.kotlinDataClassPropertyTypeRef.name)
+                    if (property.propertyValue.isNotBlank()) {
+                        property.copy(propertyType = tobeReplaceNewType, propertyValue = getDefaultValue(tobeReplaceNewType))
                     } else
-                        it.copy(propertyType = tobeReplaceNewType)
+                        property.copy(propertyType = tobeReplaceNewType)
                 } else {
-                    it
+                    property
                 }
             }
             dataClass.copy(properties = newProperties)
@@ -188,4 +188,4 @@ class KotlinDataClassMaker(private val rootClassName: String, private val json:
         return newClassName
     }
 
-}
+}
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/KotlinDataClass.kt b/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/KotlinDataClass.kt
@@ -28,12 +28,12 @@ data class KotlinDataClass(
             } else {
                 append("data class ").append(name).append("(").append("\n")
             }
-            properties.forEach {
-                val code = it.getCode()
+            properties.forEach { p ->
+                val code = p.getCode()
                 val addIndentCode = code.split("\n").joinToString("\n") { indent + it }
                 append(addIndentCode)
-                if (it.isLast.not()) append(",")
-                if (it.comment.isNotBlank()) append(" // ").append(getCommentCode(it.comment))
+                if (p.isLast.not()) append(",")
+                if (p.comment.isNotBlank()) append(" // ").append(getCommentCode(p.comment))
                 append("\n")
             }
             append(")")
@@ -51,13 +51,13 @@ data class KotlinDataClass(
             }
         }
         return if (extraIndent.isNotEmpty()) {
-            code.split("\n").map {
+            code.split("\n").joinToString("\n") {
                 if (it.isNotBlank()) {
                     extraIndent + it
                 } else {
                     it
                 }
-            }.joinToString("\n")
+            }
         } else {
             code
         }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/Property.kt b/src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/Property.kt
@@ -18,7 +18,7 @@ data class Property(
 
         return buildString {
             if (annotations.isNotEmpty()) {
-                val annotationsCode = annotations.map { it.getAnnotationString() }.joinToString("\n")
+                val annotationsCode = annotations.joinToString("\n") { it.getAnnotationString() }
                 if (annotationsCode.isNotBlank()) {
                     append(annotationsCode).append("\n")
                 }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/codeelements/KName.kt b/src/main/kotlin/wu/seal/jsontokotlin/codeelements/KName.kt
@@ -22,21 +22,21 @@ abstract class KName : IKName {
     )
 
 
-    protected val illegalCharacter = listOf<String>(
+    protected val illegalCharacter = listOf(
             "\\+", "\\-", "\\*", "/", "%", "=", "&", "\\|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)", "\\\\", "\"", "_"
             , ",", "\\.", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "\\^", "#", "\\", "/", " ", "\t", "\n"
     )
 
 
-    protected val nameSeparator = listOf<String>(" ", "_", "\\-", ":")
+    protected val nameSeparator = listOf(" ", "_", "\\-", ":")
 
 
     /**
      * remove the start number or whiteSpace characters in this string
      */
     protected fun removeStartNumberAndIllegalCharacter(it: String): String {
 
-        val numberAndIllegalCharacters = listOf<String>(*illegalCharacter.toTypedArray(), "\\d")
+        val numberAndIllegalCharacters = listOf(*illegalCharacter.toTypedArray(), "\\d")
 
         val firstNumberAndIllegalCharactersRegex = "^(${numberAndIllegalCharacters.toRegex()})+".toRegex()
 
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationKotlinDataClassInterceptor.kt b/src/main/kotlin/wu/seal/jsontokotlin/interceptor/MinimalAnnotationKotlinDataClassInterceptor.kt
@@ -10,11 +10,11 @@ import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
 class MinimalAnnotationKotlinDataClassInterceptor : IKotlinDataClassInterceptor {
 
     override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
-        val newProperties = kotlinDataClass.properties.map {
-            if (it.originName == it.name) {
-                it.copy(annotations = it.annotations.filter { it.rawName.isBlank() })
+        val newProperties = kotlinDataClass.properties.map { p ->
+            if (p.originName == p.name) {
+                p.copy(annotations = p.annotations.filter { it.rawName.isBlank() })
             } else {
-                it
+                p
             }
         }
 
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/ui/JsonInputDialog.kt b/src/main/kotlin/wu/seal/jsontokotlin/ui/JsonInputDialog.kt
@@ -2,7 +2,6 @@ package wu.seal.jsontokotlin.ui
 
 import com.google.gson.*
 import com.intellij.json.JsonFileType
-import com.intellij.openapi.application.Application
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt b/src/main/kotlin/wu/seal/jsontokotlin/utils/KotlinDataClassFileGenerator.kt
@@ -151,9 +151,9 @@ class KotlinDataClassFileGenerator(private val interceptors: List<IKotlinDataCla
         newKotlinDataClass: ParsedKotlinDataClass
     ) {
         classes.forEach {
-            it.properties.forEach {
-                if (it.kotlinDataClassPropertyTypeRef == originDataClass) {
-                    it.kotlinDataClassPropertyTypeRef = newKotlinDataClass
+            it.properties.forEach { p ->
+                if (p.kotlinDataClassPropertyTypeRef == originDataClass) {
+                    p.kotlinDataClassPropertyTypeRef = newKotlinDataClass
                 }
             }
         }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/utils/classblockparse/ClassCodeParser.kt b/src/main/kotlin/wu/seal/jsontokotlin/utils/classblockparse/ClassCodeParser.kt
@@ -156,15 +156,15 @@ class ClassCodeParser(private val classBlockString: String) {
     private fun getPropertyValue(propertyLine: String, isLastLine: Boolean): String {
         val deleteCommentPropertyLine = propertyLine.substringBefore("//")
         val typeAndValueBlock = deleteCommentPropertyLine.substringAfterLast(":")
-        if (typeAndValueBlock.contains("=")) {
+        return if (typeAndValueBlock.contains("=")) {
             val propertyValuePre = typeAndValueBlock.split("=")[1]
-            return if (isLastLine) {
+            if (isLastLine) {
                 propertyValuePre.trim()
             } else {
                 propertyValuePre.trim().dropLast(1)
             }
         } else {
-            return ""
+            ""
         }
 
     }
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/ConfigManagerTestHelper.kt b/src/test/kotlin/wu/seal/jsontokotlin/ConfigManagerTestHelper.kt
@@ -38,7 +38,7 @@ class ConfigManagerTestHelper {
         }
     }
 
-    fun testAllNoBoolConfigWithAction(action: () -> Unit) {
+    private fun testAllNoBoolConfigWithAction(action: () -> Unit) {
         traverseConfigOnAction(ConfigManager::indent, listOf(2,4,8)){
             traverseConfigOnAction(ConfigManager::propertyTypeStrategy, PropertyTypeStrategy.values().toList()){
                 traverseConfigOnAction(ConfigManager::targetJsonConverterLib,TargetJsonConverter.values().toList()){
@@ -47,12 +47,12 @@ class ConfigManagerTestHelper {
             }
         }
     }
-    fun traverseBoolConfigOnAction(boolConfig: KMutableProperty0<Boolean>, action: () -> Unit) {
+    private fun traverseBoolConfigOnAction(boolConfig: KMutableProperty0<Boolean>, action: () -> Unit) {
         traverseConfigOnAction(boolConfig, listOf(true, false), action)
     }
 
 
-    fun <R> traverseConfigOnAction(config: KMutableProperty0<R>, configAbleValues: List<R>, action: () -> Unit) {
+    private fun <R> traverseConfigOnAction(config: KMutableProperty0<R>, configAbleValues: List<R>, action: () -> Unit) {
         configAbleValues.forEach {
             config.set(it)
             action()
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue090Test.kt b/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue090Test.kt
@@ -3,13 +3,12 @@ package wu.seal.jsontokotlin.regression
 import com.winterbe.expekt.should
 import org.junit.Before
 import org.junit.Test
-import wu.seal.jsontokotlin.KotlinCodeMaker
 import wu.seal.jsontokotlin.KotlinDataClassCodeMaker
 import wu.seal.jsontokotlin.test.TestConfig
 
 class Issue090Test {
 
-    val rawJson = """{
+    private val rawJson = """{
   "id": 1441,
   "name": "SOAP DISPENSER WITH ALL-PURPOSE VALVE",
   "slug": "soap-dispenser-with-all-purpose-valve",
@@ -385,4 +384,4 @@ data class Test(
         result.trimMargin().should.be.equal(expectedResult.trimMargin())
     }
 
-}
+}
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue094Test.kt b/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue094Test.kt
@@ -26,7 +26,6 @@ class Issue094Test {
     fun testIssue094() {
         TestConfig.setToTestInitState()
         val generated = KotlinDataClassCodeMaker("A", testJson).makeKotlinDataClassCode()
-        println("generated = ${generated}")
         generated.should.be.equal(expected)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ class KotlinCodeMaker {`
`96`	`96`	`stringBuilder.append(" {")`
`97`	`97`	`stringBuilder.append("\n")`
`98`	`98`	`val nestedClassCode = toBeAppend.joinToString("\n\n") {`
`99`		`- it.split("\n").joinToString("\n") {`
`100`		`- indent + it`
	`99`	`+ it.split("\n").joinToString("\n") { line ->`
	`100`	`+ indent + line`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`stringBuilder.append(nestedClassCode)`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ data class KotlinDataClass(`
`28`	`28`	`} else {`
`29`	`29`	`append("data class ").append(name).append("(").append("\n")`
`30`	`30`	`}`
`31`		`- properties.forEach {`
`32`		`- val code = it.getCode()`
	`31`	`+ properties.forEach { p ->`
	`32`	`+ val code = p.getCode()`
`33`	`33`	`val addIndentCode = code.split("\n").joinToString("\n") { indent + it }`
`34`	`34`	`append(addIndentCode)`
`35`		`- if (it.isLast.not()) append(",")`
`36`		`- if (it.comment.isNotBlank()) append(" // ").append(getCommentCode(it.comment))`
	`35`	`+ if (p.isLast.not()) append(",")`
	`36`	`+ if (p.comment.isNotBlank()) append(" // ").append(getCommentCode(p.comment))`
`37`	`37`	`append("\n")`
`38`	`38`	`}`
`39`	`39`	`append(")")`
`@@ -51,13 +51,13 @@ data class KotlinDataClass(`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`return if (extraIndent.isNotEmpty()) {`
`54`		`- code.split("\n").map {`
	`54`	`+ code.split("\n").joinToString("\n") {`
`55`	`55`	`if (it.isNotBlank()) {`
`56`	`56`	`extraIndent + it`
`57`	`57`	`} else {`
`58`	`58`	`it`
`59`	`59`	`}`
`60`		`- }.joinToString("\n")`
	`60`	`+ }`
`61`	`61`	`} else {`
`62`	`62`	`code`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ data class Property(`
`18`	`18`
`19`	`19`	`return buildString {`
`20`	`20`	`if (annotations.isNotEmpty()) {`
`21`		`- val annotationsCode = annotations.map { it.getAnnotationString() }.joinToString("\n")`
	`21`	`+ val annotationsCode = annotations.joinToString("\n") { it.getAnnotationString() }`
`22`	`22`	`if (annotationsCode.isNotBlank()) {`
`23`	`23`	`append(annotationsCode).append("\n")`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass`
`10`	`10`	`class MinimalAnnotationKotlinDataClassInterceptor : IKotlinDataClassInterceptor {`
`11`	`11`
`12`	`12`	`override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {`
`13`		`- val newProperties = kotlinDataClass.properties.map {`
`14`		`- if (it.originName == it.name) {`
`15`		`- it.copy(annotations = it.annotations.filter { it.rawName.isBlank() })`
	`13`	`+ val newProperties = kotlinDataClass.properties.map { p ->`
	`14`	`+ if (p.originName == p.name) {`
	`15`	`+ p.copy(annotations = p.annotations.filter { it.rawName.isBlank() })`
`16`	`16`	`} else {`
`17`		`- it`
	`17`	`+ p`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,9 @@ class KotlinDataClassFileGenerator(private val interceptors: List<IKotlinDataCla`
`151`	`151`	`newKotlinDataClass: ParsedKotlinDataClass`
`152`	`152`	`) {`
`153`	`153`	`classes.forEach {`
`154`		`- it.properties.forEach {`
`155`		`- if (it.kotlinDataClassPropertyTypeRef == originDataClass) {`
`156`		`- it.kotlinDataClassPropertyTypeRef = newKotlinDataClass`
	`154`	`+ it.properties.forEach { p ->`
	`155`	`+ if (p.kotlinDataClassPropertyTypeRef == originDataClass) {`
	`156`	`+ p.kotlinDataClassPropertyTypeRef = newKotlinDataClass`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,15 +156,15 @@ class ClassCodeParser(private val classBlockString: String) {`
`156`	`156`	`private fun getPropertyValue(propertyLine: String, isLastLine: Boolean): String {`
`157`	`157`	`val deleteCommentPropertyLine = propertyLine.substringBefore("//")`
`158`	`158`	`val typeAndValueBlock = deleteCommentPropertyLine.substringAfterLast(":")`
`159`		`- if (typeAndValueBlock.contains("=")) {`
	`159`	`+ return if (typeAndValueBlock.contains("=")) {`
`160`	`160`	`val propertyValuePre = typeAndValueBlock.split("=")[1]`
`161`		`- return if (isLastLine) {`
	`161`	`+ if (isLastLine) {`
`162`	`162`	`propertyValuePre.trim()`
`163`	`163`	`} else {`
`164`	`164`	`propertyValuePre.trim().dropLast(1)`
`165`	`165`	`}`
`166`	`166`	`} else {`
`167`		`- return ""`
	`167`	`+ ""`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`}`