Merge pull request #305 from appwrite/fix-kotlin-exceptions

Fix kotlin exceptions

Author: christyjacob4

src/SDK/Language/Kotlin.php

@@ -352,12 +352,6 @@ public function getFiles()
                 'template'      => '/kotlin/src/main/kotlin/io/appwrite/extensions/JsonExtensions.kt.twig',
                 'minify'        => false,
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/models/Error.kt',
-                'template'      => '/kotlin/src/main/kotlin/io/appwrite/models/Error.kt.twig',
-                'minify'        => false,
-            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/services/BaseService.kt',

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

@@ -2,8 +2,7 @@ package {{ sdk.namespace | caseDot }}
 
 import com.google.gson.Gson
 import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
-import {{ sdk.namespace | caseDot }}.extensions.JsonExtensions.fromJson
-import {{ sdk.namespace | caseDot }}.models.Error
+import {{ sdk.namespace | caseDot }}.extensions.fromJson
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -273,16 +272,11 @@ class Client @JvmOverloads constructor(
 
                     val contentType: String = response.headers["content-type"] ?: ""
                     val error = if (contentType.contains("application/json", ignoreCase = true)) {
-                        bodyString.fromJson(Error::class.java)
+                        bodyString.fromJson()
                     } else {
-                        Error(bodyString, response.code)
+                        {{ spec.title | caseUcfirst }}Exception(bodyString, response.code)
                     }
-
-                    it.cancel(AppwriteException(
-                        error.message,
-                        error.code,
-                        bodyString
-                    ))
+                    it.cancel(error)
                 }
                 it.resume(response)
             }

templates/kotlin/src/main/kotlin/io/appwrite/exceptions/Exception.kt.twig

@@ -3,7 +3,7 @@ package {{ sdk.namespace | caseDot }}.exceptions
 import java.lang.Exception
 
 class {{spec.title | caseUcfirst}}Exception(
-    message: String? = null,
+    override val message: String? = null,
     val code: Int? = null,
     val response: String? = null
 ) : Exception(message)

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

@@ -2,11 +2,33 @@ package {{ sdk.namespace | caseDot }}.extensions
 
 import com.google.gson.Gson
 
-object JsonExtensions {
+val gson = Gson()
 
-    fun Any.toJson(): String =
-        Gson().toJson(this)
+fun Any.toJson(): String =
+    gson.toJson(this)
 
-    fun <T> String.fromJson(clazz: Class<T>): T =
-        Gson().fromJson(this, clazz)
+fun <T> String.fromJson(clazz: Class<T>): T =
+    gson.fromJson(this, clazz)
+
+inline fun <reified T> String.fromJson(): T =
+    gson.fromJson(this, T::class.java)
+
+fun <T> Any.jsonCast(to: Class<T>): T =
+    toJson().fromJson(to)
+
+inline fun <reified T> Any.jsonCast(): T =
+    toJson().fromJson(T::class.java)
+
+fun <T> Any.tryJsonCast(to: Class<T>): T? = try {
+    toJson().fromJson(to)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
+}
+
+inline fun <reified T> Any.tryJsonCast(): T? = try {
+    toJson().fromJson(T::class.java)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
 }

templates/kotlin/src/main/kotlin/io/appwrite/models/Error.kt.twig

@@ -93,7 +93,7 @@ class SDKTest extends TestCase
             'envs' => [
                 'java-8' => 'docker run --rm -v $(pwd):/app -w /app/tests/sdks/kotlin openjdk:8-jdk-alpine sh -c "./gradlew :test -q && cat result.txt"',
             ],
-            'supportException' => false,
+            'supportException' => true,
         ],
 
         'swift-server' => [