-
-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[kotlin] fix: explode object query parameters #24867
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -219,7 +219,23 @@ import {{packageName}}.infrastructure.Serializer | |
| {{/vars}} | ||
| {{/isModel}} | ||
| {{^isModel}} | ||
| {{#isMap}} | ||
| {{#isExplode}} | ||
| {{^isDeepObject}} | ||
| // form style explodes an object into one query parameter per entry, keyed by the property name alone | ||
| ({{{paramName}}} as? kotlin.collections.Map<*, *>)?.forEach { (key, value) -> put(key.toString(), listOf(value.toString())) } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. P2: When a map value is a collection, this sends Kotlin's collection representation as one query value instead of the declared wire format. Serialize each map value according to its inner schema, including collection and date formatting. Prompt for AI agents
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. P3: Map entries whose value (or key) is null serialize as the literal string Prompt for AI agents |
||
| {{/isDeepObject}} | ||
| {{#isDeepObject}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isDeepObject}} | ||
| {{/isExplode}} | ||
| {{^isExplode}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isExplode}} | ||
| {{/isMap}} | ||
| {{^isMap}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isMap}} | ||
| {{/isModel}} | ||
| } | ||
| {{/required}} | ||
|
|
@@ -234,7 +250,23 @@ import {{packageName}}.infrastructure.Serializer | |
| {{/vars}} | ||
| {{/isModel}} | ||
| {{^isModel}} | ||
| {{#isMap}} | ||
| {{#isExplode}} | ||
| {{^isDeepObject}} | ||
| // form style explodes an object into one query parameter per entry, keyed by the property name alone | ||
| ({{{paramName}}} as? kotlin.collections.Map<*, *>)?.forEach { (key, value) -> put(key.toString(), listOf(value.toString())) } | ||
| {{/isDeepObject}} | ||
| {{#isDeepObject}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isDeepObject}} | ||
| {{/isExplode}} | ||
| {{^isExplode}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isExplode}} | ||
| {{/isMap}} | ||
| {{^isMap}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isMap}} | ||
| {{/isModel}} | ||
| } | ||
| {{/isNullable}} | ||
|
|
@@ -247,7 +279,23 @@ import {{packageName}}.infrastructure.Serializer | |
| {{/vars}} | ||
| {{/isModel}} | ||
| {{^isModel}} | ||
| {{#isMap}} | ||
| {{#isExplode}} | ||
| {{^isDeepObject}} | ||
| // form style explodes an object into one query parameter per entry, keyed by the property name alone | ||
| ({{{paramName}}} as? kotlin.collections.Map<*, *>)?.forEach { (key, value) -> put(key.toString(), listOf(value.toString())) } | ||
| {{/isDeepObject}} | ||
| {{#isDeepObject}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isDeepObject}} | ||
| {{/isExplode}} | ||
| {{^isExplode}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isExplode}} | ||
| {{/isMap}} | ||
| {{^isMap}} | ||
| put("{{#lambda.escapeDollar}}{{baseName}}{{/lambda.escapeDollar}}", {{#isContainer}}toMultiValue({{{paramName}}}.toList(), "{{collectionFormat}}"){{/isContainer}}{{^isContainer}}listOf({{#isDateTime}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDateTime}}{{#isDate}}parseDateToQueryString<{{{dataType}}}>({{{paramName}}}){{/isDate}}{{#isEnum}}{{#isString}}{{{paramName}}}.value{{/isString}}{{^isString}}{{{paramName}}}.toString(){{/isString}}{{/isEnum}}{{^isEnum}}{{^isDateTime}}{{^isDate}}{{{paramName}}}.toString(){{/isDate}}{{/isDateTime}}{{/isEnum}}){{/isContainer}}) | ||
| {{/isMap}} | ||
| {{/isModel}} | ||
| {{/isNullable}} | ||
| {{/required}} | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| openapi: 3.0.3 | ||
| info: | ||
| title: Exploded object query parameters | ||
| description: > | ||
| Object typed query parameters, covering the four combinations of style and explode that | ||
| decide how an object is put on the wire. The free-form variants matter because a | ||
| free-form object is flagged isMap but not isContainer. | ||
| version: 1.0.0 | ||
| servers: | ||
| - url: localhost:8080 | ||
| paths: | ||
| /items: | ||
| get: | ||
| operationId: listItems | ||
| parameters: | ||
| # style and explode both left out, so the form/true defaults apply: every entry | ||
| # becomes its own parameter, keyed by the property name alone. | ||
| - in: query | ||
| name: filter | ||
| schema: | ||
| type: object | ||
| # the same, but declared as a map rather than as a free-form object | ||
| - in: query | ||
| name: typedFilter | ||
| schema: | ||
| type: object | ||
| additionalProperties: | ||
| type: string | ||
| # deepObject nests each entry under the parameter name: deepFilter[key]=value | ||
| - in: query | ||
| name: deepFilter | ||
| style: deepObject | ||
| explode: true | ||
| schema: | ||
| type: object | ||
| # form without explode keeps a single parameter carrying the whole object | ||
| - in: query | ||
| name: flatFilter | ||
| style: form | ||
| explode: false | ||
| schema: | ||
| type: object | ||
| responses: | ||
| '200': | ||
| description: a list of items | ||
| content: | ||
| application/json: | ||
| schema: | ||
| type: array | ||
| items: | ||
| type: string |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
P2: When an exploded object key matches another query parameter name,
putsilently overwrites that parameter's values. Append to the existing list so both query values remain on the wire.Prompt for AI agents