Remove deprecated converters

Foso · Dec 7, 2023 · eb5054a · eb5054a
1 parent 0420ad8
commit eb5054a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/FunctionData.kt b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/FunctionData.kt
@@ -54,7 +54,7 @@ data class FunctionData(
             )
             .addStatement("typeInfo = typeInfo<%L>())\n", this.returnType.parameterType.toTypeName())
             .addStatement(
-                "return %L.%L<${returnTypeName}, ${innerReturnType}>(%L,${extDataClass.objectName})%L",
+                "return %L.%L<${returnTypeName}>(%L,${extDataClass.objectName})%L",
                 converterHelper.objectName,
                 if (this.isSuspend) {
                     "suspendRequest"

diff --git a/...-core/src/commonMain/kotlin/de/jensklingenberg/ktorfit/internal/KtorfitConverterHelper.kt b/...-core/src/commonMain/kotlin/de/jensklingenberg/ktorfit/internal/KtorfitConverterHelper.kt
@@ -24,14 +24,14 @@ public class KtorfitConverterHelper(private val ktorfit: Ktorfit) {
     /**
      * This will handle all requests for functions without suspend modifier
      */
-    public fun <ReturnType, RequestType : Any?> request(
+    public fun <ReturnType> request(
         returnTypeData: TypeData,
         requestBuilder: HttpRequestBuilder.() -> Unit
     ): ReturnType? {
 
         ktorfit.nextResponseConverter(null, returnTypeData)?.let { responseConverter ->
             return responseConverter.convert {
-                suspendRequest<HttpResponse, HttpResponse>(
+                suspendRequest<HttpResponse>(
                     TypeData.createTypeData(
                         "io.ktor.client.statement.HttpResponse",
                         typeInfo<HttpResponse>()
@@ -54,7 +54,7 @@ public class KtorfitConverterHelper(private val ktorfit: Ktorfit) {
      * This will handle all requests for functions with suspend modifier
      * Used by generated Code
      */
-    public suspend fun <ReturnType, RequestType : Any?> suspendRequest(
+    public suspend fun <ReturnType> suspendRequest(
         typeData: TypeData,
         requestBuilder: HttpRequestBuilder.() -> Unit
     ): ReturnType? {