Remove of Optional in Kotlinx Serialization

Author: DroidPulkit

src/main/kotlin/wu/seal/jsontokotlin/IConfigManager.kt

@@ -136,8 +136,7 @@ interface IConfigManager {
     var customAnnotationClassImportdeclarationString: String
         get() = if (isTestModel) TestConfig.customAnnotaionImportClassString else PropertiesComponent.getInstance().getValue(
                 USER_CUSTOM_JSON_LIB_ANNOTATION_IMPORT_CLASS, "import kotlinx.serialization.SerialName\n" +
-                "import kotlinx.serialization.Serializable" + "\n"
-                + "import kotlinx.serialization.Optional"
+                "import kotlinx.serialization.Serializable"
         )
         set(value) = if (isTestModel) {
             TestConfig.customAnnotaionImportClassString = value
@@ -148,7 +147,7 @@ interface IConfigManager {
     var customPropertyAnnotationFormatString: String
         get() = if (isTestModel) TestConfig.customPropertyAnnotationFormatString else PropertiesComponent.getInstance().getValue(
                 USER_CUSTOM_JSON_LIB_ANNOTATION_FORMAT_STRING,
-                "@Optional\n@SerialName(\"%s\")"
+                "@SerialName(\"%s\")"
         )
         set(value) = if (isTestModel) {
             TestConfig.customPropertyAnnotationFormatString = value

src/main/kotlin/wu/seal/jsontokotlin/codeannotations/SerializablePropertyAnnotationTemplate.kt

@@ -6,7 +6,7 @@ class SerializablePropertyAnnotationTemplate(val rawName: String) : AnnotationTe
 
     companion object{
 
-        const val annotationFormat = "@Optional\n@SerialName(\"%s\")"
+        const val annotationFormat = "@SerialName(\"%s\")"
     }
 
     private val annotation = Annotation(annotationFormat, rawName)

src/main/kotlin/wu/seal/jsontokotlin/interceptor/annotations/serializable/AddSerializableAnnotationClassImportDeclarationInterceptor.kt

@@ -8,7 +8,7 @@ class AddSerializableAnnotationClassImportDeclarationInterceptor : IImportClassD
 
 
         val propertyAnnotationImportClassString = "import kotlinx.serialization.SerialName\n" +
-                "import kotlinx.serialization.Serializable"+"\nimport kotlinx.serialization.Optional"
+                "import kotlinx.serialization.Serializable"
 
         return originClassImportDeclaration.append(propertyAnnotationImportClassString)
     }

src/main/kotlin/wu/seal/jsontokotlin/test/TestConfig.kt

@@ -26,9 +26,9 @@ object TestConfig {
     var defaultValueStrategy = DefaultValueStrategy.AvoidNull
     var isNestedClassModel = true
 
-    var customPropertyAnnotationFormatString = "@Optional\n@SerialName(\"%s\")"
+    var customPropertyAnnotationFormatString = "@SerialName(\"%s\")"
     var customAnnotaionImportClassString = "import kotlinx.serialization.SerialName\n" +
-            "import kotlinx.serialization.Serializable" + "\n" + "import kotlinx.serialization.Optional"
+            "import kotlinx.serialization.Serializable"
 
     var customClassAnnotationFormatString = "@Serializable"
 
@@ -55,9 +55,9 @@ object TestConfig {
         propertyTypeStrategy = PropertyTypeStrategy.NotNullable
         defaultValueStrategy = DefaultValueStrategy.AvoidNull
         isNestedClassModel = true
-        customPropertyAnnotationFormatString = "@Optional\n@SerialName(\"%s\")"
+        customPropertyAnnotationFormatString = "@SerialName(\"%s\")"
         customAnnotaionImportClassString = "import kotlinx.serialization.SerialName\n" +
-                "import kotlinx.serialization.Serializable" + "\n" + "import kotlinx.serialization.Optional"
+                "import kotlinx.serialization.Serializable"
 
         customClassAnnotationFormatString = "@Serializable"
 

src/test/kotlin/wu/seal/jsontokotlin/KotlinCodeMakerTest.kt

@@ -123,7 +123,7 @@ class KotlinCodeMakerTest {
     fun makeKotlinDataWithCustomAnnotation() {
         TestConfig.targetJsonConvertLib = TargetJsonConverter.Custom
         TestConfig.isNestedClassModel = false
-        TestConfig.customPropertyAnnotationFormatString = "@Optional\n@SerialName(\"%s\")"
+        TestConfig.customPropertyAnnotationFormatString = "@SerialName(\"%s\")"
         TestConfig.customClassAnnotationFormatString = "@Serializable"
         TestConfig.customAnnotaionImportClassString =
                 "import kotlinx.serialization.SerialName\nimport kotlinx.serialization.Serializable"

src/test/kotlin/wu/seal/jsontokotlin/interceptor/annotations/custom/AddCustomAnnotationInterceptorTest.kt

@@ -14,7 +14,6 @@ class AddCustomAnnotationInterceptorTest {
 
     private val expectedDataClass = """@Serializable
 data class Test(
-    @Optional
     @SerialName("M_property"")
     val mProperty: Int // 123
 )"""

src/test/kotlin/wu/seal/jsontokotlin/interceptor/annotations/serializable/AddSerializableAnnotationInterceptorTest.kt

@@ -14,7 +14,6 @@ class AddSerializableAnnotationInterceptorTest {
 
     private val expectedDataClass = """@Serializable
 data class Test(
-    @Optional
     @SerialName("M_property"")
     val mProperty: Int // 123
 )"""