♻️ refactor api

dhhAndroid · Oct 22, 2019 · 2ead9a1 · 2ead9a1
1 parent f43004a
commit 2ead9a1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -30,11 +30,11 @@ class GSONTest {
     companion object {
         @JvmStatic
         fun main(args: Array<String>) {
-            val xiaoMingJson = """{name:"XiaoMing",age:22}"""
-            val xiaoLiJson = """{name:"XiaoLi",age:20}"""
-            val classJson = """[$xiaoLiJson,$xiaoMingJson]"""
-            val studentMapJson = """{xiaoMing:$xiaoMingJson,xiaoLi:$xiaoLiJson}"""
-            val classMapJson = """{class1:$classJson,class2:$classJson}"""
+              val xiaoMingJson = """{"name":"XiaoMing","age":22}"""
+              val xiaoLiJson = """{"name":"XiaoLi","age":20}"""
+              val classJson = """[$xiaoLiJson,$xiaoMingJson]"""
+              val studentMapJson = """{"xiaoMing":$xiaoMingJson,"xiaoLi":$xiaoLiJson}"""
+              val classMapJson = """{"class1":$classJson,"class2":$classJson}"""
 
 
             val xiaoMing: Student = GSON.fromJson<Student>(xiaoMingJson)
@@ -105,7 +105,7 @@ object GSON {
 
     inline fun <reified T> fromJson(jsonElement: JsonElement): T {
         val type = object : TypeToken<T>() {}.type
-        return gson.fromJson(jsonElement.toString(), type)
+        return gson.fromJson(jsonElement, type)
     }
 
     fun toJson(any: Any) = gson.toJson(any)

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -21,7 +21,7 @@ publish {
     userOrg = "dhhandroid"
     groupId = "com.dhh"
     artifactId = "gson-ktx"
-    publishVersion = "1.0.2"
+    publishVersion = "1.0.3"
     desc = "A set of Kotlin extensions for Gson"
     website = "https://github.com/dhhAndroid/gson-ktx"
     bintrayUser = loadProperties.getProperty("bintray.user")

diff --git a/lib/src/main/java/com/dhh/gson/ktx/GSON.kt b/lib/src/main/java/com/dhh/gson/ktx/GSON.kt
@@ -17,7 +17,7 @@ object GSON {
 
     inline fun <reified T> fromJson(jsonElement: JsonElement): T {
         val type = object : TypeToken<T>() {}.type
-        return gson.fromJson(jsonElement.toString(), type)
+        return gson.fromJson(jsonElement, type)
     }
 
     fun toJson(any: Any) = gson.toJson(any)

diff --git a/samples/src/main/java/com/dhh/gson/samples/GSONTest.kt b/samples/src/main/java/com/dhh/gson/samples/GSONTest.kt
@@ -14,11 +14,11 @@ class GSONTest {
     companion object {
         @JvmStatic
         fun main(args: Array<String>) {
-            val xiaoMingJson = """{name:"XiaoMing",age:22}"""
-            val xiaoLiJson = """{name:"XiaoLi",age:20}"""
+            val xiaoMingJson = """{"name":"XiaoMing","age":22}"""
+            val xiaoLiJson = """{"name":"XiaoLi","age":20}"""
             val classJson = """[$xiaoLiJson,$xiaoMingJson]"""
-            val studentMapJson = """{xiaoMing:$xiaoMingJson,xiaoLi:$xiaoLiJson}"""
-            val classMapJson = """{class1:$classJson,class2:$classJson}"""
+            val studentMapJson = """{"xiaoMing":$xiaoMingJson,"xiaoLi":$xiaoLiJson}"""
+            val classMapJson = """{"class1":$classJson,"class2":$classJson}"""
 
 
             val xiaoMing = GSON.fromJson<Student>(xiaoMingJson)