Skip to content

Commit 451d767

Browse files
committed
Fixed some oversights
1 parent 142a2d0 commit 451d767

File tree

8 files changed

+10
-12
lines changed

8 files changed

+10
-12
lines changed

src/main/kotlin/com/papsign/ktor/openapigen/annotations/parameters/QueryParam.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import com.papsign.ktor.openapigen.parameters.QueryParamStyle
88
@APIParam(ParameterLocation.query)
99
annotation class QueryParam(
1010
val description: String,
11-
val style: QueryParamStyle = QueryParamStyle.DEFAULT,
11+
val style: QueryParamStyle = QueryParamStyle.form,
1212
val explode: Boolean = true,
1313
val allowEmptyValues: Boolean = false,
1414
val deprecated: Boolean = false

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.papsign.ktor.openapigen.parameters
22

33
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
44
import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderFactory
5-
import com.papsign.ktor.openapigen.parameters.parsers.builders.path.label.MatrixBuilderFactory
6-
import com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix.LabelBuilderFactory
5+
import com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix.MatrixBuilderFactory
6+
import com.papsign.ktor.openapigen.parameters.parsers.builders.path.label.LabelBuilderFactory
77
import com.papsign.ktor.openapigen.parameters.parsers.builders.path.simple.SimpleBuilderFactory
88

99

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix
1+
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
22

33
import com.papsign.ktor.openapigen.parameters.PathParamStyle
44
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix
1+
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
22

33
import com.papsign.ktor.openapigen.parameters.PathParamStyle
44
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder

src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/builders/path/label/MatrixBuilder.kt renamed to src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/builders/path/matrix/MatrixBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
1+
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix
22

33
import com.papsign.ktor.openapigen.parameters.PathParamStyle
44
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder
@@ -10,7 +10,7 @@ import com.papsign.ktor.openapigen.parameters.parsers.converters.collection.List
1010
import kotlin.reflect.KType
1111

1212
class MatrixBuilder(type: KType, override val explode: Boolean): Builder<PathParamStyle> {
13-
override val style: PathParamStyle = PathParamStyle.label
13+
override val style: PathParamStyle = PathParamStyle.matrix
1414

1515
private val converter: Converter = ConverterFactory.buildConverterForced(type)
1616

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.label
1+
package com.papsign.ktor.openapigen.parameters.parsers.builders.path.matrix
22

33
import com.papsign.ktor.openapigen.parameters.PathParamStyle
44
import com.papsign.ktor.openapigen.parameters.parsers.builders.Builder

src/main/kotlin/com/papsign/ktor/openapigen/parameters/parsers/builders/query/deepobject/MapDeepBuilder.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.papsign.ktor.openapigen.parameters.parsers.builders.query.deepobject
22

33
import com.papsign.ktor.openapigen.parameters.parsers.builders.BuilderSelector
44
import com.papsign.ktor.openapigen.parameters.parsers.converters.primitive.PrimitiveConverterFactory
5-
import com.papsign.ktor.openapigen.parameters.util.primitiveParsers
65
import kotlin.reflect.KType
76
import kotlin.reflect.full.isSubclassOf
87
import kotlin.reflect.jvm.jvmErasure

src/test/kotlin/Basic.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.papsign.ktor.openapigen.annotations.parameters.PathParam
66
import com.papsign.ktor.openapigen.annotations.parameters.QueryParam
77
import com.papsign.ktor.openapigen.openAPIGen
88
import com.papsign.ktor.openapigen.parameters.PathParamStyle
9+
import com.papsign.ktor.openapigen.parameters.QueryParamStyle
910
import com.papsign.ktor.openapigen.route.apiRouting
1011
import com.papsign.ktor.openapigen.route.info
1112
import com.papsign.ktor.openapigen.route.path.normal.get
@@ -105,9 +106,7 @@ object Basic {
105106
@QueryParam("Optional String") val optional: A? // Nullable Types are optional
106107
)
107108

108-
data class A(val b: B)
109-
110-
data class B(val lst: List<String>)
109+
data class A(val b: String)
111110

112111
// A response can be any class, but a description will be generated from the annotation
113112
@Response("A String Response")

0 commit comments

Comments
 (0)