loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[BUG] Kotlin wiremock query params are incorrect (#19720)

Browse Source
This commit is contained in:
Stefan Koppier 2024-09-30 12:44:08 +02:00 committed by GitHub
parent d68a186c5e
commit df22ca6dcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/kotlin-wiremock/api-stub.mustache vendored
View File

@ -35,10 +35,10 @@ open class {{classname}}Stubs(private val objectMapper: ObjectMapper) {
fun {{operationId}}({{#pathParams}}{{paramName}}: StringValuePattern, {{/pathParams}}{{#queryParams}}{{paramName}}: StringValuePattern? = null, {{/queryParams}}configurer: MappingBuilder.() -> MappingBuilder = { this }): {{operationIdCamelCase}}StubBuilder = fun {{operationId}}({{#pathParams}}{{paramName}}: StringValuePattern, {{/pathParams}}{{#queryParams}}{{paramName}}: StringValuePattern? = null, {{/queryParams}}configurer: MappingBuilder.() -> MappingBuilder = { this }): {{operationIdCamelCase}}StubBuilder =
{{operationIdCamelCase}}StubBuilder(objectMapper, {{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}(urlPathTemplate("{{path}}")) {{operationIdCamelCase}}StubBuilder(objectMapper, {{#lambda.lowercase}}{{httpMethod}}{{/lambda.lowercase}}(urlPathTemplate("{{path}}"))
{{#pathParams}} {{#pathParams}}
.withPathParam("{{paramName}}", {{paramName}}) .withPathParam("{{baseName}}", {{paramName}})
{{/pathParams}} {{/pathParams}}
{{#queryParams}} {{#queryParams}}
.apply { {{paramName}}?.let { withQueryParam("{{paramName}}", it) } } .apply { {{paramName}}?.let { withQueryParam("{{baseName}}", it) } }
{{/queryParams}} {{/queryParams}}
.configurer() .configurer()
) )

8
samples/server/echo_api/kotlin-wiremock/src/main/kotlin/org/openapitools/apis/PathApiStubs.kt
View File

@ -30,10 +30,10 @@ open class PathApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(pathString: StringValuePattern, pathInteger: StringValuePattern, enumNonrefStringPath: StringValuePattern, enumRefStringPath: StringValuePattern, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathStubBuilder = fun testsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPath(pathString: StringValuePattern, pathInteger: StringValuePattern, enumNonrefStringPath: StringValuePattern, enumRefStringPath: StringValuePattern, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathStubBuilder =
TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathStubBuilder(objectMapper, get(urlPathTemplate("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}")) TestsPathStringPathStringIntegerPathIntegerEnumNonrefStringPathEnumRefStringPathStubBuilder(objectMapper, get(urlPathTemplate("/path/string/{path_string}/integer/{path_integer}/{enum_nonref_string_path}/{enum_ref_string_path}"))
.withPathParam("pathString", pathString) .withPathParam("path_string", pathString)
.withPathParam("pathInteger", pathInteger) .withPathParam("path_integer", pathInteger)
.withPathParam("enumNonrefStringPath", enumNonrefStringPath) .withPathParam("enum_nonref_string_path", enumNonrefStringPath)
.withPathParam("enumRefStringPath", enumRefStringPath) .withPathParam("enum_ref_string_path", enumRefStringPath)
.configurer() .configurer()
) )
} }

22
samples/server/echo_api/kotlin-wiremock/src/main/kotlin/org/openapitools/apis/QueryApiStubs.kt
View File

@ -28,8 +28,8 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testEnumRefString(enumNonrefStringQuery: StringValuePattern? = null, enumRefStringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestEnumRefStringStubBuilder = fun testEnumRefString(enumNonrefStringQuery: StringValuePattern? = null, enumRefStringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestEnumRefStringStubBuilder =
TestEnumRefStringStubBuilder(objectMapper, get(urlPathTemplate("/query/enum_ref_string")) TestEnumRefStringStubBuilder(objectMapper, get(urlPathTemplate("/query/enum_ref_string"))
.apply { enumNonrefStringQuery?.let { withQueryParam("enumNonrefStringQuery", it) } } .apply { enumNonrefStringQuery?.let { withQueryParam("enum_nonref_string_query", it) } }
.apply { enumRefStringQuery?.let { withQueryParam("enumRefStringQuery", it) } } .apply { enumRefStringQuery?.let { withQueryParam("enum_ref_string_query", it) } }
.configurer() .configurer()
) )
@ -44,9 +44,9 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testQueryDatetimeDateString(datetimeQuery: StringValuePattern? = null, dateQuery: StringValuePattern? = null, stringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryDatetimeDateStringStubBuilder = fun testQueryDatetimeDateString(datetimeQuery: StringValuePattern? = null, dateQuery: StringValuePattern? = null, stringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryDatetimeDateStringStubBuilder =
TestQueryDatetimeDateStringStubBuilder(objectMapper, get(urlPathTemplate("/query/datetime/date/string")) TestQueryDatetimeDateStringStubBuilder(objectMapper, get(urlPathTemplate("/query/datetime/date/string"))
.apply { datetimeQuery?.let { withQueryParam("datetimeQuery", it) } } .apply { datetimeQuery?.let { withQueryParam("datetime_query", it) } }
.apply { dateQuery?.let { withQueryParam("dateQuery", it) } } .apply { dateQuery?.let { withQueryParam("date_query", it) } }
.apply { stringQuery?.let { withQueryParam("stringQuery", it) } } .apply { stringQuery?.let { withQueryParam("string_query", it) } }
.configurer() .configurer()
) )
@ -61,9 +61,9 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testQueryIntegerBooleanString(integerQuery: StringValuePattern? = null, booleanQuery: StringValuePattern? = null, stringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryIntegerBooleanStringStubBuilder = fun testQueryIntegerBooleanString(integerQuery: StringValuePattern? = null, booleanQuery: StringValuePattern? = null, stringQuery: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryIntegerBooleanStringStubBuilder =
TestQueryIntegerBooleanStringStubBuilder(objectMapper, get(urlPathTemplate("/query/integer/boolean/string")) TestQueryIntegerBooleanStringStubBuilder(objectMapper, get(urlPathTemplate("/query/integer/boolean/string"))
.apply { integerQuery?.let { withQueryParam("integerQuery", it) } } .apply { integerQuery?.let { withQueryParam("integer_query", it) } }
.apply { booleanQuery?.let { withQueryParam("booleanQuery", it) } } .apply { booleanQuery?.let { withQueryParam("boolean_query", it) } }
.apply { stringQuery?.let { withQueryParam("stringQuery", it) } } .apply { stringQuery?.let { withQueryParam("string_query", it) } }
.configurer() .configurer()
) )
@ -76,7 +76,7 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testQueryStyleDeepObjectExplodeTrueObject(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleDeepObjectExplodeTrueObjectStubBuilder = fun testQueryStyleDeepObjectExplodeTrueObject(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleDeepObjectExplodeTrueObjectStubBuilder =
TestQueryStyleDeepObjectExplodeTrueObjectStubBuilder(objectMapper, get(urlPathTemplate("/query/style_deepObject/explode_true/object")) TestQueryStyleDeepObjectExplodeTrueObjectStubBuilder(objectMapper, get(urlPathTemplate("/query/style_deepObject/explode_true/object"))
.apply { queryObject?.let { withQueryParam("queryObject", it) } } .apply { queryObject?.let { withQueryParam("query_object", it) } }
.configurer() .configurer()
) )
@ -89,7 +89,7 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testQueryStyleFormExplodeTrueArrayString(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleFormExplodeTrueArrayStringStubBuilder = fun testQueryStyleFormExplodeTrueArrayString(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleFormExplodeTrueArrayStringStubBuilder =
TestQueryStyleFormExplodeTrueArrayStringStubBuilder(objectMapper, get(urlPathTemplate("/query/style_form/explode_true/array_string")) TestQueryStyleFormExplodeTrueArrayStringStubBuilder(objectMapper, get(urlPathTemplate("/query/style_form/explode_true/array_string"))
.apply { queryObject?.let { withQueryParam("queryObject", it) } } .apply { queryObject?.let { withQueryParam("query_object", it) } }
.configurer() .configurer()
) )
@ -102,7 +102,7 @@ open class QueryApiStubs(private val objectMapper: ObjectMapper) {
*/ */
fun testQueryStyleFormExplodeTrueObject(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleFormExplodeTrueObjectStubBuilder = fun testQueryStyleFormExplodeTrueObject(queryObject: StringValuePattern? = null, configurer: MappingBuilder.() -> MappingBuilder = { this }): TestQueryStyleFormExplodeTrueObjectStubBuilder =
TestQueryStyleFormExplodeTrueObjectStubBuilder(objectMapper, get(urlPathTemplate("/query/style_form/explode_true/object")) TestQueryStyleFormExplodeTrueObjectStubBuilder(objectMapper, get(urlPathTemplate("/query/style_form/explode_true/object"))
.apply { queryObject?.let { withQueryParam("queryObject", it) } } .apply { queryObject?.let { withQueryParam("query_object", it) } }
.configurer() .configurer()
) )
} }