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] Fix parse error when using custom field names with @Json #2944

Merged
merged 3 commits into from
May 22, 2019

Conversation

keijumt
Copy link
Contributor

@keijumt keijumt commented May 20, 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

To parse a model using custom fields, KotlinJsonAdapterFactory needs to be added to moshi's Adapter.

  • Fix parse error when using custom field names with @JSON
  • Fix to use isEmpty method for string length verification

(details of the change, additional tests that have been done, reference to the issue for tracking, etc)

Copy link
Contributor

@karismann karismann left a comment

Choose a reason for hiding this comment

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

LGTM

@ackintosh
Copy link
Contributor

I just reran the CI job. > Shippable TIMEOUT

@karismann
Copy link
Contributor

should fix #2961

@keijumt
Copy link
Contributor Author

keijumt commented May 22, 2019

@karismann
#2961 is solved by adding KotlinJsonAdapterFactory to adapter of Moshi.
I think that there is no problem because I added KotlinJsonAdapterFactory after adding CustomTypeAdapter, What do you think of it?

@karismann
Copy link
Contributor

@karismann
#2961 is solved by adding KotlinJsonAdapterFactory to adapter of Moshi.
I think that there is no problem because I added KotlinJsonAdapterFactory after adding CustomTypeAdapter, What do you think of it?

i think your change is ok and fix #2961 , that's what i would mean

@keijumt
Copy link
Contributor Author

keijumt commented May 22, 2019

@karismann
I understand, Thanks.

@ackintosh ackintosh merged commit 1e06d7f into OpenAPITools:master May 22, 2019
@wing328
Copy link
Member

wing328 commented Jun 3, 2019

@keijumt thanks again for your contribution, which has been included in the v4.0.1 release (https://twitter.com/oas_generator/status/1135534738658062336)

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.

None yet

4 participants