simplify error response adapter (#131)

sargunv · web-flow · commit cf5e95b8020e · 2025-06-11T13:58:49.000-07:00
diff --git a/src/commonMain/kotlin/co/pokeapi/pokekotlin/PokeApi.kt b/src/commonMain/kotlin/co/pokeapi/pokekotlin/PokeApi.kt
@@ -600,6 +600,7 @@ public fun PokeApi(
         configure()
         install(HttpCache) { cacheStorage?.let { privateStorage(it) } }
         install(ContentNegotiation) { json(PokeApiJson, ContentType.Any) }
+        expectSuccess = true
       }
     )
     .converterFactories(ResultConverter.Factory)
diff --git a/src/commonMain/kotlin/co/pokeapi/pokekotlin/internal/ResultConverter.kt b/src/commonMain/kotlin/co/pokeapi/pokekotlin/internal/ResultConverter.kt
@@ -5,35 +5,21 @@ import de.jensklingenberg.ktorfit.converter.Converter
 import de.jensklingenberg.ktorfit.converter.KtorfitResult
 import de.jensklingenberg.ktorfit.converter.TypeData
 import io.ktor.client.call.body
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.plugins.RedirectResponseException
-import io.ktor.client.plugins.ResponseException
-import io.ktor.client.plugins.ServerResponseException
 import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsText
 import io.ktor.http.isSuccess
 
 internal class ResultConverter(private val typeData: TypeData) :
   Converter.SuspendResponseConverter<HttpResponse, Result<Any>> {
 
-  private suspend fun HttpResponse.toException(): Throwable {
-    val exceptionResponseText = runCatching { bodyAsText() }.getOrElse { "<body failed decoding>" }
-    return when (status.value) {
-      in 300..399 -> RedirectResponseException(this, exceptionResponseText)
-      in 400..499 -> ClientRequestException(this, exceptionResponseText)
-      in 500..599 -> ServerResponseException(this, exceptionResponseText)
-      else -> ResponseException(this, exceptionResponseText)
-    }
-  }
-
   override suspend fun convert(result: KtorfitResult): Result<Any> {
     return when (result) {
       is KtorfitResult.Failure -> Result.failure(result.throwable)
       is KtorfitResult.Success -> {
         when {
           result.response.status.isSuccess() ->
             Result.success(result.response.body(typeData.typeArgs.first().typeInfo))
-          else -> Result.failure(result.response.toException())
+          // we configure the client with expectSuccess
+          else -> error("impossible: " + result.response)
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,7 @@ public fun PokeApi(`
`600`	`600`	`configure()`
`601`	`601`	`install(HttpCache) { cacheStorage?.let { privateStorage(it) } }`
`602`	`602`	`install(ContentNegotiation) { json(PokeApiJson, ContentType.Any) }`
	`603`	`+ expectSuccess = true`
`603`	`604`	`}`
`604`	`605`	`)`
`605`	`606`	`.converterFactories(ResultConverter.Factory)`