Merge pull request #254 from wuseal/3.5.1

Release V3.5.1

Author: wuseal

src/main/kotlin/wu/seal/jsontokotlin/classscodestruct/Property.kt

@@ -11,11 +11,9 @@ data class Property(
     val comment: String = "",
     var isLast: Boolean = false,
     val refTypeId: Int = -1, // the id of property type,if can't reference in current generate classes ,use the default value -1
-    val typeObject: KotlinDataClass? = null//property type ref to the Kotlin Data Class Struct Object
+    val typeObject: KotlinDataClass? = null,//property type ref to the Kotlin Data Class Struct Object
+    private var separatorBetweenAnnotationAndProperty:String = "\n"
 ) {
-
-    private var separatorBetweenAnnotationAndProperty = "\n"
-
     fun letLastAnnotationStayInSameLine() {
         separatorBetweenAnnotationAndProperty = " "
     }

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

@@ -63,7 +63,7 @@ class JsonInputDialog(classsName: String, private val project: Project) : Messag
                     label("JSON Text: ", 14f)()
                     label("Tips: you can use JSON string、http urls or local file just right click on text area", 12f)()
                     fillSpace()
-                    button("JSON Format") {
+                    button("Format") {
                         handleFormatJSONString()
                     }()
                 }()

src/main/resources/META-INF/plugin.xml

@@ -48,7 +48,11 @@
 
     <change-notes><![CDATA[
        <br>Bugs fix  </br>
+       <br>1. fix option :Keep Annotation and property in single line</br>
        <br>New Features </br>
+       <br>1. AndroidX @Keep Annotation support</br>
+       <br>2. Support Init with default JSON value</br>
+       <br>3. Make dot to be word separate character</br>
        <br>Note:</br>
        <a href="https://github.com/wuseal/JsonToKotlinClass/milestone/11"> detail update</a></br>
     ]]>

src/test/kotlin/extensions/ted/zeng/PropertyAnnotationLineSupportTest.kt

@@ -3,6 +3,7 @@ package extensions.ted.zeng
 import com.winterbe.expekt.should
 import org.junit.Before
 import org.junit.Test
+import wu.seal.jsontokotlin.KotlinCodeMaker
 import wu.seal.jsontokotlin.generateKotlinDataClass
 import wu.seal.jsontokotlin.interceptor.annotations.fastjson.AddFastJsonAnnotationInterceptor
 import wu.seal.jsontokotlin.test.TestConfig
@@ -30,4 +31,14 @@ class PropertyAnnotationLineSupportTest {
         result.should.equal(expectResult)
     }
 
+    @Test
+    fun finalClassCodeTest() {
+        val expectResult = """data class Test(
+    @SerializedName("a") val a: String = "", // a
+    @SerializedName("Int") val int: Int = 0 // 2
+)"""
+        PropertyAnnotationLineSupport.getTestHelper().setConfig("ted.zeng.property_annotation_in_same_line_enable", "true")
+        val resultCode = KotlinCodeMaker("Test", json).makeKotlinData()
+        resultCode.should.be.equal(expectResult)
+    }
 }