Merge pull request #205 from xurui1995/3.4.0_fix195

3.4.0 fix195

Author: wuseal

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

@@ -163,16 +163,18 @@ class KotlinCodeMaker {
                 jsonElementValue.isJsonArray -> {
                     jsonElementValue.asJsonArray.run {
                         var type = getArrayType(property, this)
-                        if (isExpectedJsonObjArrayType(this) || onlyHasOneObjectElementRecursive()
-                            || onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive()
-                        ) {
-                            val subCode = try {
-                                KotlinCodeMaker(getChildType(getRawType(type)), jsonElementValue).makeKotlinData()
-                            } catch (e: UnSupportJsonException) {
-                                type = e.adviceType
-                                ""
+                        if(!allChildrenAreEmptyArray()) {
+                            if (isExpectedJsonObjArrayType(this) || onlyHasOneObjectElementRecursive()
+                                    || onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive()
+                            ) {
+                                val subCode = try {
+                                    KotlinCodeMaker(getChildType(getRawType(type)), jsonElementValue).makeKotlinData()
+                                } catch (e: UnSupportJsonException) {
+                                    type = e.adviceType
+                                    ""
+                                }
+                                toBeAppend.add(subCode)
                             }
-                            toBeAppend.add(subCode)
                         }
                         addProperty(stringBuilder, property, type, "", isLast)
                     }

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

@@ -121,6 +121,15 @@ tailrec fun JsonArray.onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive():
     return get(0).asJsonArray.onlyHasOneSubArrayAndAllItemsAreObjectElementRecursive()
 }
 
+fun JsonArray.allChildrenAreEmptyArray(): Boolean {
+
+    if (size() == 0) {
+        return true
+    }
+
+    return all { (it as? JsonArray)?.allChildrenAreEmptyArray() ?: false }
+}
+
 
 /**
  * filter out all null json element of JsonArray

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

@@ -0,0 +1,32 @@
+package wu.seal.jsontokotlin.regression
+
+import com.winterbe.expekt.should
+import org.junit.Before
+import org.junit.Test
+import wu.seal.jsontokotlin.KotlinDataClassCodeMaker
+import wu.seal.jsontokotlin.test.TestConfig
+
+class Issue195Test {
+
+    private val expected = """data class A(
+    @SerializedName("xxx")
+    val xxx: List<List<Any>> = listOf()
+)"""
+
+    /**
+     * init test environment before test
+     */
+    @Before
+    fun setUp() {
+        TestConfig.setToTestInitState()
+    }
+
+    /**
+     * test issue #130 of Github Project issue
+     */
+    @Test
+    fun testIssue195() {
+        val generated = KotlinDataClassCodeMaker("A", "{\"xxx\":[[]]}").makeKotlinDataClassCode()
+        generated.trim().should.be.equal(expected)
+    }
+}

src/test/kotlin/wu/seal/jsontokotlin/utils/ExtensionsKtTest.kt

@@ -177,4 +177,32 @@ class ExtensionsKtTest {
         s.containsAnyOf(listOf("is", "true")).should.be.`true`
         s.containsAnyOf(listOf("bad", "test")).should.be.`false`
     }
+
+    @Test
+    fun  allChildrenAreEmptyArray() {
+        val emptyArray1 = """[
+            []
+            ]
+        """
+
+        val emptyArray2 = """[
+            [[]]
+            ]
+        """
+
+        val emptyArray3 = """[
+            [],[]
+            ]
+        """
+
+        val nonEmptyArray4 = """[
+            [{"name":"tom"}],[]
+            ]
+        """
+
+        gson.fromJson<JsonArray>(emptyArray1, JsonArray::class.java).allChildrenAreEmptyArray().should.be.`true`
+        gson.fromJson<JsonArray>(emptyArray2, JsonArray::class.java).allChildrenAreEmptyArray().should.be.`true`
+        gson.fromJson<JsonArray>(emptyArray3, JsonArray::class.java).allChildrenAreEmptyArray().should.be.`true`
+        gson.fromJson<JsonArray>(nonEmptyArray4, JsonArray::class.java).allChildrenAreEmptyArray().should.be.`false`
+    }
 }