JSON improvements for Kotlin

Author: abnegate

templates/android/library/src/main/java/io/package/json/PreciseNumberAdapter.kt.twig

@@ -1,16 +1,15 @@
 package {{ sdk.namespace | caseDot }}.json
 
-import com.google.gson.Gson
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonToken.*
 import com.google.gson.stream.JsonWriter
+import {{ sdk.namespace | caseDot }}.extensions.gson
 import java.io.IOException
 
 internal class PreciseNumberAdapter : TypeAdapter<Any?>() {
 
-    private val delegate = Gson()
-        .getAdapter(Any::class.java)
+    private val delegate = gson.getAdapter(Any::class.java)
 
     @Throws(IOException::class)
     override fun write(out: JsonWriter?, value: Any?) {

templates/kotlin/build.gradle.twig

@@ -38,7 +38,7 @@ dependencies {
     implementation("com.squareup.okhttp3:logging-interceptor")
     implementation("com.google.code.gson:gson:2.9.0")
 
-    testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
+    testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
 }
 
 test {

templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig

@@ -1,10 +1,8 @@
 package {{ sdk.namespace | caseDot }}
 
-import com.google.gson.GsonBuilder
-import com.google.gson.reflect.TypeToken
 import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
 import {{ sdk.namespace | caseDot }}.extensions.fromJson
-import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
+import {{ sdk.namespace | caseDot }}.extensions.toJson
 import {{ sdk.namespace | caseDot }}.models.InputFile
 import {{ sdk.namespace | caseDot }}.models.UploadProgress
 import kotlinx.coroutines.CoroutineScope
@@ -47,11 +45,6 @@ class Client @JvmOverloads constructor(
 
     private val job = Job()
 
-    private val gson = GsonBuilder().registerTypeAdapter(
-        object : TypeToken<Map<String, Any>>(){}.type,
-        PreciseNumberAdapter()
-    ).create()
-
     lateinit var http: OkHttpClient
 
     private val headers: MutableMap<String, String>
@@ -252,7 +245,8 @@ class Client @JvmOverloads constructor(
             }
             builder.build()
         } else {
-            gson.toJson(filteredParams)
+            filteredParams
+                .toJson()
                 .toRequestBody("application/json".toMediaType())
         }
 
@@ -422,10 +416,8 @@ class Client @JvmOverloads constructor(
                         .use(BufferedReader::readText)
 
                     val error = if (response.headers["content-type"]?.contains("application/json") == true) {
-                        val map = gson.fromJson<Map<String, Any>>(
-                            body,
-                            object : TypeToken<Map<String, Any>>(){}.type
-                        )
+                        val map = body.fromJson<Map<String, Any>>()
+
                         {{ spec.title | caseUcfirst }}Exception(
                             map["message"] as? String ?: "", 
                             (map["code"] as Number).toInt(),
@@ -464,10 +456,7 @@ class Client @JvmOverloads constructor(
                     it.resume(true as T)
                     return
                 }
-                val map = gson.fromJson<Map<String, Any>>(
-                    body,
-                    object : TypeToken<Map<String, Any>>(){}.type
-                )
+                val map = body.fromJson<Map<String, Any>>()
                 it.resume(
                     converter?.invoke(map) ?: map as T
                 )

templates/kotlin/src/main/kotlin/io/appwrite/extensions/JsonExtensions.kt.twig

@@ -1,8 +1,16 @@
 package {{ sdk.namespace | caseDot }}.extensions
 
 import com.google.gson.Gson
-
-val gson = Gson()
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
+
+val gson: Gson = GsonBuilder()
+    .registerTypeAdapter(
+        object : TypeToken<Map<String, Any>>() {}.type,
+        PreciseNumberAdapter()
+    )
+    .create()
 
 fun Any.toJson(): String =
     gson.toJson(this)

templates/kotlin/src/main/kotlin/io/appwrite/json/PreciseNumberAdapter.kt.twig

@@ -1,16 +1,15 @@
 package {{ sdk.namespace | caseDot }}.json
 
-import com.google.gson.Gson
 import com.google.gson.TypeAdapter
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonToken.*
 import com.google.gson.stream.JsonWriter
+import {{ sdk.namespace | caseDot }}.extensions.gson
 import java.io.IOException
 
 internal class PreciseNumberAdapter : TypeAdapter<Any?>() {
 
-    private val delegate = Gson()
-        .getAdapter(Any::class.java)
+    private val delegate = gson.getAdapter(Any::class.java)
 
     @Throws(IOException::class)
     override fun write(out: JsonWriter?, value: Any?) {