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

[go-experimental] Fix issue with Nullable marshaling comparing value to empty string no matter the enum type #4712

Merged
merged 1 commit into from
Dec 17, 2019

Conversation

zippolyte
Copy link
Contributor

For enum models, there was a hardcoded v.Value != "" in the template, where v.Value could be any type, so the code wouldn't compile.
This PR removes this to make the marshaling function identical with non-enum types, and removes the duplication.

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project before.
  • Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
  • File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

cc @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07)

@@ -132,7 +107,7 @@ func (v Nullable{{{classname}}}) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor

@bkabrda bkabrda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good fix, LGTM 👍

Copy link
Member

@jimschubert jimschubert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@jimschubert jimschubert added this to the 4.2.3 milestone Dec 17, 2019
@jimschubert jimschubert merged commit 7ea4dcd into OpenAPITools:master Dec 17, 2019
@zippolyte zippolyte deleted the hippo/go_nullable branch December 17, 2019 12:38
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.

4 participants