Finished Path Param Parsers

Removed unclean code

Author: Wicpar

src/main/kotlin/com/papsign/ktor/openapigen/parameters/ParameterStyle.kt

@@ -1,5 +1,9 @@
 package com.papsign.ktor.openapigen.parameters
 
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
+import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderFactory
+
 interface ParameterStyle<S> where S: ParameterStyle<S>, S: Enum<S> {
     val name: String
+    val factory: BuilderFactory<Builder<S>, S>
 }

src/main/kotlin/com/papsign/ktor/openapigen/parameters/PathParamStyle.kt

@@ -1,6 +1,12 @@
 package com.papsign.ktor.openapigen.parameters
 
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
+import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.path.label.MatrixBuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix.LabelBuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.path.simple.SimpleBuilderFactory
 
-enum class PathParamStyle: ParameterStyle<PathParamStyle> {
-    DEFAULT, simple, label, matrix
+
+enum class PathParamStyle(override val factory: BuilderFactory<Builder<PathParamStyle>, PathParamStyle>): ParameterStyle<PathParamStyle> {
+    simple(SimpleBuilderFactory), label(LabelBuilderFactory), matrix(MatrixBuilderFactory)
 }

src/main/kotlin/com/papsign/ktor/openapigen/parameters/QueryParamStyle.kt

@@ -1,5 +1,12 @@
 package com.papsign.ktor.openapigen.parameters
 
-enum class QueryParamStyle: ParameterStyle<QueryParamStyle> {
-    DEFAULT, form, spaceDelimited, pipeDelimited, deepObject
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
+import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.query.deepobject.DeepBuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.query.delimited.PipeDelimitedBuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.query.delimited.SpaceDelimitedBuilderFactory
+import com.papsign.ktor.openapigen.parameters.parsers.builders.query.form.FormBuilderFactory
+
+enum class QueryParamStyle(override val factory: BuilderFactory<Builder<QueryParamStyle>, QueryParamStyle>): ParameterStyle<QueryParamStyle> {
+    form(FormBuilderFactory), spaceDelimited(SpaceDelimitedBuilderFactory), pipeDelimited(PipeDelimitedBuilderFactory), deepObject(DeepBuilderFactory)
 }

src/main/kotlin/com/papsign/ktor/openapigen/parameters/handlers/ModularParameterHander.kt

@@ -8,17 +8,18 @@ import com.papsign.ktor.openapigen.modules.ModuleProvider
 import com.papsign.ktor.openapigen.openapi.Parameter
 import com.papsign.ktor.openapigen.openapi.ParameterLocation
 import com.papsign.ktor.openapigen.openapi.Schema
-import com.papsign.ktor.openapigen.parameters.parsers.ParameterParser
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
 import io.ktor.http.Parameters
+import io.ktor.util.toMap
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.findAnnotation
 
-class ModularParameterHander<T>(val parsers: Map<KParameter, ParameterParser>, val constructor: KFunction<T>) :
+class ModularParameterHander<T>(val parsers: Map<KParameter, Builder<*>>, val constructor: KFunction<T>) :
     ParameterHandler<T> {
 
     override fun parse(parameters: Parameters): T {
-        return constructor.callBy(parsers.mapValues { it.value.parse(parameters) })
+        return constructor.callBy(parsers.mapValues { it.value.build(it.key.name!!, parameters.toMap()) })
     }
 
     override fun getParameters(apiGen: OpenAPIGen, provider: ModuleProvider<*>): List<Parameter<*>> {
@@ -40,7 +41,7 @@ class ModularParameterHander<T>(val parsers: Map<KParameter, ParameterParser>, v
                 it.description = description
                 it.allowEmptyValue = allowEmptyValues
                 it.deprecated = deprecated
-                it.style = parser.queryStyle
+                it.style = parser.style
                 it.explode = parser.explode
             }
         }
@@ -50,7 +51,7 @@ class ModularParameterHander<T>(val parsers: Map<KParameter, ParameterParser>, v
             return createParam(param, apiParam.`in`) {
                 it.description = description
                 it.deprecated = deprecated
-                it.style = parser.pathStyle
+                it.style = parser.style
                 it.explode = parser.explode
             }
         }

src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/CollectionParameterParser.kt

@@ -4,5 +4,5 @@ import kotlin.reflect.KType
 
 interface BuilderSelector<out T: Builder<*>> {
     fun canHandle(type: KType, explode: Boolean): Boolean
-    fun create(type: KType, exploded: Boolean): T
+    fun create(type: KType, explode: Boolean): T
 }

src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/EnumParameterParser.kt

@@ -0,0 +1,40 @@
+package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
+
+import com.papsign.ktor.openapigen.parameters.PathParamStyle
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
+import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderSelector
+import com.papsign.ktor.openapigen.parameters.parsers.converters.Converter
+import com.papsign.ktor.openapigen.parameters.parsers.converters.ConverterFactory
+import com.papsign.ktor.openapigen.parameters.parsers.converters.`object`.MappedConverter
+import com.papsign.ktor.openapigen.parameters.parsers.converters.collection.ListedConverter
+import kotlin.reflect.KType
+
+class MatrixBuilder(type: KType, override val explode: Boolean): Builder<PathParamStyle> {
+    override val style: PathParamStyle = PathParamStyle.label
+
+    private val converter: Converter = ConverterFactory.buildConverterForced(type)
+
+    override fun build(key: String, parameters: Map<String, List<String>>): Any? {
+        val value = parameters[key]?.let { it[0] } ?: return null
+        return if (explode) {
+            val groups = value.removePrefix(";").split(';').map { it.split('=').let { Pair(it[0], it.getOrElse(1){""}) } }
+            when (converter) {
+                is MappedConverter -> converter.convert(groups.toMap())
+                is ListedConverter -> converter.convert(groups.map { it.second })
+                else -> converter.convert(groups.first().second)
+            }
+        } else {
+            converter.convert(value.removePrefix(";$key="))
+        }
+    }
+
+    companion object: BuilderSelector<MatrixBuilder> {
+        override fun canHandle(type: KType, explode: Boolean): Boolean {
+            return true
+        }
+
+        override fun create(type: KType, explode: Boolean): MatrixBuilder {
+            return MatrixBuilder(type, explode)
+        }
+    }
+}

src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/InfoParameterParser.kt

@@ -0,0 +1,9 @@
+package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
+
+import com.papsign.ktor.openapigen.parameters.PathParamStyle
+import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
+import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderSelectorFactory
+
+object MatrixBuilderFactory: BuilderSelectorFactory<Builder<PathParamStyle>, PathParamStyle>(
+    MatrixBuilder
+)