Skip to content

Commit 2ba5879

Browse files
dsteeleydsteeley
committed
Merge remote-tracking branch 'origin/master' into integer-enums
2 parents 9d18606 + 459f359 commit 2ba5879

784 files changed

Lines changed: 24529 additions & 3489 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/samples-jdk17.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
1515
# servers
1616
- samples/openapi3/server/petstore/springboot-3/**
17+
- samples/server/petstore/springboot-x-implements-skip/**
1718
- samples/server/petstore/java-camel/**
1819
- samples/server/petstore/java-helidon-server/v3/mp/**
1920
- samples/server/petstore/java-helidon-server/v3/se/**
@@ -31,6 +32,7 @@ on:
3132
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
3233
# servers
3334
- samples/openapi3/server/petstore/springboot-3/**
35+
- samples/server/petstore/springboot-x-implements-skip/**
3436
- samples/server/petstore/java-camel/**
3537
- samples/server/petstore/java-helidon-server/v3/mp/**
3638
- samples/server/petstore/java-helidon-server/v3/se/**
@@ -54,6 +56,7 @@ jobs:
5456
- samples/client/petstore/java/microprofile-rest-client-outer-enum
5557
# servers
5658
- samples/openapi3/server/petstore/springboot-3
59+
- samples/server/petstore/springboot-x-implements-skip
5760
- samples/server/petstore/java-camel/
5861
- samples/server/petstore/java-helidon-server/v3/mp/
5962
- samples/server/petstore/java-helidon-server/v3/se

‎.github/workflows/samples-kotlin-echo-api.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
- samples/client/echo_api/kotlin-jvm-spring-3-restclient
2121
- samples/client/echo_api/kotlin-model-prefix-type-mappings
2222
- samples/client/echo_api/kotlin-jvm-okhttp
23+
- samples/client/echo_api/kotlin-jvm-okhttp-multipart-json
2324
steps:
2425
- uses: actions/checkout@v5
2526
- uses: actions/setup-java@v5

‎.github/workflows/samples-kotlin-server-jdk17.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Samples Kotlin server (jdk17)
33
on:
44
push:
55
paths:
6+
- 'samples/server/others/kotlin-server/**'
67
- 'samples/server/petstore/kotlin-springboot-3*/**'
78
- 'samples/server/petstore/kotlin-server/**'
89
- 'samples/server/petstore/kotlin-server-modelMutable/**'
@@ -13,6 +14,7 @@ on:
1314
# - samples/server/petstore/kotlin-spring-default/**
1415
pull_request:
1516
paths:
17+
- 'samples/server/others/kotlin-server/**'
1618
- 'samples/server/petstore/kotlin-springboot-3*/**'
1719
- 'samples/server/petstore/kotlin-server/**'
1820
- 'samples/server/petstore/kotlin-server-modelMutable/**'
@@ -34,6 +36,10 @@ jobs:
3436
matrix:
3537
sample:
3638
# server
39+
- samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
40+
- samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
41+
- samples/server/others/kotlin-server/polymorphism-and-discriminator
42+
- samples/server/others/kotlin-server/polymorphism
3743
- samples/server/petstore/kotlin-server-required-and-nullable-properties
3844
- samples/server/petstore/kotlin-springboot-3
3945
- samples/server/petstore/kotlin-springboot-3-no-response-entity

‎.github/workflows/samples-kotlin-server-jdk21.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ name: Samples Kotlin server (jdk21)
33
on:
44
push:
55
paths:
6+
- 'samples/server/others/kotlin-server/**'
67
- 'samples/server/petstore/kotlin-server/**'
78
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
89
pull_request:
910
paths:
11+
- 'samples/server/others/kotlin-server/**'
1012
- 'samples/server/petstore/kotlin-server/**'
1113
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
1214

@@ -21,6 +23,10 @@ jobs:
2123
fail-fast: false
2224
matrix:
2325
sample:
26+
- samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
27+
- samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
28+
- samples/server/others/kotlin-server/polymorphism-and-discriminator
29+
- samples/server/others/kotlin-server/polymorphism
2430
- samples/server/petstore/kotlin-server/javalin-6
2531
- samples/server/petstore/kotlin-server/ktor
2632
- samples/server/petstore/kotlin-server/ktor2

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ samples/client/petstore/kotlin*/src/main/kotlin/test/
229229
samples/client/petstore/kotlin*/build/
230230
samples/server/others/kotlin-server/jaxrs-spec/build/
231231
samples/client/echo_api/kotlin-jvm-spring-3-restclient/build/
232+
samples/client/echo_api/kotlin-jvm-spring-3-webclient/build/
232233
samples/client/echo_api/kotlin-jvm-okhttp/build/
234+
samples/client/echo_api/kotlin-jvm-okhttp-multipart-json/build/
233235

234236
# haskell
235237
.stack-work

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,7 @@ If you want to join the committee, please kindly apply by sending an email to te
12601260
| JMeter | @kannkyo (2021/01) |
12611261
| Jetbrains HTTP Client | @jlengrand (2023/01) |
12621262
| Julia | @tanmaykm (2023/01) |
1263-
| Kotlin | @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) @e5l (2024/10) |
1263+
| Kotlin | @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) @e5l (2024/10) @dennisameling (2026/02) |
12641264
| Lua | @daurnimator (2017/08) |
12651265
| N4JS | @mmews-n4 (2023/03) |
12661266
| Nim | |
@@ -1276,7 +1276,7 @@ If you want to join the committee, please kindly apply by sending an email to te
12761276
| Rust | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10) @dsteeley (2025/07) |
12771277
| Scala | @clasnake (2017/07), @shijinkui (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04) @fish86 (2023/06) |
12781278
| Swift | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11) @dydus0x14 (2023/06) |
1279-
| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) @joscha (2024/10) |
1279+
| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) @joscha (2024/10) @dennisameling (2026/02) |
12801280
| Xojo | @Topheee (2023/04) |
12811281

12821282

‎bin/configs/java-camel-petstore-new.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ outputDir: samples/server/petstore/java-camel
33
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
44
templateDir: modules/openapi-generator/src/main/resources/java-camel-server
55
additionalProperties:
6-
oas3: "true"
76
hideGenerationTimestamp: true
87
camelRestBindingMode: "auto"
98
performBeanValidation: true
109
#dateLibrary: "java8-localdatetime"
1110
camelDataformatProperties: "json.out.disableFeatures=WRITE_DATES_AS_TIMESTAMPS"
12-
library: "spring-boot"
1311
withXml: true
1412
jackson: true
1513
camelUseDefaultValidationErrorProcessor: true

‎bin/configs/kotlin-server-polymorphism-allof-and-discriminator.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
generatorName: kotlin-server
2+
outputDir: samples/server/others/kotlin-server/polymorphism-allof-and-discriminator
3+
inputSpec: modules/openapi-generator/src/test/resources/3_1/polymorphism-allof-and-discriminator.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-server
5+
additionalProperties:
6+
artifactId: kotlin-server-polymorphism-allof-and-discriminator
7+
library: javalin6

‎bin/configs/kotlin-server-polymorphism-and-discriminator-disabled-jackson-fix.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
generatorName: kotlin-server
2+
outputDir: samples/server/others/kotlin-server/polymorphism-and-discriminator-disabled-jackson-fix
3+
inputSpec: modules/openapi-generator/src/test/resources/3_1/polymorphism-and-discriminator.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-server
5+
additionalProperties:
6+
artifactId: kotlin-server-polymorphism-and-discriminator-disabled-jackson-fix
7+
library: javalin6
8+
# This is set to "true" by default, but we also want to test the case where it's set to false.
9+
# See KotlinServerCodegen.java for more details about this property.
10+
fixJacksonJsonTypeInfoInheritance: false

‎bin/configs/kotlin-server-polymorphism-and-discriminator.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: kotlin-server
2+
outputDir: samples/server/others/kotlin-server/polymorphism-and-discriminator
3+
inputSpec: modules/openapi-generator/src/test/resources/3_1/polymorphism-and-discriminator.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-server
5+
additionalProperties:
6+
artifactId: kotlin-server-polymorphism-and-discriminator
7+
library: javalin6
8+
fixJacksonJsonTypeInfoInheritance: true

0 commit comments

Comments
 (0)