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

[kotlin] Add json annotation to each enum value. #7908

Merged
merged 3 commits into from
Apr 4, 2018

Conversation

ejithon
Copy link
Contributor

@ejithon ejithon commented Mar 26, 2018

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 and ./bin/security/{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\.
  • Filed the PR against the correct branch: 3.0.0 branch for changes related to OpenAPI spec 3.0. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

#7811

Add moshi.Json annotation to each enum value.

@ejithon ejithon changed the title [kotlin] Add json annotation [kotlin] Add json annotation to each enum value. Mar 26, 2018
@wing328
Copy link
Contributor

wing328 commented Mar 30, 2018

cc @jimschubert for review.

Copy link
Contributor

@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. I just recommend avoiding the two empty lines adding to non-enums due to the new condition.

@@ -1,3 +1,5 @@
{{#hasEnums}}import com.squareup.moshi.Json{{/hasEnums}}

Copy link
Contributor

Choose a reason for hiding this comment

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

Can you remove this extra newline?

Also, I think the newline generated by the hasEnums check when that is false can be eliminated by putting the opening and closing tags on their own lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jimschubert Thank you for reviewing, I will remove it soon.

@ejithon
Copy link
Contributor Author

ejithon commented Mar 30, 2018

@jimschubert Does my updating make sense?

@jimschubert
Copy link
Contributor

@ejithon definitely! Thanks.

@wing328 wing328 merged commit 3c5fb1d into swagger-api:master Apr 4, 2018
@ejithon ejithon deleted the kotlin-add-json-annotation branch April 5, 2018 01:32
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.

3 participants