add extension force primitive type non-nullable (#239)

* add extension force primitive type non-nullable

* fix test class type

Author: Bimo

src/main/kotlin/extensions/ExtensionsCollector.kt

@@ -1,11 +1,12 @@
 package extensions
 
 import extensions.chen.biao.KeepAnnotationSupport
+import extensions.jose.han.ParcelableAnnotationSupport
 import extensions.ted.zeng.PropertyAnnotationLineSupport
 import extensions.wu.seal.ClassNameSuffixSupport
 import extensions.wu.seal.PropertyPrefixSupport
 import extensions.wu.seal.PropertySuffixSupport
-import extensions.jose.han.ParcelableAnnotationSupport
+import extensions.xu.rui.PrimitiveTypeNonNullableSupport
 
 /**
  * extension collect, all extensions will be hold by this class's extensions property
@@ -20,6 +21,7 @@ object ExtensionsCollector {
             ParcelableAnnotationSupport,
             PropertyPrefixSupport,
             PropertySuffixSupport,
-            ClassNameSuffixSupport
+            ClassNameSuffixSupport,
+            PrimitiveTypeNonNullableSupport
     )
 }

src/main/kotlin/extensions/xu/rui/PrimitiveTypeNonNullableSupport.kt

@@ -0,0 +1,50 @@
+package extensions.xu.rui
+
+import extensions.Extension
+import wu.seal.jsontokotlin.ConfigManager
+import wu.seal.jsontokotlin.DefaultValueStrategy
+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.NULLABLE_PRIMITIVE_TYPES
+import wu.seal.jsontokotlin.utils.getNonNullPrimitiveType
+import javax.swing.JPanel
+
+object PrimitiveTypeNonNullableSupport : Extension() {
+
+    private const val configKey = "xu.rui.force_primitive_type_non-nullable"
+
+
+    override fun intercept(kotlinDataClass: KotlinDataClass): KotlinDataClass {
+
+        if (getConfig(configKey).toBoolean().not()) {
+            return kotlinDataClass
+        }
+
+        val primitiveTypeNonNullableProperties = kotlinDataClass.properties.map {
+            if (it.type in NULLABLE_PRIMITIVE_TYPES) {
+                val newType = getNonNullPrimitiveType(it.type)
+                if (ConfigManager.defaultValueStrategy != DefaultValueStrategy.None) {
+                    it.copy(type = newType, value = getDefaultValue(newType))
+                } else {
+                    it.copy(type = newType)
+                }
+            } else {
+                it
+            }
+        }
+
+        return kotlinDataClass.copy(properties = primitiveTypeNonNullableProperties)
+    }
+
+    override fun createUI(): JPanel {
+        return horizontalLinearLayout {
+            (checkBox("Force Primitive Type Property Non-Nullable", getConfig(configKey).toBoolean()) { isSelectedAfterClick ->
+                setConfig(configKey, isSelectedAfterClick.toString())
+            })()
+            fillSpace()
+        }
+    }
+
+}

src/main/kotlin/wu/seal/jsontokotlin/utils/TypeHelper.kt

@@ -32,6 +32,8 @@ const val BACKSTAGE_NULLABLE_POSTFIX = "_&^#"
  */
 const val DEFAULT_TYPE = TYPE_ANY
 
+val NULLABLE_PRIMITIVE_TYPES = arrayOf(TYPE_INT, TYPE_LONG, TYPE_DOUBLE, TYPE_BOOLEAN).map { it.plus("?") }
+
 fun getPrimitiveType(jsonPrimitive: JsonPrimitive): String {
     return when {
         jsonPrimitive.isBoolean -> TYPE_BOOLEAN
@@ -216,3 +218,8 @@ fun getMapValueTypeConvertFromJsonObject(jsonObject: JsonObject): String {
     }
     return valueType
 }
+
+
+fun getNonNullPrimitiveType(rawType: String): String {
+    return if (rawType in NULLABLE_PRIMITIVE_TYPES) rawType.replace("?", "") else rawType
+}

src/test/kotlin/extensions/xu/rui/PrimitiveTypeNonNullableSupportTest.kt

@@ -0,0 +1,43 @@
+package extensions.xu.rui
+
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import wu.seal.jsontokotlin.DefaultValueStrategy
+import wu.seal.jsontokotlin.PropertyTypeStrategy
+import wu.seal.jsontokotlin.generateKotlinDataClass
+import wu.seal.jsontokotlin.interceptor.InitWithDefaultValueInterceptor
+import wu.seal.jsontokotlin.interceptor.PropertyTypeNullableStrategyInterceptor
+import wu.seal.jsontokotlin.test.TestConfig
+
+class PrimitiveTypeNonNullableSupportTest {
+
+    private val json = """{ picture: { "id" : 1, "url" : "" } }"""
+
+    private val expectResult = """data class Test(
+    val picture: Picture? = null
+) {
+    data class Picture(
+        val id: Int = 0, // 1
+        val url: String? = null
+    )
+}"""
+
+
+    @Before
+    fun setUp() {
+        TestConfig.setToTestInitState()
+        TestConfig.propertyTypeStrategy = PropertyTypeStrategy.Nullable
+        TestConfig.defaultValueStrategy = DefaultValueStrategy.AllowNull
+    }
+
+    @Test
+    fun interceptTest() {
+        val kotlinDataClass = json.generateKotlinDataClass()
+        PrimitiveTypeNonNullableSupport.getTestHelper().setConfig("xu.rui.force_primitive_type_non-nullable", "true")
+        val generatedCode = kotlinDataClass.applyInterceptors(listOf(PropertyTypeNullableStrategyInterceptor(), InitWithDefaultValueInterceptor(), PrimitiveTypeNonNullableSupport)).getCode()
+        print(generatedCode)
+        generatedCode.trimMargin().should.equal(expectResult.trimMargin())
+
+    }
+}