Improve converter error handling #389

Foso · Oct 8, 2023 · 241b770 · 241b770
1 parent c25a71c
commit 241b770
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/...rc/commonMain/kotlin/de/jensklingenberg/ktorfit/converter/builtin/CallConverterFactory.kt b/...rc/commonMain/kotlin/de/jensklingenberg/ktorfit/converter/builtin/CallConverterFactory.kt
@@ -66,9 +66,7 @@ public class CallConverterFactory : Converter.Factory {
                         }
 
                         is KtorfitResult.Failed -> {
-                            result.throwable.let {
-                                callBack.onError(it)
-                            }
+                            callBack.onError(result.throwable)
                         }
                     }
                 }

diff --git a/ktorfit-lib-common/src/commonMain/kotlin/de/jensklingenberg/ktorfit/Response.kt b/ktorfit-lib-common/src/commonMain/kotlin/de/jensklingenberg/ktorfit/Response.kt
@@ -61,7 +61,7 @@ public class Response<T> private constructor(
         }
 
         /** Create an error response from `rawResponse` with `body` as the error body.  */
-        public fun <T> error(body: Any?, rawResponse: HttpResponse): Response<T?> {
+        public fun <T> error(body: Any, rawResponse: HttpResponse): Response<T?> {
             require(!rawResponse.status.isSuccess()) { "rawResponse should not be successful response" }
             return Response(rawResponse, null, body)
         }

diff --git a/...in/de/jensklingenberg/ktorfit/converter/builtin/DefaultSuspendResponseConverterFactory.kt b/...in/de/jensklingenberg/ktorfit/converter/builtin/DefaultSuspendResponseConverterFactory.kt
@@ -25,8 +25,7 @@ internal class DefaultSuspendResponseConverterFactory : Converter.Factory {
                 }
 
                 is KtorfitResult.Success -> {
-                    val response = result.response
-                    response.call.body(typeData.typeInfo)
+                    result.response.call.body(typeData.typeInfo)
                 }
             }
         }