Skip to content

Commit fee6a70

Browse files
committed
fix: error response for kotlin and java
1 parent 445ac4d commit fee6a70

File tree

4 files changed

+30
-4
lines changed

4 files changed

+30
-4
lines changed

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
66
import {{ sdk.namespace | caseDot }}.cookies.ListenableCookieJar
77
import {{ sdk.namespace | caseDot }}.cookies.stores.SharedPreferencesCookieStore
88
import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
9+
import {{ sdk.namespace | caseDot }}.exceptions.ErrorResult
910
import {{ sdk.namespace | caseDot }}.extensions.fromJson
1011
import {{ sdk.namespace | caseDot }}.extensions.toJson
1112
import {{ sdk.namespace | caseDot }}.models.InputFile
@@ -487,7 +488,7 @@ class Client @JvmOverloads constructor(
487488
map["message"] as? String ?: "",
488489
(map["code"] as Number).toInt(),
489490
map["type"] as? String ?: "",
490-
body
491+
map as? ErrorResult.Response ?: ErrorResult.Text("")
491492
)
492493
} else {
493494
{{ spec.title | caseUcfirst }}Exception(body, response.code)

templates/android/library/src/main/java/io/package/exceptions/Exception.kt.twig

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,21 @@ package {{ sdk.namespace | caseDot }}.exceptions
22

33
import java.lang.Exception
44

5+
data class ErrorResponse(
6+
val message: String,
7+
val code: Int,
8+
val type: String,
9+
val version: String
10+
)
11+
12+
sealed class ErrorResult {
13+
data class Text(val error: String) : ErrorResult()
14+
data class Response(val error: ErrorResponse) : ErrorResult()
15+
}
16+
517
class {{spec.title | caseUcfirst}}Exception(
618
override val message: String? = null,
719
val code: Int? = null,
820
val type: String? = null,
9-
val response: Any? = null
21+
val response: ErrorResult? = null
1022
) : Exception(message)

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package {{ sdk.namespace | caseDot }}
22

33
import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
4+
import {{ sdk.namespace | caseDot }}.exceptions.ErrorResult
45
import {{ sdk.namespace | caseDot }}.extensions.fromJson
56
import {{ sdk.namespace | caseDot }}.extensions.toJson
67
import {{ sdk.namespace | caseDot }}.models.InputFile
@@ -483,7 +484,7 @@ class Client @JvmOverloads constructor(
483484
map["message"] as? String ?: "",
484485
(map["code"] as Number).toInt(),
485486
map["type"] as? String ?: "",
486-
body
487+
map as? ErrorResult.Response ?: ErrorResult.Text("")
487488
)
488489
} else {
489490
{{ spec.title | caseUcfirst }}Exception(body, response.code)

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

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,21 @@ package {{ sdk.namespace | caseDot }}.exceptions
22

33
import java.lang.Exception
44

5+
data class ErrorResponse(
6+
val message: String,
7+
val code: Int,
8+
val type: String,
9+
val version: String
10+
)
11+
12+
sealed class ErrorResult {
13+
data class Text(val error: String) : ErrorResult()
14+
data class Response(val error: ErrorResponse) : ErrorResult()
15+
}
16+
517
class {{spec.title | caseUcfirst}}Exception(
618
override val message: String? = null,
719
val code: Int? = null,
820
val type: String? = null,
9-
val response: Any? = null
21+
val response: ErrorResult? = null
1022
) : Exception(message)

0 commit comments

Comments
 (0)