Optimize code

Foso · Sep 9, 2024 · 22183d3 · 22183d3
1 parent 4f192e6
commit 22183d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/KtorfitClass.kt b/ktorfit-ksp/src/main/kotlin/de/jensklingenberg/ktorfit/model/KtorfitClass.kt
@@ -13,6 +13,7 @@ val providerClass = KtorfitClass("ClassProvider", "de.jensklingenberg.ktorfit.in
 val typeDataClass = KtorfitClass("TypeData", "de.jensklingenberg.ktorfit.converter", "_typeData")
 val extDataClass = KtorfitClass("HttpRequestBuilder.() -> Unit", "", "_ext")
 val formParameters = KtorfitClass("", "", "__formParameters")
+val formData = KtorfitClass("", "", "__formData")
 val converterHelper = KtorfitClass("KtorfitConverterHelper", "de.jensklingenberg.ktorfit.internal", "_helper")
 val internalApi = ClassName("de.jensklingenberg.ktorfit.internal", "InternalKtorfitApi")
 

diff --git a/...ksp/src/main/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/PartsCodeGeneration.kt b/...ksp/src/main/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/PartsCodeGeneration.kt
@@ -4,6 +4,7 @@ import com.google.devtools.ksp.symbol.KSType
 import de.jensklingenberg.ktorfit.model.ParameterData
 import de.jensklingenberg.ktorfit.model.annotations.ParameterAnnotation.Part
 import de.jensklingenberg.ktorfit.model.annotations.ParameterAnnotation.PartMap
+import de.jensklingenberg.ktorfit.model.formData
 import de.jensklingenberg.ktorfit.utils.surroundIfNotEmpty
 
 fun getPartsCode(
@@ -41,7 +42,7 @@ fun getPartsCode(
         }
 
     return (partText + partMapStrings).surroundIfNotEmpty(
-        "val __formData = formData {\n",
-        "}\nsetBody(MultiPartFormDataContent(__formData))\n",
+        "val ${formData.objectName} = formData {\n",
+        "}\nsetBody(MultiPartFormDataContent(${formData.objectName}))\n",
     )
 }
diff --git a/...ksp/src/main/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/QueryCodeGeneration.kt b/...ksp/src/main/kotlin/de/jensklingenberg/ktorfit/reqBuilderExtension/QueryCodeGeneration.kt
@@ -24,7 +24,9 @@ private fun getQueryMapText(params: List<ParameterData>) =
     params
         .filter { it.hasAnnotation<QueryMap>() }
         .joinToString(separator = "") { parameterData ->
-            val queryMap = parameterData.findAnnotationOrNull<QueryMap>()!!
+            val queryMap =
+                parameterData.findAnnotationOrNull<QueryMap>()
+                    ?: throw IllegalStateException("QueryMap annotation not found")
             val encoded = queryMap.encoded
             val data = parameterData.name
             "%s?.forEach { entry -> entry.value?.let{ %s(entry.key, \"\${entry.value}\") } }\n".format(
@@ -44,7 +46,9 @@ private fun getQueryNameText(
 ) = params
     .filter { it.hasAnnotation<QueryName>() }
     .joinToString(separator = "") { parameterData ->
-        val queryName = parameterData.annotations.filterIsInstance<QueryName>().first()
+        val queryName =
+            parameterData.annotations.filterIsInstance<QueryName>().firstOrNull()
+                ?: throw IllegalStateException("QueryName annotation not found")
         val encoded = queryName.encoded
         val name = parameterData.name