Merge pull request #261 from wuseal/fix#260

fix #260

Author: wuseal

src/main/kotlin/extensions/chen/biao/KeepAnnotationSupport.kt

@@ -34,7 +34,9 @@ object KeepAnnotationSupport : Extension() {
 
             val classAnnotation = Annotation.fromAnnotationString(classAnnotationString)
 
-            return kotlinDataClass.copy(annotations = listOf(classAnnotation))
+            val newAnnotations = mutableListOf(classAnnotation).also { it.addAll(kotlinDataClass.annotations) }
+
+            return kotlinDataClass.copy(annotations = newAnnotations)
         } else {
             kotlinDataClass
         }

src/main/kotlin/extensions/jose/han/ParcelableAnnotationSupport.kt

@@ -35,7 +35,9 @@ object ParcelableAnnotationSupport : Extension() {
             val classAnnotation1 = Annotation.fromAnnotationString(classAnnotationString1)
             val classAnnotation2 = Annotation.fromAnnotationString(classAnnotationString2)
 
-            return kotlinDataClass.copy(annotations = listOf(classAnnotation1, classAnnotation2), parentClassTemplate = "Parcelable")
+            val newAnnotations = mutableListOf(classAnnotation1,classAnnotation2).also { it.addAll(kotlinDataClass.annotations) }
+
+            return kotlinDataClass.copy(annotations = newAnnotations, parentClassTemplate = "Parcelable")
         } else {
             kotlinDataClass
         }

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

@@ -34,7 +34,9 @@ object KeepAnnotationSupportForAndroidX : Extension() {
 
             val classAnnotation = Annotation.fromAnnotationString(classAnnotationString)
 
-            return kotlinDataClass.copy(annotations = listOf(classAnnotation))
+            val newAnnotations = mutableListOf(classAnnotation).also { it.addAll(kotlinDataClass.annotations) }
+
+            return kotlinDataClass.copy(annotations = newAnnotations)
         } else {
             kotlinDataClass
         }

src/main/kotlin/wu/seal/jsontokotlin/interceptor/InterceptorManager.kt

@@ -50,9 +50,6 @@ object InterceptorManager {
                 TargetJsonConverter.Custom -> add(AddCustomAnnotationInterceptor())
                 TargetJsonConverter.Serilizable -> add(AddSerializableAnnotationInterceptor())
             }
-            if (ConfigManager.enableMinimalAnnotation) {
-                add(MinimalAnnotationKotlinDataClassInterceptor())
-            }
 
             if (ConfigManager.parenClassTemplate.isNotBlank()) {
                 add(ParentClassTemplateKotlinDataClassInterceptor())
@@ -70,6 +67,9 @@ object InterceptorManager {
             //add extensions's interceptor
             addAll(ExtensionsCollector.extensions)
         }.apply {
+            if (ConfigManager.enableMinimalAnnotation) {
+                add(MinimalAnnotationKotlinDataClassInterceptor())
+            }
             add(FinalKotlinDataClassWrapperInterceptor())
         }
     }

src/test/kotlin/wu/seal/jsontokotlin/regression/Issue260Test.kt

@@ -0,0 +1,67 @@
+package wu.seal.jsontokotlin.regression
+
+import com.winterbe.expekt.should
+import extensions.chen.biao.KeepAnnotationSupport
+import extensions.jose.han.ParcelableAnnotationSupport
+import extensions.wu.seal.KeepAnnotationSupportForAndroidX
+import org.junit.Test
+import wu.seal.jsontokotlin.KotlinCodeMaker
+import wu.seal.jsontokotlin.TargetJsonConverter
+import wu.seal.jsontokotlin.test.TestConfig
+
+class Issue260Test {
+
+    @Test
+    fun testIssue260() {
+        TestConfig.setToTestInitState()
+        TestConfig.targetJsonConvertLib = TargetJsonConverter.MoshiCodeGen
+        KeepAnnotationSupport.getTestHelper().setConfig("chen.biao.add_keep_annotation_enable",true.toString())
+        val json="""{"a":"yes"}"""
+        val expectCode = """
+            @Keep
+            @JsonClass(generateAdapter = true)
+            data class A(
+                @Json(name = "a")
+                val a: String = "" // yes
+            )
+            """.trimIndent()
+        val resultCode = KotlinCodeMaker("A", json).makeKotlinData()
+        resultCode.should.be.equal(expectCode)
+    }
+    @Test
+    fun testIssue260ForAndroidXKeep() {
+        TestConfig.setToTestInitState()
+        TestConfig.targetJsonConvertLib = TargetJsonConverter.MoshiCodeGen
+        KeepAnnotationSupportForAndroidX.getTestHelper().setConfig("wu.seal.add_keep_annotation_enable_androidx",true.toString())
+        val json="""{"a":"yes"}"""
+        val expectCode = """
+            @Keep
+            @JsonClass(generateAdapter = true)
+            data class A(
+                @Json(name = "a")
+                val a: String = "" // yes
+            )
+            """.trimIndent()
+        val resultCode = KotlinCodeMaker("A", json).makeKotlinData()
+        resultCode.should.be.equal(expectCode)
+    }
+
+    @Test
+    fun testIssue260ForParcelableSupport() {
+        TestConfig.setToTestInitState()
+        TestConfig.targetJsonConvertLib = TargetJsonConverter.MoshiCodeGen
+        ParcelableAnnotationSupport.getTestHelper().setConfig("jose.han.add_parcelable_annotatioin_enable",true.toString())
+        val json="""{"a":"yes"}"""
+        val expectCode = """
+            @SuppressLint("ParcelCreator")
+            @Parcelize
+            @JsonClass(generateAdapter = true)
+            data class A(
+                @Json(name = "a")
+                val a: String = "" // yes
+            ) : Parcelable
+            """.trimIndent()
+        val resultCode = KotlinCodeMaker("A", json).makeKotlinData()
+        resultCode.should.be.equal(expectCode)
+    }
+}