Optimize generated code (#541)

Foso · Apr 28, 2024 · b77b8af · b77b8af
1 parent 1ceaad2
commit b77b8af
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 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
@@ -23,7 +23,6 @@ data class FunctionData(
 ) {
 
     fun toFunSpec(resolver: Resolver): FunSpec {
-        val returnTypeName = this.returnType.parameterType?.toTypeName()
 
         return FunSpec.builder(this.name)
             .addModifiers(mutableListOf(KModifier.OVERRIDE).also {
@@ -51,7 +50,7 @@ data class FunctionData(
                 this.returnType.parameterType.toTypeName().toString().removeWhiteSpaces()
             )
             .addStatement(
-                "return %L.%L<${returnTypeName}>(%L,${extDataClass.objectName})%L",
+                "return %L.%L(%L,${extDataClass.objectName})%L",
                 converterHelper.objectName,
                 if (this.isSuspend) {
                     "suspendRequest"

diff --git a/ktorfit-ksp/src/test/kotlin/de/jensklingenberg/ktorfit/StreamingAnnotationTest.kt b/ktorfit-ksp/src/test/kotlin/de/jensklingenberg/ktorfit/StreamingAnnotationTest.kt
@@ -39,7 +39,7 @@ interface TestService {
         )
 
 
-        val expectedFunctionText = """return _converter.suspendRequest<io.ktor.client.statement.HttpStatement>(_typeData,_ext)!!"""
+        val expectedFunctionText = """return _converter.suspendRequest(_typeData,_ext)!!"""
 
         val compilation = getCompilation(listOf(httpStatement, source))
         val result = compilation.compile()