Skip to content

Commit 9586099

Browse files
authored
ktor-client add toString() for generic params (#14717)
* ktor-client add toString() for generic params * fix builder receivers
1 parent 3746a20 commit 9586099

File tree

3 files changed

+48
-4
lines changed
  • modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor
  • samples/client/petstore
    • kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis
    • kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis

3 files changed

+48
-4
lines changed

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,58 @@ import com.fasterxml.jackson.databind.ObjectMapper
5151
{{#isMultipart}}
5252
formData {
5353
{{#formParams}}
54+
{{#isFile}}
5455
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
56+
{{/isFile}}
57+
{{^isFile}}
58+
{{^isArray}}
59+
{{^isString}}
60+
{{^isNumber}}
61+
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.toString()) }
62+
{{/isNumber}}
63+
{{#isNumber}}
64+
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
65+
{{/isNumber}}
66+
{{/isString}}
67+
{{#isString}}
68+
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
69+
{{/isString}}
70+
{{/isArray}}
71+
{{#isArray}}
72+
for (int i=0; i < {{paramName}}.size(); i++) {
73+
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.get(i).toString()) }
74+
}
75+
{{/isArray}}
76+
{{/isFile}}
5577
{{/formParams}}
5678
}
5779
{{/isMultipart}}
5880
{{^isMultipart}}
5981
ParametersBuilder().also {
6082
{{#formParams}}
83+
{{#isFile}}
84+
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
85+
{{/isFile}}
86+
{{^isFile}}
87+
{{^isArray}}
88+
{{^isString}}
89+
{{^isNumber}}
6190
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}.toString()) }
91+
{{/isNumber}}
92+
{{#isNumber}}
93+
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
94+
{{/isNumber}}
95+
{{/isString}}
96+
{{#isString}}
97+
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
98+
{{/isString}}
99+
{{/isArray}}
100+
{{#isArray}}
101+
for (int i=0; i < {{paramName}}.size(); i++) {
102+
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}.get(i).toString()) }
103+
}
104+
{{/isArray}}
105+
{{/isFile}}
62106
{{/formParams}}
63107
}.build()
64108
{{/isMultipart}}

samples/client/petstore/kotlin-jvm-ktor-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ import java.text.DateFormat
245245

246246
val localVariableBody =
247247
ParametersBuilder().also {
248-
name?.apply { it.append("name", name.toString()) }
249-
status?.apply { it.append("status", status.toString()) }
248+
name?.apply { it.append("name", name) }
249+
status?.apply { it.append("status", status) }
250250
}.build()
251251

252252
val localVariableQuery = mutableMapOf<String, List<String>>()

samples/client/petstore/kotlin-jvm-ktor-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
243243

244244
val localVariableBody =
245245
ParametersBuilder().also {
246-
name?.apply { it.append("name", name.toString()) }
247-
status?.apply { it.append("status", status.toString()) }
246+
name?.apply { it.append("name", name) }
247+
status?.apply { it.append("status", status) }
248248
}.build()
249249

250250
val localVariableQuery = mutableMapOf<String, List<String>>()

0 commit comments

Comments
 (0)