try to fix unsupport exception

sealkingking · sealkingking · commit 4d1646328165 · 2018-09-24T23:38:58.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.2.51'
 
     repositories {
         mavenLocal()
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt b/src/main/kotlin/wu/seal/jsontokotlin/KotlinCodeMaker.kt
@@ -36,10 +36,14 @@ class KotlinCodeMaker {
 
         val jsonElement = inputElement
         if (jsonElement!!.isJsonObject) {
-            appClassName(stringBuilder)
+            appendClassName(stringBuilder)
             appendCodeMember(stringBuilder, jsonElement.asJsonObject)
         } else {
-            throw IllegalArgumentException("UnSupport")
+            /**
+             * in this condition the only result it that we just give the json a List<Any> type is enough, No need to
+             * do any convert to make class type
+             */
+            throw UnSupportJsonException("Unsupported Json String")
         }
 
         stringBuilder.append(")")
@@ -77,7 +81,7 @@ class KotlinCodeMaker {
         }
     }
 
-    private fun appClassName(stringBuilder: StringBuilder) {
+    private fun appendClassName(stringBuilder: StringBuilder) {
         val classAnnotation = KClassAnnotation.getClassAnnotation(className.toString())
         stringBuilder.append(classAnnotation)
         if (classAnnotation.isNotBlank()) stringBuilder.append("\n")
@@ -111,14 +115,12 @@ class KotlinCodeMaker {
                 if (ConfigManager.enableMapType && maybeJsonObjectBeMapType(jsonElementValue.asJsonObject)) {
                     val mapKeyType = getMapKeyTypeConvertFromJsonObject(jsonElementValue.asJsonObject)
                     val mapValueType = getMapValueTypeConvertFromJsonObject(jsonElementValue.asJsonObject)
-                    if (mapValueType == MAP_DEFAULT_OBJECT_VALUE_TYPE
-                        || mapValueType.contains(MAP_DEFAULT_ARRAY_ITEM_VALUE_TYPE)
-                    ) {
+                    if (mapValueIsObjectType(mapValueType)) {
                         toBeAppend.add(
-                            KotlinCodeMaker(
-                                getChildType(mapValueType),
-                                jsonElementValue.asJsonObject.entrySet().first().value
-                            ).makeKotlinData()
+                                KotlinCodeMaker(
+                                        getChildType(mapValueType),
+                                        jsonElementValue.asJsonObject.entrySet().first().value
+                                ).makeKotlinData()
                         )
                     }
                     val mapType = "Map<$mapKeyType,$mapValueType>"
@@ -136,13 +138,16 @@ class KotlinCodeMaker {
         }
     }
 
+    private fun mapValueIsObjectType(mapValueType: String) = (mapValueType == MAP_DEFAULT_OBJECT_VALUE_TYPE
+            || mapValueType.contains(MAP_DEFAULT_ARRAY_ITEM_VALUE_TYPE))
+
 
     private fun addProperty(
-        stringBuilder: StringBuilder,
-        property: String,
-        type: String,
-        value: String?,
-        isLast: Boolean = false
+            stringBuilder: StringBuilder,
+            property: String,
+            type: String,
+            value: String?,
+            isLast: Boolean = false
     ) {
         var innerValue = value
         if (innerValue == null) {
@@ -158,7 +163,7 @@ class KotlinCodeMaker {
         val propertyComment = p.getPropertyComment()
         if (!ConfigManager.isCommentOff && propertyComment.isNotBlank())
             stringBuilder.append(" // ")
-                .append(getCommentCode(propertyComment))
+                    .append(getCommentCode(propertyComment))
         stringBuilder.append("\n")
     }
 
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt b/src/main/kotlin/wu/seal/jsontokotlin/MakeKotlinClassAction.kt
@@ -42,7 +42,7 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
              */
             var tempClassName = ""
             val couldGetAndReuseClassNameInCurrentEditFileForInsertCode =
-                couldGetAndReuseClassNameInCurrentEditFileForInsertCode(editorText)
+                    couldGetAndReuseClassNameInCurrentEditFileForInsertCode(editorText)
 
             if (couldGetAndReuseClassNameInCurrentEditFileForInsertCode) {
                 /**
@@ -54,9 +54,9 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             inputDialog.show()
             val className = inputDialog.getClassName()
             val inputString = inputDialog.inputString
-	        val json = if (inputString?.startsWith("http") == true) {
+            val json = if (inputString?.startsWith("http") == true) {
                 URL(inputString).readText()
-	        } else inputString
+            } else inputString
             if (json == null || json.isEmpty()) {
                 return
             }
@@ -75,16 +75,18 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             }
 
 
+        } catch (e: UnSupportJsonException) {
+            Messages.showInfoMessage("No need converting, just use List<Any> is enough for your json string", "Tip")
         } catch (e: Throwable) {
             dealWithException(jsonString, e)
             throw e
         }
     }
 
     private fun reuseClassName(
-        couldGetAndReuseClassNameInCurrentEditFileForInserCode: Boolean,
-        className: String,
-        tempClassName: String
+            couldGetAndReuseClassNameInCurrentEditFileForInserCode: Boolean,
+            className: String,
+            tempClassName: String
     ) = couldGetAndReuseClassNameInCurrentEditFileForInserCode && className == tempClassName
 
     private fun couldNotInsertCode(editor: Editor?): Boolean {
@@ -108,11 +110,11 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
     }
 
     private fun insertKotlinCode(
-        project: Project?,
-        document: Document,
-        className: String,
-        jsonString: String,
-        caret: Caret?
+            project: Project?,
+            document: Document,
+            className: String,
+            jsonString: String,
+            caret: Caret?
     ): Boolean {
         ImportClassWriter.insertImportClassCode(project, document)
 
@@ -138,8 +140,8 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
                 offset = document.textLength
             }
             document.insertString(
-                Math.max(offset, 0),
-                ClassCodeFilter.removeDuplicateClassCode(codeMaker.makeKotlinDataClassCode())
+                    Math.max(offset, 0),
+                    ClassCodeFilter.removeDuplicateClassCode(codeMaker.makeKotlinDataClassCode())
             )
         }
         return true
@@ -153,12 +155,12 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
     fun getCleanText(editorText: String): String {
         val tempCleanText = editorText.substringBeforeLast("class")
         val cleanText =
-            if (tempCleanText.trim().endsWith("data")) tempCleanText.trim().removeSuffix("data") else tempCleanText
+                if (tempCleanText.trim().endsWith("data")) tempCleanText.trim().removeSuffix("data") else tempCleanText
         return cleanText
     }
 
     fun getCurrentEditFileTemClassName(editorText: String) = editorText.substringAfterLast("class")
-        .substringBefore("(").substringBefore("{").trim()
+            .substringBefore("(").substringBefore("{").trim()
 
     /**
      * whether we could reuse current class name declared in the edit file for inserting data class code
@@ -169,20 +171,20 @@ class MakeKotlinClassAction : AnAction("MakeKotlinClass") {
             var couldGetAndReuseClassNameInCurrentEditFileForInsertCode = false
             val removeDocComment = editorText.replace(Regex("/\\*\\*(.|\n)*\\*/", RegexOption.MULTILINE), "")
             val removeDocCommentAndPackageDeclareText = removeDocComment
-                .replace(Regex("^(?:\\s*package |\\s*import ).*$", RegexOption.MULTILINE), "")
+                    .replace(Regex("^(?:\\s*package |\\s*import ).*$", RegexOption.MULTILINE), "")
             if ((removeDocCommentAndPackageDeclareText.indexOf("class") == removeDocCommentAndPackageDeclareText.lastIndexOf(
-                    "class"
-                )
-                        && removeDocCommentAndPackageDeclareText.indexOf("class") != -1
-                        && removeDocCommentAndPackageDeclareText.substringAfter("class").contains("(").not()
-                        && removeDocCommentAndPackageDeclareText.substringAfter("class").contains(":").not()
-                        && removeDocCommentAndPackageDeclareText.substringAfter("class").contains("=").not())
-                || (removeDocCommentAndPackageDeclareText.indexOf("class") == removeDocCommentAndPackageDeclareText.lastIndexOf(
-                    "class"
-                )
-                        && removeDocCommentAndPackageDeclareText.indexOf("class") != -1
-                        && removeDocCommentAndPackageDeclareText.substringAfter("class").substringAfter("(")
-                    .replace(Regex("\\s"), "").let { it.equals(")") || it.equals("){}") })
+                            "class"
+                    )
+                            && removeDocCommentAndPackageDeclareText.indexOf("class") != -1
+                            && removeDocCommentAndPackageDeclareText.substringAfter("class").contains("(").not()
+                            && removeDocCommentAndPackageDeclareText.substringAfter("class").contains(":").not()
+                            && removeDocCommentAndPackageDeclareText.substringAfter("class").contains("=").not())
+                    || (removeDocCommentAndPackageDeclareText.indexOf("class") == removeDocCommentAndPackageDeclareText.lastIndexOf(
+                            "class"
+                    )
+                            && removeDocCommentAndPackageDeclareText.indexOf("class") != -1
+                            && removeDocCommentAndPackageDeclareText.substringAfter("class").substringAfter("(")
+                            .replace(Regex("\\s"), "").let { it.equals(")") || it.equals("){}") })
             ) {
                 couldGetAndReuseClassNameInCurrentEditFileForInsertCode = true
             }
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/TargetJsonElement.kt b/src/main/kotlin/wu/seal/jsontokotlin/TargetJsonElement.kt
@@ -3,7 +3,10 @@ package wu.seal.jsontokotlin
 import com.google.gson.*
 import java.util.*
 
-
+/**
+ * This class aim at filtering out the expected Json Element to be convert from Json array
+ *
+ */
 class TargetJsonElement : ITargetJsonElement {
     private val jsonElement: JsonElement
 
@@ -17,16 +20,65 @@ class TargetJsonElement : ITargetJsonElement {
 
     override fun getTargetJsonElementForGeneratingCode(): JsonElement {
         if (this.jsonElement.isJsonArray) {
-            val jsonElementNotArray = getArrayChildElement(this.jsonElement.asJsonArray)
-            if (jsonElementNotArray.isJsonObject) {
-                return jsonElementNotArray
+            if (jsonElement.asJsonArray.size() == 0) {
+                return gson.toJsonTree(Any())
+            } else if (allElementAreObject(jsonElement.asJsonArray)) {
+                val jsonElementNotArray = getArrayChildElement(this.jsonElement.asJsonArray)
+                if (jsonElementNotArray.isJsonObject) {
+                    return jsonElementNotArray
+                } else {
+                    throw IllegalStateException("Unbelievable！ should not throw out this exception")
+                }
+            } else if (allElementAreSamePrimitiveType(jsonElement.asJsonArray)) {
+                return jsonElement.asJsonArray[0]
+            } else {
+                return gson.toJsonTree(Any())
             }
         } else if (this.jsonElement.isJsonObject) {
             return this.jsonElement
+        } else if (this.jsonElement.isJsonPrimitive) {
+            return this.jsonElement
+        } else {
+            return this.jsonElement
         }
-        throw IllegalFormatFlagsException("Unsupported Json String")
     }
 
+    private fun allElementAreObject(jsonArray: JsonArray): Boolean {
+        var allElementAreObject = true
+        jsonArray.forEach {
+            if (it.isJsonObject.not()) {
+                allElementAreObject = false
+                return@forEach
+            }
+        }
+        return allElementAreObject
+    }
+
+    private fun allElementAreSamePrimitiveType(jsonArray: JsonArray): Boolean {
+        var allElementAreSamePrimitiveType = true
+        jsonArray.forEach {
+            if (it.isJsonPrimitive.not()) {
+                allElementAreSamePrimitiveType = false
+                return@forEach
+            }
+            if (theSamePrimitiveType(jsonArray[0].asJsonPrimitive, it.asJsonPrimitive).not()) {
+                allElementAreSamePrimitiveType = false
+                return@forEach
+            }
+        }
+        return allElementAreSamePrimitiveType
+    }
+
+    private fun theSamePrimitiveType(first: JsonPrimitive, second: JsonPrimitive): Boolean {
+
+        val sameBoolean = first.isBoolean && second.isBoolean
+
+        val sameNumber = first.isNumber && second.isNumber
+
+        val sameString = first.isString && second.isString
+
+        return sameBoolean || sameNumber || sameString
+    }
 
     private fun getArrayChildElement(jsonArray: JsonArray): JsonElement {
         if (jsonArray.size() >= 1) {
diff --git a/src/main/kotlin/wu/seal/jsontokotlin/UnsupportJsonException.kt b/src/main/kotlin/wu/seal/jsontokotlin/UnsupportJsonException.kt
@@ -0,0 +1,7 @@
+package wu.seal.jsontokotlin
+
+
+/**
+ * Throw out when the json to be convert don't support by this plugin or no need to convert to any classes
+ */
+class UnSupportJsonException(message: String = "") : Exception(message)
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/StringTest.kt b/src/test/kotlin/wu/seal/jsontokotlin/StringTest.kt
@@ -26,4 +26,4 @@ class StringTest {
         val result2 = s.substringBefore("AM")
         result2.should.be.equal(s)
     }
-}
+}
diff --git a/src/test/kotlin/wu/seal/jsontokotlin/gson/TestJsonElement.kt b/src/test/kotlin/wu/seal/jsontokotlin/gson/TestJsonElement.kt
@@ -0,0 +1,30 @@
+package wu.seal.jsontokotlin.gson
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.winterbe.expekt.should
+import org.junit.Test
+
+class TestJsonElement {
+
+    private val gson = Gson()
+    @Test
+    fun isStringJsonObject() {
+        val jsonElement = gson.toJsonTree("hello")
+        jsonElement.isJsonObject.should.be.`false`
+    }
+
+    @Test
+    fun isObjectStringPropertyIsJsonObject() {
+        val json = """{a:"hello"}"""
+        val jsonObject = gson.fromJson<JsonElement>(json, JsonElement::class.java)
+        jsonObject.asJsonObject.get("a").isJsonObject.should.be.`false`
+    }
+
+    @Test
+    fun isJsonStringArrayElementIsJsonObject() {
+        val json = """["hello","yes"]"""
+        val jsonObject = gson.fromJson<JsonElement>(json, JsonElement::class.java)
+        jsonObject.asJsonArray[0].isJsonObject.should.be.`false`
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@ class StringTest {`
`26`	`26`	`val result2 = s.substringBefore("AM")`
`27`	`27`	`result2.should.be.equal(s)`
`28`	`28`	`}`
`29`		`-}`
	`29`	`+}`