add property nullable option in property tab

seal · seal · commit cc4112aba946 · 2017-09-22T18:34:49.000+08:00
diff --git a/src/wu/seal/jsontokotlin/ConfigManager.kt b/src/wu/seal/jsontokotlin/ConfigManager.kt
@@ -18,6 +18,8 @@ interface IConfigManager {
     private val IS_COMMENT_OFF: String
         get() = "need_comment_key"
 
+    private val IS_PROPERTY_NULLABLE_KEY: String
+        get() = "jsonToKotlin_is_property_nullable_key"
 
     var isPropertiesVar: Boolean
         get() = if (isTestModel) TestConfig.isPropertiesVar else PropertiesComponent.getInstance().isTrueValue(IS_PROPERTIES_VAR_KEY)
@@ -35,6 +37,11 @@ interface IConfigManager {
         get() = if (isTestModel) TestConfig.targetJsonConvertLib else TargetJsonConverter.valueOf(PropertiesComponent.getInstance().getValue(TARGET_JSON_CONVERTER_LIB_KEY) ?: TargetJsonConverter.None.name)
         set(value) = if (isTestModel) {
         } else PropertiesComponent.getInstance().setValue(TARGET_JSON_CONVERTER_LIB_KEY, value.name)
+
+    var isPropertyNullable: Boolean
+        get() = if (isTestModel) TestConfig.isPropertyNullable else PropertiesComponent.getInstance().isTrueValue(IS_PROPERTY_NULLABLE_KEY)
+        set(value) = if (isTestModel) {
+        } else PropertiesComponent.getInstance().setValue(IS_PROPERTY_NULLABLE_KEY, value)
 }
 
 
@@ -60,4 +67,5 @@ object TestConfig {
     var isCommentOff = false
     var isPropertiesVar = false
     var targetJsonConvertLib = TargetJsonConverter.Gson
+    var isPropertyNullable = true
 }
diff --git a/src/wu/seal/jsontokotlin/KotlinMaker.kt b/src/wu/seal/jsontokotlin/KotlinMaker.kt
@@ -58,27 +58,25 @@ class KotlinMaker {
 
         for ((property, jsonElementValue) in jsonObject.entrySet()) {
 
-            var type = "String"
             if (jsonElementValue.isJsonArray) {
-
-                type = getArrayType(property, jsonElementValue.asJsonArray)
+                val type = getArrayType(property, jsonElementValue.asJsonArray)
 
                 if (isExpectedJsonObjArrayType(jsonElementValue.asJsonArray)) {
-                    toBeAppend.add(KotlinMaker(type, jsonElementValue.asJsonArray.first()).makeKotlinData())
+                    toBeAppend.add(KotlinMaker(getChildType(getRawType(type)), jsonElementValue.asJsonArray.first()).makeKotlinData())
                 }
                 addProperty(stringBuilder, property, type, "")
 
             } else if (jsonElementValue.isJsonPrimitive) {
-                type = getPrimitiveType(jsonElementValue.asJsonPrimitive)
+                val type = getPrimitiveType(jsonElementValue.asJsonPrimitive)
                 addProperty(stringBuilder, property, type, jsonElementValue.asString)
 
             } else if (jsonElementValue.isJsonObject) {
-                type = getJsonObjectType(property)
-                toBeAppend.add(KotlinMaker(type, jsonElementValue).makeKotlinData())
+                val type = getJsonObjectType(property)
+                toBeAppend.add(KotlinMaker(getRawType(type), jsonElementValue).makeKotlinData())
                 addProperty(stringBuilder, property, type, "")
 
             } else if (jsonElementValue.isJsonNull) {
-                addProperty(stringBuilder, property, type, null)
+                addProperty(stringBuilder, property, DEFAULT_TYPE, null)
             }
         }
     }
@@ -89,7 +87,7 @@ class KotlinMaker {
         if (innerValue == null) {
             innerValue = "null"
         }
-        stringBuilder.append(KProperty(property, type, innerValue).getPropertyStringBlock())
+        stringBuilder.append(KProperty(property, getOutType(type), innerValue).getPropertyStringBlock())
         stringBuilder.append("\n")
     }
 
@@ -129,6 +127,7 @@ fun main(args: Array<String>) {
     TestConfig.targetJsonConvertLib = TargetJsonConverter.None
     TestConfig.isCommentOff = true
     TestConfig.isPropertiesVar = true
+    TestConfig.isPropertyNullable = false
 
     println("===========================================Change to none json lib support========================================= ")
 
diff --git a/src/wu/seal/jsontokotlin/Panel.kt b/src/wu/seal/jsontokotlin/Panel.kt
@@ -1,11 +1,11 @@
 package wu.seal.jsontokotlin
 
-import java.awt.BorderLayout
-import java.awt.FlowLayout
-import java.awt.LayoutManager
+import java.awt.*
 import javax.swing.ButtonGroup
+import javax.swing.JCheckBox
 import javax.swing.JPanel
 import javax.swing.JRadioButton
+import javax.swing.border.EmptyBorder
 
 /**
  * todo //beautify  interface
@@ -21,7 +21,8 @@ class PropertyPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(
 
     init {
 
-        setLayout(BorderLayout(5, 5))
+        border = EmptyBorder(10, 10, 10, 10)
+        setLayout(GridLayout(5, 1, 10, 10))
 
         val radioButtonVal = JRadioButton("Val")
 
@@ -44,11 +45,28 @@ class PropertyPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JPanel(
         buttonGroupProperty.add(radioButtonVal)
         buttonGroupProperty.add(radioButtonVar)
 
-        add(radioButtonVal, BorderLayout.NORTH)
-        add(radioButtonVar, BorderLayout.CENTER)
-    }
+        add(radioButtonVal)
+        add(radioButtonVar)
+
+        val nullableConatainer = JPanel(BorderLayout(10, 10))
+        val line = JPanel()
+        line.preferredSize = Dimension(500, 1)
+        line.background = Color.BLACK
+        nullableConatainer.add(line, BorderLayout.NORTH)
 
+        val nullAbleCheck = JCheckBox("Property to be Nullable?")
+        if (ConfigManager.isPropertyNullable) {
+            nullAbleCheck.isSelected = true
+        }
+
+        nullAbleCheck.addChangeListener {
+            ConfigManager.isPropertyNullable = nullAbleCheck.isSelected
+        }
+        nullableConatainer.add(nullAbleCheck, BorderLayout.CENTER)
 
+        add(nullableConatainer)
+
+    }
 }
 
 
@@ -63,9 +81,11 @@ class CommentConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JP
 
     init {
 
-        setLayout(BorderLayout(5, 5))
+        border = EmptyBorder(10, 10, 10, 10)
 
-        val radioButtonOpen = JRadioButton("Open")
+        setLayout(GridLayout(5, 1, 10, 10))
+
+        val radioButtonOpen = JRadioButton("On")
 
         radioButtonOpen.addActionListener {
             ConfigManager.isCommentOff = false
@@ -86,8 +106,8 @@ class CommentConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean) : JP
         buttonGroupProperty.add(radioButtonOpen)
         buttonGroupProperty.add(radioButtonOff)
 
-        add(radioButtonOpen, BorderLayout.NORTH)
-        add(radioButtonOff, BorderLayout.CENTER)
+        add(radioButtonOpen)
+        add(radioButtonOff)
     }
 
 }
@@ -103,7 +123,9 @@ class TargetJsonLibConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean
 
     init {
 
-        setLayout(BorderLayout(5, 5))
+        border = EmptyBorder(10, 10, 10, 10)
+
+        setLayout(GridLayout(5, 1, 10, 10))
 
         val radioButtonNone = JRadioButton("None")
 
@@ -126,8 +148,8 @@ class TargetJsonLibConfigPanel(layout: LayoutManager?, isDoubleBuffered: Boolean
         buttonGroupProperty.add(radioButtonNone)
         buttonGroupProperty.add(radioButtonGson)
 
-        add(radioButtonNone, BorderLayout.NORTH)
-        add(radioButtonGson, BorderLayout.CENTER)
+        add(radioButtonNone)
+        add(radioButtonGson)
     }
 
 }
diff --git a/src/wu/seal/jsontokotlin/TypeHelper.kt b/src/wu/seal/jsontokotlin/TypeHelper.kt
@@ -9,6 +9,14 @@ import com.google.gson.JsonPrimitive
  */
 
 
+/**
+ * the default type
+ */
+const val DEFAULT_TYPE = "Any"
+
+val DEFAULT_OUTPUT_TYPE = getOutType(DEFAULT_TYPE)
+
+
 fun getPrimitiveType(jsonPrimitive: JsonPrimitive): String {
     var subType = "String"
     if (jsonPrimitive.isBoolean) {
@@ -29,49 +37,74 @@ fun getPrimitiveType(jsonPrimitive: JsonPrimitive): String {
 
 
 fun getJsonObjectType(type: String): String {
+
     return KClassName.getName(type)
 }
 
 
+/**
+ * get the inmost child type of array type
+ */
+fun getChildType(arrayType: String): String {
+
+    return arrayType.replace(Regex("[<,>,List]"), "")
+}
+
+/**
+ * get the type output to the edit file
+ */
+fun getOutType(rawType: String): String {
+    if (ConfigManager.isPropertyNullable) {
+        val innerRawType = rawType.replace("?", "").replace(">", "?>")
+        val outputType = innerRawType.plus("?")
+        return outputType
+    }
+    return rawType
+}
+
+/**
+ * get the type string without '?' character
+ */
+fun getRawType(outputType: String): String {
+
+    return outputType.replace("?", "")
+}
+
 fun getArrayType(propertyName: String, jsonElementValue: JsonArray): String {
-    var innerPropertyName = propertyName
-    var type = "List<String>"
+    val innerPropertyName = adjustPropertyNameForGettingArrayChildType(propertyName)
+    var subType = DEFAULT_TYPE
     val jsonArray = jsonElementValue
 
     val iterator = jsonArray.iterator()
     if (iterator.hasNext()) {
         val next = iterator.next()
-        val subType =
+        subType =
                 if (next.isJsonPrimitive) {
                     getPrimitiveType(next.asJsonPrimitive)
 
                 } else if (next.isJsonObject) {
                     getJsonObjectType(innerPropertyName)
 
                 } else if (next.isJsonArray) {
-                    innerPropertyName = modifyPropertyForArrayObjType(innerPropertyName)
-                    getArrayType(innerPropertyName, next as JsonArray)
-
-                } else if (next.isJsonNull) {
-                    "Any"
-
+                    getArrayType(innerPropertyName, next.asJsonArray)
                 } else {
-                    "String"
+                    DEFAULT_TYPE
                 }
-
-        type = "List<$subType>"
-    } else {
-        type = "List<Any>"
-
     }
-    return type
+    return "List<$subType>"
 }
 
 fun isExpectedJsonObjArrayType(jsonElementArray: JsonArray): Boolean {
     return jsonElementArray.firstOrNull()?.isJsonObject ?: false
 }
 
-private fun modifyPropertyForArrayObjType(property: String): String {
+/**
+ * when get the child type in an array
+ * ,we need to modify the property name to make it's type name looks like a child type.
+ * filter the sequence as 'list' ,"List'
+ * and remove the last character 's' to make it like a child rather than a list
+ */
+fun adjustPropertyNameForGettingArrayChildType(property: String): String {
     var innerProperty = property
     if (innerProperty.endsWith("ies")) {
         innerProperty = innerProperty.substring(0, innerProperty.length - 3) + "y"
