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][client] bytearray conversion #2166

Merged
merged 4 commits into from
Feb 18, 2019
Merged

[kotlin][client] bytearray conversion #2166

merged 4 commits into from
Feb 18, 2019

Conversation

alexnavratil
Copy link
Contributor

@alexnavratil alexnavratil commented Feb 15, 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, ./bin/security/{LANG}-petstore.sh and ./bin/openapi3/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: master, 3.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

@jimschubert , @dr4ke616

Description of the PR

Moshi doesn't support parsing a base64 encoded string (as defined for fields with type: string, format: byte) to a kotlin.ByteArray. The simplest solution to overcome this limitation was to convert those fields to kotlin.String instead of kotlin.ByteArray. Another solution would be to write a custom type adapter for moshi to support string to ByteArray conversions. I have chosen the first method as this was the simplest for now. If there's something against it, I have already prepared a custom type adapter ;)

PS: There might be problems with converting fields of type number to BigDecimal as well as this isn't supported by moshi as far as I know. For this case, a custom type adapter is the only solution. If you think, it would be good to add this also in this PR, I would implement it.

@auto-labeler
Copy link

auto-labeler bot commented Feb 15, 2019

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

@jimschubert
Copy link
Member

@alexnavratil great catch!

If you have the type adapter, can we use that instead? The issue with changing the default mapping is that although it works, it's not technically correct. A savvy user might notice this, and remap via the type-mappings option back to a byte array. With a type adapter, we'd be safe in both situations and any other type-mapping changes would be on the user to ensure there's a valid adapter.

@alexnavratil
Copy link
Contributor Author

good point, I have added the ByteArrayAdapter as promised.

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 excellent, thanks!
The failing CI build on this PR is due to bin/util/ensure-up-to-date failing (meaning the PR is behind master). It's all new code on this PR, so I think it's good to merge as-is. There's a master build queued atm, but I think this can be merged once that's done.

@wing328 wing328 merged commit aace459 into OpenAPITools:master Feb 18, 2019
@wing328 wing328 added this to the 4.0.0 milestone Feb 18, 2019
jimschubert added a commit that referenced this pull request Feb 23, 2019
* master: (40 commits)
  [Python] remove default value from being fallback to example (#2213)
  Add petstore integration tests to Ruby OAS3 client (#2211)
  Gradle - make GenerateTask properties optional (#2185)
  skip bats installation (#2198)
  Something in the dependencies changed. This switch is no longer needed. (#1850)
  Use oauth token for basic bearer auth in Rust. (#2161)
  Fix missing nullable (#2189)
  Enable error handling in Java WebClient library, fixes #1243 (#1244)
  [core] fix referenced enum case (#2175)
  rest-template: allow array parameters in path using collectionFormat (#2177)
  update go petstore samples
  Fix string types for cpprestsdk client generator (#1676)
  update kotline samples
  Remove API Key Authentication code for go when cookie is used. (#1601)
  changed the package install instructions to install the .tgz package … (#1989)
  okhttp-gson: allow array parameters in path using collectionFormat (#2137)
  [Ruby] Fix regualr expression in error message (#2069) (#2139)
  [kotlin][client] bytearray conversion (#2166)
  [rust-server] Added client documentation to rust-server (#2159)
  [Java] Getter/Setter naming convention not followed in generated models (#2095)
  ...
A-Joshi pushed a commit to ihsmarkitoss/openapi-generator that referenced this pull request Feb 27, 2019
* use kotlin.String for ByteArray fields (type: string, format: byte)

* revert "use kotlin.String for ByteArray fields (type: string, format: byte)"

* add ByteArrayAdapter for string <-> ByteArray conversion with moshi
@maxammann
Copy link

Isn't this wrong? I think he openapi spec specifies that the string must be base64. Also encoding just a random bytearray as UTF-8 is very dangerous.

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