fix non suspended case

abendt · May 6, 2024 · 0730669 · 0730669
1 parent 2bff2fe
commit 0730669
Show file tree

Hide file tree

Showing 4 changed files with 224 additions and 156 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -33,6 +33,9 @@ dependencies {
     testImplementation("io.ktor:ktor-serialization-kotlinx-json")
 
     testImplementation("io.ktor:ktor-client-logging")
+
+    testImplementation("io.kotest.extensions:kotest-extensions-wiremock:3.0.1")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.8.0")
 }
 
 spotless {

diff --git a/src/main/kotlin/arrow/ArrowEitherConverterFactory.kt b/src/main/kotlin/arrow/ArrowEitherConverterFactory.kt
@@ -16,10 +16,10 @@ class ArrowEitherConverterFactory : Converter.Factory {
     override fun suspendResponseConverter(
         typeData: TypeData,
         ktorfit: Ktorfit,
-    ): Converter.SuspendResponseConverter<HttpResponse, Either<Throwable, *>>? {
+    ): Converter.SuspendResponseConverter<HttpResponse, Either<*, *>>? {
         if (typeData.typeInfo.type == Either::class) {
-            return object : Converter.SuspendResponseConverter<HttpResponse, Either<Throwable, *>> {
-                override suspend fun convert(result: KtorfitResult): Either<Throwable, Any> =
+            return object : Converter.SuspendResponseConverter<HttpResponse, Either<*, *>> {
+                override suspend fun convert(result: KtorfitResult): Either<Any, Any> =
                     result.fold(::Left) {
                         readBody(it, typeData)
                     }
@@ -36,22 +36,26 @@ class ArrowEitherConverterFactory : Converter.Factory {
     private suspend fun readBody(
         httpResponse: HttpResponse,
         typeData: TypeData,
-    ): Either<Exception, Any> =
+    ): Either<Any, Any> =
         try {
-            httpResponse.body<Either<Throwable, Any>>(typeData.typeArgs[1].typeInfo).right()
+            httpResponse.body<Any>(typeData.typeArgs[1].typeInfo).right()
         } catch (ex: Exception) {
             ex.left()
         }
 
     override fun responseConverter(
         typeData: TypeData,
         ktorfit: Ktorfit,
-    ): Converter.ResponseConverter<HttpResponse, Either<Throwable, *>>? {
+    ): Converter.ResponseConverter<HttpResponse, Either<*, *>>? {
         if (typeData.typeInfo.type == Either::class) {
-            return object : Converter.ResponseConverter<HttpResponse, Either<Throwable, *>> {
-                override fun convert(getResponse: suspend () -> HttpResponse): Either<Throwable, Any> =
+            return object : Converter.ResponseConverter<HttpResponse, Either<*, *>> {
+                override fun convert(getResponse: suspend () -> HttpResponse): Either<Any, Any> =
                     runBlocking {
-                        readBody(getResponse(), typeData)
+                        try {
+                            readBody(getResponse(), typeData)
+                        } catch (ex: Exception) {
+                            ex.left()
+                        }
                     }
             }
         }

diff --git a/src/main/kotlin/demo/ExampleApi.kt b/src/main/kotlin/demo/ExampleApi.kt
@@ -38,3 +38,6 @@ interface ExampleApi {
 
 @Serializable
 data class PersonResponse(val name: String, val birth_year: String, val films: List<String>)
+
+@Serializable
+data class PersonResponse2(val missingField: String)