Skip to content
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

Fix generation of query parameters for optional/nullable function arguments #3903

Merged
merged 2 commits into from Oct 21, 2019
Merged

Conversation

ghost
Copy link

@ghost ghost commented Sep 17, 2019

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.
  • Filed the PR against the correct branch: master, 4.1.x, 5.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

Fixes #3880

For a more complex example than the one from the issue, the generated code looks like this:

fun getClients(withHostname: kotlin.String, page: kotlin.Int?, size: kotlin.Int?, withOrg: kotlin.String?) : Clients {
    val localVariableBody: kotlin.Any? = null
    val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
        .apply {
            if (page != null) {
                put("page", listOf(page.toString()))
            }
            if (size != null) {
                put("size", listOf(size.toString()))
            }
            put("withHostname", listOf(withHostname.toString()))
            if (withOrg != null) {
                put("withOrg", listOf(withOrg.toString()))
            }
        }

    [...]
}

Reviewers: @jimschubert , @dr4ke616 , @karismann , @Zomzog

@wing328
Copy link
Member

wing328 commented Oct 21, 2019

Tested locally with optional query parameters and the code looks good.

@wing328 wing328 merged commit ba04939 into OpenAPITools:master Oct 21, 2019
@wing328
Copy link
Member

wing328 commented Oct 21, 2019

@atetzner thanks again for the PR. I've filed #4197 to better support nulalble for the query parameters

@wing328
Copy link
Member

wing328 commented Oct 31, 2019

@atetzner thanks for the PR, which has been included in v4.2.0 release: https://twitter.com/oas_generator/status/1189824932345069569

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] [KOTLIN] [CLIENT] Optional query parameters handled wrong
2 participants