ktor-client add toString() for generic params (#14717)

* ktor-client add toString() for generic params

* fix builder receivers
This commit is contained in:
Sergey Prytkov 2023-02-17 12:56:36 +03:00 committed by GitHub
parent 3746a2069f
commit 958609931b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 4 deletions

View File

@ -51,14 +51,58 @@ import com.fasterxml.jackson.databind.ObjectMapper
{{#isMultipart}} {{#isMultipart}}
formData { formData {
{{#formParams}} {{#formParams}}
{{#isFile}}
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) } {{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
{{/isFile}}
{{^isFile}}
{{^isArray}}
{{^isString}}
{{^isNumber}}
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.toString()) }
{{/isNumber}}
{{#isNumber}}
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
{{/isNumber}}
{{/isString}}
{{#isString}}
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}) }
{{/isString}}
{{/isArray}}
{{#isArray}}
for (int i=0; i < {{paramName}}.size(); i++) {
{{{paramName}}}?.apply { append("{{{baseName}}}", {{{paramName}}}.get(i).toString()) }
}
{{/isArray}}
{{/isFile}}
{{/formParams}} {{/formParams}}
} }
{{/isMultipart}} {{/isMultipart}}
{{^isMultipart}} {{^isMultipart}}
ParametersBuilder().also { ParametersBuilder().also {
{{#formParams}} {{#formParams}}
{{#isFile}}
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
{{/isFile}}
{{^isFile}}
{{^isArray}}
{{^isString}}
{{^isNumber}}
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}.toString()) } {{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}.toString()) }
{{/isNumber}}
{{#isNumber}}
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
{{/isNumber}}
{{/isString}}
{{#isString}}
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}) }
{{/isString}}
{{/isArray}}
{{#isArray}}
for (int i=0; i < {{paramName}}.size(); i++) {
{{{paramName}}}?.apply { it.append("{{{baseName}}}", {{{paramName}}}.get(i).toString()) }
}
{{/isArray}}
{{/isFile}}
{{/formParams}} {{/formParams}}
}.build() }.build()
{{/isMultipart}} {{/isMultipart}}

View File

@ -245,8 +245,8 @@ import java.text.DateFormat
val localVariableBody = val localVariableBody =
ParametersBuilder().also { ParametersBuilder().also {
name?.apply { it.append("name", name.toString()) } name?.apply { it.append("name", name) }
status?.apply { it.append("status", status.toString()) } status?.apply { it.append("status", status) }
}.build() }.build()
val localVariableQuery = mutableMapOf<String, List<String>>() val localVariableQuery = mutableMapOf<String, List<String>>()

View File

@ -243,8 +243,8 @@ import com.fasterxml.jackson.databind.ObjectMapper
val localVariableBody = val localVariableBody =
ParametersBuilder().also { ParametersBuilder().also {
name?.apply { it.append("name", name.toString()) } name?.apply { it.append("name", name) }
status?.apply { it.append("status", status.toString()) } status?.apply { it.append("status", status) }
}.build() }.build()
val localVariableQuery = mutableMapOf<String, List<String>>() val localVariableQuery = mutableMapOf<String, List<String>>()