Skip to content

Commit 7a77e3c

Browse files
PicazsooPicazsoo
committed
Merge branch 'master' into feat/fix-required-false-with-default
# Conflicts: # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Cat.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Category.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Dog.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Order.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Pet.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/Tag.kt # samples/server/petstore/kotlin-springboot-x-kotlin-implements/src/main/kotlin/org/openapitools/model/User.kt
2 parents 4993124 + e86daf9 commit 7a77e3c

1,195 files changed

Lines changed: 70893 additions & 4102 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-java-client-jdk11.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
- samples/client/petstore/java/native
6262
- samples/client/petstore/java/native-async
6363
- samples/client/petstore/java/native-jakarta
64+
- samples/client/petstore/java/native-useGzipFeature
6465
- samples/client/petstore/java/retrofit2
6566
- samples/client/petstore/java/retrofit2rx2
6667
- samples/client/petstore/java/retrofit2rx3

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ jobs:
3434
- samples/server/petstore/jaxrs-cxf-cdi
3535
- samples/server/petstore/jaxrs-cxf-non-spring-app
3636
- samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations
37+
- samples/server/petstore/jaxrs-spec-swagger-annotations
38+
- samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta
39+
- samples/server/petstore/jaxrs-spec-swagger-v3-annotations
3740
steps:
3841
- uses: actions/checkout@v5
3942
- uses: actions/setup-java@v5

‎.github/workflows/samples-kotlin-client.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
- samples/client/petstore/kotlin-threetenbp
4545
- samples/client/petstore/kotlin-kotlinx-datetime
4646
- samples/client/petstore/kotlin-uppercase-enum
47+
- samples/client/petstore/kotlin-array-integer-enum
4748
- samples/client/petstore/kotlin-default-values-jvm-okhttp4
4849
- samples/client/petstore/kotlin-default-values-jvm-retrofit2
4950
- samples/client/petstore/kotlin-default-values-jvm-volley
@@ -71,6 +72,7 @@ jobs:
7172
- samples/client/others/kotlin-jvm-okhttp-path-comments
7273
- samples/client/others/kotlin-integer-enum
7374
- samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization
75+
- samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
7476
steps:
7577
- uses: actions/checkout@v5
7678
- 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
@@ -8,6 +8,7 @@ on:
88
- 'samples/server/petstore/kotlin-server-modelMutable/**'
99
- 'samples/server/petstore/kotlin-springboot-*/**'
1010
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
11+
- 'samples/server/petstore/kotlin-spring-declarative*/**'
1112
# comment out due to gradle build failure
1213
# - samples/server/petstore/kotlin-spring-default/**
1314
pull_request:
@@ -17,6 +18,7 @@ on:
1718
- 'samples/server/petstore/kotlin-server-modelMutable/**'
1819
- 'samples/server/petstore/kotlin-springboot-*/**'
1920
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
21+
- 'samples/server/petstore/kotlin-spring-declarative*/**'
2022
# comment out due to gradle build failure
2123
# - samples/server/petstore/kotlin-spring-default/**
2224

@@ -44,6 +46,10 @@ jobs:
4446
- samples/server/petstore/kotlin-server/ktor
4547
- samples/server/petstore/kotlin-server/ktor2
4648
- samples/server/petstore/kotlin-misk
49+
- samples/server/petstore/kotlin-spring-declarative-interface
50+
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
51+
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
52+
- samples/server/petstore/kotlin-spring-declarative-interface-wrapped
4753
# comment out due to gradle build failure
4854
# - samples/server/petstore/kotlin-spring-default/
4955
steps:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- samples/server/petstore/kotlin-springboot-source-swagger2
4040
- samples/server/petstore/kotlin-springboot-springfox
4141
- samples/server/petstore/kotlin-springboot-x-kotlin-implements
42+
- samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
4243
- samples/server/petstore/kotlin-server/ktor
4344
- samples/server/petstore/kotlin-server/ktor2
4445
- samples/server/petstore/kotlin-server/jaxrs-spec

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,7 @@ Here is a list of template creators:
11821182
* Scala Finch: @jimschubert [:heart:](https://www.patreon.com/jimschubert)
11831183
* Scala Lagom: @gmkumar2005
11841184
* Scala Play: @adigerber
1185+
* TypeScript NestJS: @aryobenholzner
11851186
* Documentation
11861187
* AsciiDoc: @man-at-home
11871188
* HTML Doc 2: @jhitchcock

‎bin/configs/java-native-useGzipFeature.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/native-useGzipFeature
3+
library: native
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-addpet-only.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
artifactId: petstore-native-useGzipFeature
8+
hideGenerationTimestamp: "true"
9+
useJakartaEe: "true"

‎bin/configs/jaxrs-spec-swagger-annotations.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
generatorName: jaxrs-spec
2+
outputDir: samples/server/petstore/jaxrs-spec-swagger-annotations
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
5+
additionalProperties:
6+
artifactId: jaxrs-spec-petstore-server
7+
serializableModel: "true"
8+
hideGenerationTimestamp: "true"
9+
implicitHeadersRegex: (api_key|enum_header_string)
10+
generateBuilders: "true"
11+
useSwaggerAnnotations: "true"

‎bin/configs/jaxrs-spec-swagger-v3-annotations-jakarta.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: jaxrs-spec
2+
outputDir: samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
5+
additionalProperties:
6+
artifactId: jaxrs-spec-petstore-server-jakarta-swagger-v3
7+
serializableModel: "true"
8+
hideGenerationTimestamp: "true"
9+
implicitHeadersRegex: (api_key|enum_header_string)
10+
generateBuilders: "true"
11+
useSwaggerV3Annotations: "true"
12+
useJakartaEe: "true"

‎bin/configs/jaxrs-spec-swagger-v3-annotations.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
generatorName: jaxrs-spec
2+
outputDir: samples/server/petstore/jaxrs-spec-swagger-v3-annotations
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/JavaJaxRS/spec
5+
additionalProperties:
6+
artifactId: jaxrs-spec-petstore-server
7+
serializableModel: "true"
8+
hideGenerationTimestamp: "true"
9+
implicitHeadersRegex: (api_key|enum_header_string)
10+
generateBuilders: "true"
11+
useSwaggerV3Annotations: "true"

0 commit comments

Comments
 (0)