Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.4 #9358

saschpe · 2021-04-28T07:23:13Z

Use Gradle 6.9 and Kotlin 1.4.32. Generate Paths for other HTTP verbs (#828) and fix imports (#5640). Use 'object' when no parameters are used. Introduce 'featureMetrics' to control metrics plugin usage. Remove HOCON configuration parsing. This is provided by Application.environment.config already and removes a dependency.

Resolves #9087, resolves #828, resolves #5640
Relates-To #5346

PR checklist

Read the contribution guidelines.
Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
Run the following to build the project and update samples:
```
./mvnw clean package 
./bin/generate-samples.sh
./bin/utils/export_docs_generators.sh
```
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
For Windows users, please run the script in Git BASH.
File the PR against the correct branch: master, 5.1.x, 6.0.x
If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@jimschubert

wing328 · 2021-04-28T07:44:03Z

@saschpe thanks for the PR. Is this change similar to #9088?

Can you have a look at it to see if it meets your requirement as well?

saschpe · 2021-04-28T07:48:16Z

@saschpe thanks for the PR. Is this change similar to #9088?

Can you have a look at it to see if it meets your requirement as well?

I didn't see this PR initially. It also improves quite a few things but it's not recent enough and misses a few things. Whenever that PR gets merged I'd be happy to rebase this one onto it and fix it.

saschpe · 2021-04-28T07:49:42Z

Once both PRs are merged (i.e. after review and potential reworks), I will change the serialization mechanism to be configurable in order to allow using kotlinx.serialization.

wing328 · 2021-04-28T07:50:42Z

👌 I'll ping you here when #9088 gets merged.

wing328 · 2021-04-28T13:58:47Z

I've merged #9088 into 5.2.x branch. Please kindly rebase your work on that and target the PR for 5.2.x branch

saschpe · 2021-04-28T13:59:35Z

Ok

saschpe · 2021-04-28T14:31:28Z

Question: master or 5.2.x ?

wing328 · 2021-04-28T14:44:58Z

5.2.x (minor release - breaking changes with fallbacks) as that PR was merged into 5.2.x (instead of master)

Current master (patch release - no breaking changes) will be released soon.

saschpe · 2021-04-29T08:11:04Z

Rebased and re-targeted towards 5.2.x

wing328 · 2021-04-29T10:25:21Z

@saschpe thanks for the update.

cc @jimschubert (2017/09), @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03)

rsinukov · 2021-04-30T11:54:35Z

LGTM from Ktor side.
@wing328 feel free to ping me in the future if you have changes related to the Ktor.

saschpe · 2021-05-04T12:12:28Z

The Travis-CI error looks unrelated but I lack the rights to re-build.

4brunu · 2021-05-04T12:18:02Z

It looks unrelated.
To restart the CI you can close and reopen this PR.

saschpe · 2021-05-04T12:19:19Z

Uhm, wouldn't it be enough for a project maintainer to press re-build on Travis-CI rather than creating confusion here?

4brunu · 2021-05-04T12:20:53Z

Sure, I was just trying to show you a quick way to restart CI.

saschpe · 2021-05-11T05:51:35Z

@jimschubert ping

saschpe · 2021-05-20T08:31:09Z

Mhm, no real review progress here. Meanwhile, the 5.2.x Branch was merged into master. Shall I rebase this one onto master or keep waiting?

wing328 · 2021-05-20T14:52:02Z

Yes please rebase this one onto master.

I'll try to review tomorrow or this weekend.

saschpe · 2021-05-21T07:22:39Z

The Travis-CI error around node_modules/@types/bluebird/index.d.ts(42,47): happens on other branches and merge requests as well.

4brunu · 2021-05-21T08:51:41Z

Thanks, the remaining CI issues are not related to this PR 👍

.../openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java

wing328 · 2021-05-31T09:20:14Z

I got the following when running gradle test with the output:

> Task :compileKotlin
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/AppMain.kt: (50, 22): Unresolved reference: HttpClient
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/AppMain.kt: (50, 33): Unresolved reference: Apache
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/Configuration.kt: (55, 29): Unresolved reference: HttpMethod
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/Configuration.kt: (56, 24): Unresolved reference: settings
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/Configuration.kt: (57, 28): Unresolved reference: settings
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (30, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (32, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (32, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (61, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (63, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (63, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (69, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (71, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (71, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (100, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (102, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (102, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (131, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (133, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (162, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (164, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (164, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (193, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (195, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (195, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (201, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (203, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (203, 55): Unresolved reference: OAuthAccessTokenResponse
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt: (33, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt: (35, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (29, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (31, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (37, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (39, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (45, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (47, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (53, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (55, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (85, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (87, 30): Unresolved reference: authentication
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (93, 5): Unresolved reference: authenticate
e: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (95, 30): Unresolved reference: authentication

> Task :compileKotlin FAILED

Command to generate code:

java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate -g kotlin-server -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -o /tmp/kotlin-server

Can you please take a look when you've time?

saschpe · 2021-05-31T10:48:56Z

I got the following when running gradle test with the output:
[...]
Can you please take a look when you've time?

Should be fixed.

Use Gradle 6.9 and Kotlin 1.4.32. Generate Paths for other HTTP verbs (OpenAPITools#828) and fix imports (OpenAPITools#5640). Use 'object' when no parameters are used. Introduce 'featureMetrics' to control metrics plugin usage. Remove HOCON configuration parsing. This is provided by `Application.environment.config already` and removes a dependency. Resolves OpenAPITools#9087, resolves OpenAPITools#828, resolves OpenAPITools#5640 Relates-To OpenAPITools#5346

saschpe · 2021-06-11T05:50:51Z

Anything left to do here?

saschpe · 2021-06-18T10:39:51Z

ping

wing328 · 2021-06-20T14:03:35Z

Tested again and it's now built successfully:

$ gradle build
Starting a Gradle Daemon (subsequent builds will be faster)

> Task :compileKotlin
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (33, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (64, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (72, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (103, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (134, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (165, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (196, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/PetApi.kt: (204, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt: (36, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (32, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (40, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (48, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (56, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (88, 13): Variable 'principal' is never used
w: /private/tmp/kotlin-server/src/main/kotlin/org/openapitools/server/apis/UserApi.kt: (96, 13): Variable 'principal' is never used

Deprecated Gradle features were used in this build, making it incompatible with Gradle 8.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/7.0.2/userguide/command_line_interface.html#sec:command_line_warnings

wing328 added Enhancement: Compatibility Enhancement: General Server: Kotlin labels Apr 28, 2021

wing328 added this to the 5.1.1 milestone Apr 28, 2021

wing328 mentioned this pull request Apr 28, 2021

[kotlin] Ktor server upgrade (v1.5.2) #9088

Merged

5 tasks

saschpe changed the title ~~Kotlin-Server: Modernize and upgrade to Ktor 1.5.3~~ Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.3 Apr 29, 2021

saschpe force-pushed the kotlin-server-modernize branch from 483bb18 to 9d12ff1 Compare April 29, 2021 08:03

saschpe requested a review from jimschubert as a code owner April 29, 2021 08:03

saschpe changed the base branch from master to 5.2.x April 29, 2021 08:03

saschpe force-pushed the kotlin-server-modernize branch from 9d12ff1 to fdad64c Compare April 29, 2021 08:12

saschpe force-pushed the kotlin-server-modernize branch from fdad64c to a33ec6f Compare April 30, 2021 09:57

saschpe changed the title ~~Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.3~~ Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.4 Apr 30, 2021

wing328 modified the milestones: 5.1.1, 5.2.0 May 10, 2021

saschpe force-pushed the kotlin-server-modernize branch from a33ec6f to 0416414 Compare May 11, 2021 12:54

saschpe force-pushed the kotlin-server-modernize branch from 0416414 to 6efab20 Compare May 21, 2021 06:16

saschpe changed the base branch from 5.2.x to master May 21, 2021 06:16

saschpe mentioned this pull request May 25, 2021

Kotlin-Client: Fix kotlinx_serialization #9576

Merged

5 tasks

saschpe force-pushed the kotlin-server-modernize branch from 6efab20 to 27967d6 Compare May 26, 2021 10:39

wing328 reviewed May 31, 2021

View reviewed changes

.../openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java Outdated Show resolved Hide resolved

saschpe force-pushed the kotlin-server-modernize branch from 27967d6 to 7c13193 Compare May 31, 2021 10:34

saschpe force-pushed the kotlin-server-modernize branch from 7c13193 to 2e5326e Compare June 3, 2021 08:31

wing328 merged commit 463d905 into OpenAPITools:master Jun 20, 2021

saschpe deleted the kotlin-server-modernize branch June 25, 2021 07:35

Uh oh!

Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.4 #9358

Kotlin-Server: Optional metrics and upgrade to Ktor 1.5.4 #9358

Uh oh!

Conversation

saschpe commented Apr 28, 2021

PR checklist

Uh oh!

wing328 commented Apr 28, 2021

Uh oh!

saschpe commented Apr 28, 2021

Uh oh!

saschpe commented Apr 28, 2021

Uh oh!

wing328 commented Apr 28, 2021

Uh oh!

wing328 commented Apr 28, 2021

Uh oh!

saschpe commented Apr 28, 2021

Uh oh!

saschpe commented Apr 28, 2021

Uh oh!

wing328 commented Apr 28, 2021

Uh oh!

saschpe commented Apr 29, 2021

Uh oh!

wing328 commented Apr 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rsinukov commented Apr 30, 2021

Uh oh!

saschpe commented May 4, 2021

Uh oh!

4brunu commented May 4, 2021

Uh oh!

saschpe commented May 4, 2021

Uh oh!

4brunu commented May 4, 2021

Uh oh!

saschpe commented May 11, 2021

Uh oh!

saschpe commented May 20, 2021

Uh oh!

wing328 commented May 20, 2021

Uh oh!

saschpe commented May 21, 2021

Uh oh!

4brunu commented May 21, 2021

Uh oh!

Uh oh!

wing328 commented May 31, 2021

Uh oh!

saschpe commented May 31, 2021

Uh oh!

saschpe commented Jun 11, 2021

Uh oh!

saschpe commented Jun 18, 2021

Uh oh!

wing328 commented Jun 20, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wing328 commented Apr 29, 2021 •

edited

Loading