[kotlin-client] Add support okhttp3 and Android 4.x #4008

4brunu · 2019-10-01T06:52:10Z

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

@jimschubert (2017/09) ❤️, @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04)

This PR adds support for Add support okhttp3 and Android 4.x and fixes #4007

wing328 · 2019-10-01T13:55:19Z

@4brunu thanks for the PR. What about naming the option as "library" instead to make it more consistent with other generators (e.g. Java, Ruby) when it comes to supporting more than 1 HTTP library?

4brunu · 2019-10-01T14:21:08Z

@wing328 it's done, I also rerun the tests and the pet projects 🙂

wing328 · 2019-10-01T14:40:46Z

@4brunu sorry I was not clear. I mean something like https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java#L146-L154

wing328 · 2019-10-01T14:52:13Z

and for Java client: https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java#L149-L161

4brunu · 2019-10-01T21:52:39Z

Hi, I was trying to do the changes but now the generator with the pet projects it's not working.
I tried to look at the code but I can't find what's wrong.
Maybe renaming jvm to jvm-okhttp3 and jvm-okhttp4?

Here is the commit and the logs.
It looks like it can't find a file.
Can you please take a look at it?
Because I don't know what's wrong :S

Log

# START SCRIPT: bin/kotlin-client-okhttp3.sh [main] INFO o.o.codegen.DefaultGenerator - OpenAPI Generator: kotlin (client) [main] INFO o.o.codegen.DefaultGenerator - Generator 'kotlin' is considered stable. [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] INFO o.o.c.l.AbstractKotlinCodegen - Environment variable KOTLIN_POST_PROCESS_FILE not defined so the Kotlin code may not be properly formatted. To define it, try 'export KOTLIN_POST_PROCESS_FILE="/usr/local/bin/ktlint -F"' (Linux/Mac) [main] INFO o.o.c.l.AbstractKotlinCodegen - NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI). [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/ApiResponse.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/Category.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/Order.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/Pet.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/Tag.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/User.md [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.DefaultCodegen - Multiple MediaTypes found, using only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.DefaultCodegen - Multiple MediaTypes found, using only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] WARN o.o.codegen.utils.ModelUtils - Multiple schemas found in content, returning only the first one [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/PetApi.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/StoreApi.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/docs/UserApi.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/README.md [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/build.gradle [main] INFO o.o.codegen.AbstractGenerator - writing file /Users/bruno.coelho/Developer/openapi-generator/samples/client/petstore/kotlin-okhttp3/settings.gradle [main] ERROR o.o.codegen.AbstractGenerator - kotlin-client/infrastructure/ApiClient.kt.mustache (No such file or directory) [main] ERROR o.o.codegen.AbstractGenerator - kotlin-client/infrastructure/ApiClient.kt.mustache (No such file or directory) [main] ERROR o.o.codegen.AbstractGenerator - can't load template kotlin-client/infrastructure/ApiClient.kt.mustache [main] ERROR o.o.codegen.AbstractGenerator - can't load template kotlin-client/infrastructure/ApiClient.kt.mustache Exception in thread "main" java.lang.RuntimeException: Could not generate supporting file 'SupportingFile: templateFile: infrastructure/ApiClient.kt.mustache folder: src/main/kotlin/org/openapitools/client/infrastructure destinationFilename: ApiClient.kt ' at org.openapitools.codegen.DefaultGenerator.generateSupportingFiles(DefaultGenerator.java:751) at org.openapitools.codegen.DefaultGenerator.generate(DefaultGenerator.java:930) at org.openapitools.codegen.cmd.Generate.run(Generate.java:408) at org.openapitools.codegen.OpenAPIGenerator.main(OpenAPIGenerator.java:60) Caused by: java.lang.RuntimeException: can't load template kotlin-client/infrastructure/ApiClient.kt.mustache at org.openapitools.codegen.AbstractGenerator.readTemplate(AbstractGenerator.java:122) at org.openapitools.codegen.DefaultGenerator.getFullTemplateContents(DefaultGenerator.java:941) at org.openapitools.codegen.templating.MustacheEngineAdapter.compileTemplate(MustacheEngineAdapter.java:51) at org.openapitools.codegen.DefaultGenerator.generateSupportingFiles(DefaultGenerator.java:723) ... 3 more cp: CI/samples.ci/client/petstore/kotlin-okhttp3/pom.xml: No such file or directory

Can you please check the commit to see if this is was you had in mind?

Since kotlin has the concept of jvm and multiplatform library, I'm not sure if it works nice to have a jvm-okhttp4 and jvm-okhttp3.
What do you think?

wing328 · 2019-10-02T03:17:39Z

Maybe renaming jvm to jvm-okhttp3 and jvm-okhttp4?

Sounds good to me

wing328 · 2019-10-02T03:26:48Z

Can you please check the commit to see if this is was you had in mind?

I'll try to find some time to review later today.

wing328 · 2019-10-02T14:57:24Z

Can you please push 4brunu@7190a80 to this branch/PR when you've time? Easy for me to try to it and figure out what's wrong.

…-support-okhttp3 # Conflicts: # modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

4brunu · 2019-10-02T14:59:35Z

@wing328 done. thanks for helping 👍

wing328 · 2019-10-02T16:20:03Z

@4brunu I've figured out the reason and got a "workaround' to make it work with all 3 different library settings. Please PM tomorrow (Thur) via Slack when you've time.

Slack channel: https://join.slack.com/t/openapi-generator/shared_invite/enQtNzAyNDMyOTU0OTE1LTY5ZDBiNDI5NzI5ZjQ1Y2E5OWVjMjZkYzY1ZGM2MWQ4YWFjMzcyNDY5MGI4NjQxNDBiMTlmZTc5NjY2ZTQ5MGM

4brunu · 2019-10-03T11:30:22Z

Thanks for the help, now it's working 🙂
The CI is failing, but I took a look at the logs and I think this is not related to the changes in this PR.
Please let me know if there any more changes required to merge this PR.
Thanks 👍

4brunu · 2019-10-03T12:53:30Z

Don't merge this branch! After doing some more tests, It's not working.

4brunu · 2019-10-03T13:38:31Z

@wing328 the Serialisation and Parcelable/Parcelize features stop working.

When migrating to library it stoped working...
Here was working 7190a80 and after that it's nor working.

Here is a screenshot that shows what's wrong in the models.

The generator is not generating the imports and @Json(name = "...")

Do you have any idea why?

4brunu · 2019-10-03T17:24:05Z

@wing328 sorry for the spam...
I updated the test case to have the correct output.
This way is very simple to test issue.
You checkout this branch, run the following command sh bin/kotlin-client-all.sh and in your git, you shouldn't see any change.
If you see any change (you will) that's the issue that shouldn't happen.
Thanks 🙂

4brunu · 2019-10-04T07:34:33Z

@wing328 Sorry for all of this, but it's now fixed.
I removed a flag jvm -> true that was still necessary that I thought that wasn't, and that tah was used in some places.
But now with the last commit 5b9dc22 everything is working again.
For me this can now be merged.

wing328 · 2019-10-09T08:38:03Z

CI failure not related to this PR.

4brunu added 2 commits October 1, 2019 07:38

[kotlin] support okhttp3

2b99ff3

[kotlin] create okhttp3 sample

c04d400

wing328 added Client: Kotlin Enhancement: Feature labels Oct 1, 2019

wing328 added this to the 4.1.3 milestone Oct 1, 2019

[kotlin-client] rename HttpClient to HttpLibrary

eb47057

4brunu added 2 commits October 1, 2019 21:59

[kotlin] move okhttp 3 to library model

7190a80

[kotlin] fix okhttp3 version

400a254

Merge branch 'feature/library-jvm-okhttp3' into feature/kotlin-client…

a642b90

…-support-okhttp3 # Conflicts: # modules/openapi-generator/src/main/resources/kotlin-client/build.gradle.mustache

[kotlin] fix kotlin client jvm okhttp3

5ce1bd0

[kotlin] fix wrong spacing in okhttp3 code

e440077

[kotlin] update okhttp3 sample to use parcelize models

def1800

wing328 modified the milestones: 4.1.3, 4.2.0 Oct 4, 2019

[kotlin] readd jvm tag

5b9dc22

wing328 merged commit 7a369d3 into OpenAPITools:master Oct 9, 2019

4brunu deleted the feature/kotlin-client-support-okhttp3 branch October 10, 2019 14:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[kotlin-client] Add support okhttp3 and Android 4.x #4008

[kotlin-client] Add support okhttp3 and Android 4.x #4008

4brunu commented Oct 1, 2019

wing328 commented Oct 1, 2019

4brunu commented Oct 1, 2019

wing328 commented Oct 1, 2019

wing328 commented Oct 1, 2019

4brunu commented Oct 1, 2019

wing328 commented Oct 2, 2019

wing328 commented Oct 2, 2019

wing328 commented Oct 2, 2019

4brunu commented Oct 2, 2019

wing328 commented Oct 2, 2019 •

edited

Loading

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 4, 2019

wing328 commented Oct 9, 2019

[kotlin-client] Add support okhttp3 and Android 4.x #4008

[kotlin-client] Add support okhttp3 and Android 4.x #4008

Conversation

4brunu commented Oct 1, 2019

PR checklist

Description of the PR

wing328 commented Oct 1, 2019

4brunu commented Oct 1, 2019

wing328 commented Oct 1, 2019

wing328 commented Oct 1, 2019

4brunu commented Oct 1, 2019

wing328 commented Oct 2, 2019

wing328 commented Oct 2, 2019

wing328 commented Oct 2, 2019

4brunu commented Oct 2, 2019

wing328 commented Oct 2, 2019 • edited Loading

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 3, 2019

4brunu commented Oct 4, 2019

wing328 commented Oct 9, 2019

wing328 commented Oct 2, 2019 •

edited

Loading