Set Snapshot version

Foso · Apr 27, 2024 · d2b3eaa · d2b3eaa
1 parent 56adf91
commit d2b3eaa
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 29 deletions.
diff --git a/docs/converters/converters.md b/docs/converters/converters.md
@@ -20,4 +20,11 @@ implementation("de.jensklingenberg.ktorfit:ktorfit-converters-call:$ktorfit")
 Add this dependency:
 ```kotlin
 implementation("de.jensklingenberg.ktorfit:ktorfit-converters-flow:$ktorfit")
+```
+
+* ResponseConverterFactory
+
+Add this dependency:
+```kotlin
+implementation("de.jensklingenberg.ktorfit:ktorfit-converters-response:$ktorfit")
 ```
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
@@ -6,12 +6,11 @@ import com.google.devtools.ksp.symbol.KSFunctionDeclaration
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterSpec
-import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.ksp.toTypeName
 import de.jensklingenberg.ktorfit.model.annotations.*
 import de.jensklingenberg.ktorfit.model.annotations.ParameterAnnotation.*
 import de.jensklingenberg.ktorfit.reqBuilderExtension.getReqBuilderExtensionText
-import de.jensklingenberg.ktorfit.typeData.addRequestConverterText
+import de.jensklingenberg.ktorfit.reqBuilderExtension.addRequestConverterText
 import de.jensklingenberg.ktorfit.utils.*
 
 data class FunctionData(
@@ -46,11 +45,11 @@ data class FunctionData(
             .addStatement(
                 "val ${typeDataClass.objectName} = ${typeDataClass.name}.createTypeData("
             )
+            .addStatement("typeInfo = typeInfo<%L>(),", this.returnType.parameterType.toTypeName())
             .addStatement(
-                "qualifiedTypename = \"%L\",",
+                "qualifiedTypename = \"%L\")",
                 this.returnType.parameterType.toTypeName().toString().removeWhiteSpaces()
             )
-            .addStatement("typeInfo = typeInfo<%L>())\n", this.returnType.parameterType.toTypeName())
             .addStatement(
                 "return %L.%L<${returnTypeName}>(%L,${extDataClass.objectName})%L",
                 converterHelper.objectName,

diff --git a/.../ktorfit/typeData/RequestConverterText.kt → ...qBuilderExtension/RequestConverterText.kt b/.../ktorfit/typeData/RequestConverterText.kt → ...qBuilderExtension/RequestConverterText.kt
@@ -1,4 +1,4 @@
-package de.jensklingenberg.ktorfit.typeData
+package de.jensklingenberg.ktorfit.reqBuilderExtension
 
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.ksp.toClassName

diff --git a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/typeData/ReturnTypeInfo.kt b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/typeData/ReturnTypeInfo.kt
diff --git a/ktorfit-ksp/src/test/kotlin/de/jensklingenberg/ktorfit/RequestConverterTextKtTest.kt b/ktorfit-ksp/src/test/kotlin/de/jensklingenberg/ktorfit/RequestConverterTextKtTest.kt
@@ -6,7 +6,7 @@ import de.jensklingenberg.ktorfit.model.ParameterData
 import de.jensklingenberg.ktorfit.model.ReturnTypeData
 import de.jensklingenberg.ktorfit.model.annotations.ParameterAnnotation
 import de.jensklingenberg.ktorfit.model.annotations.ParameterAnnotation.RequestType
-import de.jensklingenberg.ktorfit.typeData.addRequestConverterText
+import de.jensklingenberg.ktorfit.reqBuilderExtension.addRequestConverterText
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.mockito.kotlin.mock

diff --git a/...sp/src/test/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/ReturnTypeInfoKtTest.kt b/...sp/src/test/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/ReturnTypeInfoKtTest.kt
diff --git a/ktorfit-lib-core/src/commonMain/kotlin/de/jensklingenberg/ktorfit/converter/TypeData.kt b/ktorfit-lib-core/src/commonMain/kotlin/de/jensklingenberg/ktorfit/converter/TypeData.kt
@@ -15,12 +15,11 @@ import kotlin.reflect.KClass
 public data class TypeData(
     public val qualifiedName: String,
     public val typeArgs: List<TypeData> = emptyList(),
-    public val isNullable: Boolean = qualifiedName.endsWith("?"),
     public val typeInfo: TypeInfo,
+    public val isNullable: Boolean = typeInfo.kotlinType?.isMarkedNullable ?: false,
 ) {
     public companion object {
         public fun createTypeData(qualifiedTypename: String, typeInfo: TypeInfo): TypeData {
-
             val typeArgument = qualifiedTypename.substringAfter("<").substringBeforeLast(">")
             val split = typeArgument.split(",")
             val args = typeInfo.kotlinType?.arguments?.mapIndexed { index, kTypeProjection ->