Merge pull request #253 from wuseal/3.5.1

wuseal · web-flow · commit 990bcfe5d46d · 2019-11-09T15:55:58.000+08:00
3.5.1
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'kotlin'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'wu.seal'
-version '3.5.0'
+version '3.5.1'
 
 intellij {
     version '2017.1'
diff --git a/src/main/kotlin/extensions/ExtensionsCollector.kt b/src/main/kotlin/extensions/ExtensionsCollector.kt
@@ -1,9 +1,11 @@
 package extensions
 
 import extensions.chen.biao.KeepAnnotationSupport
+import extensions.wu.seal.KeepAnnotationSupportForAndroidX
 import extensions.jose.han.ParcelableAnnotationSupport
 import extensions.ted.zeng.PropertyAnnotationLineSupport
 import extensions.wu.seal.ClassNameSuffixSupport
+import extensions.wu.seal.ForceInitDefaultValueWithOriginJsonValueSupport
 import extensions.wu.seal.PropertyPrefixSupport
 import extensions.wu.seal.PropertySuffixSupport
 import extensions.xu.rui.PrimitiveTypeNonNullableSupport
@@ -16,12 +18,14 @@ object ExtensionsCollector {
      * all extensions
      */
     val extensions = listOf(
-            KeepAnnotationSupport,
-            PropertyAnnotationLineSupport,
-            ParcelableAnnotationSupport,
-            PropertyPrefixSupport,
-            PropertySuffixSupport,
-            ClassNameSuffixSupport,
-            PrimitiveTypeNonNullableSupport
+        KeepAnnotationSupport,
+        KeepAnnotationSupportForAndroidX,
+        PropertyAnnotationLineSupport,
+        ParcelableAnnotationSupport,
+        PropertyPrefixSupport,
+        PropertySuffixSupport,
+        ClassNameSuffixSupport,
+        PrimitiveTypeNonNullableSupport,
+        ForceInitDefaultValueWithOriginJsonValueSupport
     )
 }
diff --git a/src/main/kotlin/extensions/wu/seal/ForceInitDefaultValueWithOriginJsonValueSupport.kt b/src/main/kotlin/extensions/wu/seal/ForceInitDefaultValueWithOriginJsonValueSupport.kt
@@ -0,0 +1,49 @@
+package extensions.wu.seal
+
+import extensions.Extension
+import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
+import wu.seal.jsontokotlin.codeelements.getDefaultValue
+import wu.seal.jsontokotlin.ui.checkBox
+import wu.seal.jsontokotlin.ui.horizontalLinearLayout
+import wu.seal.jsontokotlin.utils.TYPE_STRING
+import javax.swing.JPanel
+
+/**
+ * This extension make the default value of data class property to be json value
+ * This extension should be put at last
+ * Created by Seal.Wu on 2019-11-09
+ */
+object ForceInitDefaultValueWithOriginJsonValueSupport : Extension() {
+
+    private const val configKey = "wu.seal.force_init_default_value_with_origin_json_value"
+
+    override fun createUI(): JPanel {
+        return horizontalLinearLayout {
+            (checkBox(
+                "Force init Default Value With Origin Json Value",
+                getConfig(configKey).toBoolean()
+            ) { isSelectedAfterClick ->
+                setConfig(configKey, isSelectedAfterClick.toString())
+            })()
+            fillSpace()
+        }
+    }
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+        return if (getConfig(configKey).toBoolean()) {
+            val newP = kotlinDataClass.properties.map {
+                val newV = if (it.originJsonValue.isNullOrBlank()) getDefaultValue(it.type) else {
+                    if (it.type == TYPE_STRING) {
+                        """"${it.originJsonValue}""""
+                    } else {
+                        it.originJsonValue
+                    }
+                }
+                it.copy(value = newV)
+            }
+            kotlinDataClass.copy(properties = newP)
+        } else {
+            kotlinDataClass
+        }
+    }
+}
diff --git a/src/main/kotlin/extensions/wu/seal/KeepAnnotationSupportForAndroidX.kt b/src/main/kotlin/extensions/wu/seal/KeepAnnotationSupportForAndroidX.kt
@@ -0,0 +1,54 @@
+package extensions.wu.seal
+
+import extensions.Extension
+import wu.seal.jsontokotlin.classscodestruct.Annotation
+import wu.seal.jsontokotlin.classscodestruct.KotlinDataClass
+import wu.seal.jsontokotlin.ui.checkBox
+import wu.seal.jsontokotlin.ui.horizontalLinearLayout
+import javax.swing.JPanel
+
+/**
+ * @author Seal.Wu
+ * create at 2019/11/03
+ * description:
+ */
+object KeepAnnotationSupportForAndroidX : Extension() {
+
+
+    private const val configKey = "wu.seal.add_keep_annotation_enable_androidx"
+
+    override fun createUI(): JPanel {
+        return horizontalLinearLayout {
+            checkBox("Add @Keep Annotation On Class (AndroidX)", getConfig(configKey).toBoolean()) { isSelectedAfterClick ->
+                setConfig(configKey, isSelectedAfterClick.toString())
+            }()
+            fillSpace()
+        }
+    }
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+
+        return if (getConfig(configKey).toBoolean()) {
+
+            val classAnnotationString = "@Keep"
+
+            val classAnnotation = Annotation.fromAnnotationString(classAnnotationString)
+
+            return kotlinDataClass.copy(annotations = listOf(classAnnotation))
+        } else {
+            kotlinDataClass
+        }
+
+    }
+
+    override fun intercept(originClassImportDeclaration: String): String {
+
+        val classAnnotationImportClassString = "import androidx.annotation.Keep"
+
+        return if (getConfig(configKey).toBoolean()) {
+            originClassImportDeclaration.append(classAnnotationImportClassString)
+        } else {
+            originClassImportDeclaration
+        }
+    }
+}
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/codeelements/KName.kt b/src/main/kotlin/wu/seal/jsontokotlin/codeelements/KName.kt
@@ -24,11 +24,11 @@ abstract class KName : IKName {
 
     protected val illegalCharacter = listOf(
             "\\+", "\\-", "\\*", "/", "%", "=", "&", "\\|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)", "\\\\", "\"", "_"
-            , ",", "\\.", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "\\^", "#", "\\", "/", " ", "\t", "\n"
+            , ",", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "\\^", "#", "\\", "/", " ", "\t", "\n"
     )
 
 
-    protected val nameSeparator = listOf(" ", "_", "\\-", ":")
+    protected val nameSeparator = listOf(" ", "_", "\\-", ":","\\.")
 
 
     /**
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -47,11 +47,10 @@
 
 
     <change-notes><![CDATA[
-       <br>New UI&UX  </br>
        <br>Bugs fix  </br>
        <br>New Features </br>
        <br>Note:</br>
-       <a href="https://github.com/wuseal/JsonToKotlinClass/milestone/9"> detail update</a></br>
+       <a href="https://github.com/wuseal/JsonToKotlinClass/milestone/11"> detail update</a></br>
     ]]>
     </change-notes>
 
diff --git a/src/test/kotlin/extensions/wu/seal/ForceInitDefaultValueWithOriginJsonValueSupportTest.kt b/src/test/kotlin/extensions/wu/seal/ForceInitDefaultValueWithOriginJsonValueSupportTest.kt
@@ -0,0 +1,32 @@
+package extensions.wu.seal
+
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import wu.seal.jsontokotlin.applyInterceptor
+import wu.seal.jsontokotlin.generateKotlinDataClass
+import wu.seal.jsontokotlin.test.TestConfig
+
+class ForceInitDefaultValueWithOriginJsonValueSupportTest {
+    val json = """{"a":1}"""
+
+    val expectResult = """data class Test(
+    val a: Int = 1 // 1
+)"""
+    private  val configKey = "wu.seal.force_init_default_value_with_origin_json_value"
+
+
+    @Before
+    fun setUp() {
+        TestConfig.setToTestInitState()
+    }
+
+    @Test
+    fun intercept() {
+        ForceInitDefaultValueWithOriginJsonValueSupport.getTestHelper().setConfig(configKey,true.toString())
+        val dataClass =
+            json.generateKotlinDataClass("Test").applyInterceptor(ForceInitDefaultValueWithOriginJsonValueSupport)
+        val resultCode = dataClass.getCode()
+        resultCode.should.be.equal(expectResult)
+    }
+}
diff --git a/src/test/kotlin/extensions/wu/seal/KeepAnnotationSupportForAndroidXTest.kt b/src/test/kotlin/extensions/wu/seal/KeepAnnotationSupportForAndroidXTest.kt
@@ -0,0 +1,39 @@
+package extensions.wu.seal
+
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import wu.seal.jsontokotlin.generateKotlinDataClass
+import wu.seal.jsontokotlin.test.TestConfig
+
+/**
+ * @author Seal.Wu
+ * create at 2019/11/03
+ * description:
+ */
+class KeepAnnotationSupportForAndroidXTest {
+
+    val json = """{"name":"chenbiao"}"""
+
+
+    var expectResult = """@Keep
+data class Test(
+    val name: String // chenbiao
+)"""
+
+    @Before
+    fun setUp() {
+        TestConfig.setToTestInitState()
+    }
+
+    @Test
+    fun interceptTest(){
+        val kotlinDataClass = json.generateKotlinDataClass()
+        KeepAnnotationSupportForAndroidX.getTestHelper().setConfig("wu.seal.add_keep_annotation_enable_androidx","true")
+        val generatedCode = kotlinDataClass.applyInterceptors(listOf(KeepAnnotationSupportForAndroidX)).getCode()
+        print(generatedCode)
+        generatedCode.trimMargin().should.equal(expectResult.trimMargin())
+
+    }
+
+}
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt b/src/test/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue108Test.kt b/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue108Test.kt
@@ -2,8 +2,6 @@ package wu.seal.jsontokotlin.regression
 
 import com.winterbe.expekt.should
 import org.junit.Test
-import wu.seal.jsontokotlin.KotlinCodeMaker
-import wu.seal.jsontokotlin.KotlinDataClassCodeMaker
 import wu.seal.jsontokotlin.KotlinDataClassMaker
 import wu.seal.jsontokotlin.test.TestConfig
 
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue176Test.kt b/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue176Test.kt
@@ -178,7 +178,7 @@ class Issue176Test {
      */
     @Test
     fun testIssue176() {
-        val generated =  KotlinCodeMaker("Test",testJson).makeKotlinData()
+        val generated =  KotlinCodeMaker("Test", testJson).makeKotlinData()
         generated.trim().should.be.equal(expected)
     }
 }
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue249Test.kt b/src/test/kotlin/wu/seal/jsontokotlin/regression/Issue249Test.kt
@@ -0,0 +1,28 @@
+package wu.seal.jsontokotlin.regression
+
+import com.winterbe.expekt.should
+import org.junit.Test
+import wu.seal.jsontokotlin.KotlinCodeMaker
+import wu.seal.jsontokotlin.generateKotlinDataClass
+import wu.seal.jsontokotlin.test.TestConfig
+
+/**
+ * Created by Seal.Wu on 2019/11/9
+ * Description:
+ */
+class Issue249Test {
+
+    @Test
+    fun testIssue249() {
+        TestConfig.setToTestInitState()
+        val json="""{"mobile.agree_with_conditions":"yes"}"""
+        val expectCode = """
+            data class A(
+                @SerializedName("mobile.agree_with_conditions")
+                val mobileAgreeWithConditions: String = "" // yes
+            )
+            """.trimIndent()
+        val resultCode = KotlinCodeMaker("A", json).makeKotlinData()
+        resultCode.should.be.equal(expectCode)
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ abstract class KName : IKName {`
`24`	`24`
`25`	`25`	`protected val illegalCharacter = listOf(`
`26`	`26`	`"\\+", "\\-", "\\*", "/", "%", "=", "&", "\\\|", "!", "\\[", "\\]", "\\{", "\\}", "\\(", "\\)", "\\\\", "\"", "_"`
`27`		- , ",", "\\.", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "\\^", "#", "\\", "/", " ", "\t", "\n"
	`27`	+ , ",", ":", "\\?", "\\>", "\\<", "@", ";", "'", "\\`", "\\~", "\\$", "\\^", "#", "\\", "/", " ", "\t", "\n"
`28`	`28`	`)`
`29`	`29`
`30`	`30`
`31`		`- protected val nameSeparator = listOf(" ", "_", "\\-", ":")`
	`31`	`+ protected val nameSeparator = listOf(" ", "_", "\\-", ":","\\.")`
`32`	`32`
`33`	`33`
`34`	`34`	`/**`