Set Snapshot version

Author: Foso

example/AndroidOnlyExample/app/build.gradle.kts

@@ -51,7 +51,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
     }
 }
 
-val ktorfit = "1.14.0"
+val ktorfit = "2.0.0-beta1-SNAPSHOT"
 val ktor = "2.3.10"
 val compose_ui_version = "1.5.1"
 dependencies {
@@ -60,6 +60,7 @@ dependencies {
     implementation("io.ktor:ktor-client-serialization:$ktor")
     implementation("io.ktor:ktor-client-content-negotiation:$ktor")
     implementation("io.ktor:ktor-serialization-kotlinx-json:$ktor")
+    implementation("de.jensklingenberg.ktorfit:ktorfit-converters-response:$ktorfit")
 
 
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")

example/AndroidOnlyExample/settings.gradle

@@ -4,6 +4,9 @@ pluginManagement {
         google()
        // mavenLocal()
         mavenCentral()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }
 dependencyResolutionManagement {
@@ -12,6 +15,9 @@ dependencyResolutionManagement {
         google()
        // mavenLocal()
         mavenCentral()
+        maven {
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
     }
 }
 rootProject.name = "AndroidOnlyExample"

ktorfit-lib-core/src/commonTest/kotlin/de/jensklingenberg/ktorfit/KtorfitTest.kt

@@ -1,6 +1,7 @@
 package de.jensklingenberg.ktorfit
 
 import de.jensklingenberg.ktorfit.converter.Converter
+import de.jensklingenberg.ktorfit.converter.KtorfitResult
 import de.jensklingenberg.ktorfit.converter.builtin.DefaultSuspendResponseConverterFactory
 import de.jensklingenberg.ktorfit.converter.TypeData
 import io.ktor.client.request.HttpRequestData
@@ -95,8 +96,16 @@ class KtorfitTest {
 private class TestConverterFactory : Converter.Factory {
 
     class SuspendConverter(val typeData: TypeData) : Converter.SuspendResponseConverter<HttpResponse, Any> {
-        override suspend fun convert(response: HttpResponse): Any {
-            return response.call.body(typeData.typeInfo)
+
+        override suspend fun convert(result: KtorfitResult): Any {
+            when(result){
+                is KtorfitResult.Success -> {
+                    return result.response.call.body(typeData.typeInfo)
+                }
+                is KtorfitResult.Failure -> {
+                    throw result.throwable
+                }
+            }
         }
     }
 

ktorfit-lib-core/src/commonTest/kotlin/de/jensklingenberg/ktorfit/TestStringToIntRequestConverter.kt

@@ -1,17 +1,30 @@
 package de.jensklingenberg.ktorfit
 
-import de.jensklingenberg.ktorfit.converter.request.RequestConverter
+
+import de.jensklingenberg.ktorfit.converter.Converter
 import kotlin.reflect.KClass
 
-class TestStringToIntRequestConverter : RequestConverter {
-    override fun supportedType(parameterType: KClass<*>, requestType: KClass<*>): Boolean {
+class TestStringToIntRequestConverter : Converter.Factory {
+
+    private fun supportedType(parameterType: KClass<*>, requestType: KClass<*>): Boolean {
         val parameterIsString = parameterType == String::class
         val requestIsInt = requestType == Int::class
         return parameterIsString && requestIsInt
     }
 
-    override fun convert(data: Any): Any {
-        return (data as String).toInt()
+    class Test : Converter.RequestParameterConverter {
+        override fun convert(data: Any): Any {
+            return (data as String).toInt()
+        }
+
+    }
+
+    override fun requestParameterConverter(
+        parameterType: KClass<*>,
+        requestType: KClass<*>
+    ): Converter.RequestParameterConverter? {
+        if (!supportedType(parameterType, requestType)) return null
+        return Test()
     }
 }
 

ktorfit-lib-core/src/commonTest/kotlin/de/jensklingenberg/ktorfit/converter/RequestParameterConverterTest.kt

@@ -21,7 +21,7 @@ class RequestParameterConverterTest {
         }
 
         val ktorfit =
-            Ktorfit.Builder().httpClient(engine).baseUrl("http://www.test.de/").requestConverter(TestStringToIntRequestConverter()).build()
+            Ktorfit.Builder().httpClient(engine).baseUrl("http://www.test.de/").converterFactories(TestStringToIntRequestConverter()).build()
 
         val converted = KtorfitConverterHelper(ktorfit).convertParameterType("4", String::class, Int::class)
         assertEquals(4, converted)

ktorfit-lib-core/src/jvmTest/kotlin/de/jensklingenberg/ktorfit/converter/ConverterFactoryTest.kt

@@ -40,11 +40,19 @@ class ConverterFactoryTest {
                 ): Converter.SuspendResponseConverter<HttpResponse, *>? {
                     if (typeData.qualifiedName == "kotlinx.coroutines.flow.Flow") {
                         return object : Converter.SuspendResponseConverter<HttpResponse, Any> {
-                            override suspend fun convert(response: HttpResponse): Any {
-                                return try {
-                                    response.body(typeInfo<Int>())
-                                } catch (ex: Exception) {
-                                    Assert.assertTrue(ex is NoTransformationFoundException)
+
+                            override suspend fun convert(result: KtorfitResult): Any {
+                                when(result){
+                                    is KtorfitResult.Success -> {
+                                        return try {
+                                            result.response.body(typeInfo<Int>())
+                                        } catch (ex: Exception) {
+                                            Assert.assertTrue(ex is NoTransformationFoundException)
+                                        }
+                                    }
+                                    is KtorfitResult.Failure -> {
+                                        throw result.throwable
+                                    }
                                 }
                             }
                         }