Skip to content

Commit bbc17b7

Browse files
PicazsooPicazsoo
committed
Merge branch 'master' into feature/fix-values3
# Conflicts: # modules/openapi-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache # modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
2 parents bedfa3b + 8a65919 commit bbc17b7

378 files changed

Lines changed: 32353 additions & 217 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
@@ -74,6 +74,7 @@ jobs:
7474
- samples/client/petstore/java/webclient-useSingleRequestParameter
7575
- samples/client/petstore/java/vertx
7676
- samples/client/petstore/java/vertx5
77+
- samples/client/petstore/java/vertx5-supportVertxFuture
7778
- samples/client/petstore/java/vertx-no-nullable
7879
- samples/client/petstore/java/vertx-supportVertxFuture
7980
- samples/client/petstore/java/jersey2-java8-localdatetime

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
- samples/client/petstore/kotlin-enum-integers-multiplatform
5454
- samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4
5555
- samples/client/petstore/kotlin-array-simple-string-multiplatform
56+
- samples/client/petstore/kotlin-array-nullable-items
57+
- samples/client/petstore/kotlin-array-nullable-items-multiplatform
5658
- samples/client/petstore/kotlin-bigdecimal-default-multiplatform
5759
- samples/client/petstore/kotlin-bigdecimal-default-okhttp4
5860
- samples/client/petstore/kotlin-jvm-jackson

‎bin/configs/java-vertx5-supportVertxFuture.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/vertx5-supportVertxFuture
3+
library: vertx
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
useVertx5: "true"
7+
useRxJava3: "true"
8+
additionalProperties:
9+
artifactId: petstore-vertx5-supportVertxFuture
10+
hideGenerationTimestamp: "true"
11+
dateLibrary: java8
12+
supportVertxFuture: "true"

‎bin/configs/kotlin-array-nullable-items-multiplatform.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: kotlin
2+
outputDir: samples/client/petstore/kotlin-array-nullable-items-multiplatform
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/kotlin-array-nullable-items.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-client
5+
additionalProperties:
6+
artifactId: kotlin-array-nullable-items-multiplatform
7+
library: multiplatform
8+
dateLibrary: kotlinx-datetime

‎bin/configs/kotlin-array-nullable-items.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
generatorName: kotlin
2+
outputDir: samples/client/petstore/kotlin-array-nullable-items
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/kotlin-array-nullable-items.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-client
5+
additionalProperties:
6+
artifactId: kotlin-array-nullable-items

‎bin/configs/kotlin-enum-default-value.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ additionalProperties:
77
serializableModel: "true"
88
dateLibrary: java8
99
enumUnknownDefaultCase: true
10+
enumPropertyNaming: bestEffortBacktick
1011
enumNameMappings:
1112
CHRISTMAS_DAY: XMAS_DAY

‎docs/generators/kotlin-misk.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2929
|apiSuffix|suffix for api classes| |Api|
3030
|artifactId|Generated artifact id (name of jar).| |null|
3131
|artifactVersion|Generated artifact's package version.| |1.0.0|
32-
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
32+
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original|
3333
|generateStubImplClasses|Generate Stub Impl Classes| |false|
3434
|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
3535
|implicitHeaders|Skip header parameters in the generated API methods.| |false|

‎docs/generators/kotlin-server.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2222
|apiSuffix|suffix for api classes| |Api|
2323
|artifactId|Generated artifact id (name of jar).| |kotlin-server|
2424
|artifactVersion|Generated artifact's package version.| |1.0.0|
25-
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
25+
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original|
2626
|featureAutoHead|Automatically provide responses to HEAD requests for existing routes that have the GET verb defined.| |true|
2727
|featureCORS|Ktor by default provides an interceptor for implementing proper support for Cross-Origin Resource Sharing (CORS). See enable-cors.org.| |false|
2828
|featureCompression|Adds ability to compress outgoing content using gzip, deflate or custom encoder and thus reduce size of the response.| |true|

‎docs/generators/kotlin-spring.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3232
|declarativeInterfaceReactiveMode|What type of reactive style to use in Spring Http declarative interface|<dl><dt>**coroutines**</dt><dd>Use kotlin-idiomatic 'suspend' functions</dd><dt>**reactor**</dt><dd>Use reactor return wrappers 'Mono' and 'Flux'</dd></dl>|coroutines|
3333
|delegatePattern|Whether to generate the server files using the delegate pattern| |false|
3434
|documentationProvider|Select the OpenAPI documentation provider.|<dl><dt>**none**</dt><dd>Do not publish an OpenAPI specification.</dd><dt>**source**</dt><dd>Publish the original input OpenAPI specification.</dd><dt>**springdoc**</dt><dd>Generate an OpenAPI 3 specification using SpringDoc.</dd></dl>|springdoc|
35-
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
35+
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original|
3636
|exceptionHandler|generate default global exception handlers (not compatible with reactive. enabling reactive will disable exceptionHandler )| |true|
3737
|generatePageableConstraintValidation|Generate a @ValidPageable annotation and PageableConstraintValidator class, and apply @ValidPageable to the injected Pageable parameter of operations whose 'page' or 'size' parameter specifies a maximum constraint. The annotation enforces those constraints on the Pageable object that replaces the individual page/size query parameters. Requires useBeanValidation=true and library=spring-boot.| |false|
3838
|generateSortValidation|Generate a @ValidSort annotation and SortValidator class, and apply @ValidSort to the injected Pageable parameter of operations whose 'sort' parameter has enum values. The annotation validates that sort values in the Pageable object match the allowed enum values from the spec. Requires useBeanValidation=true and library=spring-boot.| |false|

‎docs/generators/kotlin-vertx.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2222
|apiSuffix|suffix for api classes| |Api|
2323
|artifactId|Generated artifact id (name of jar).| |null|
2424
|artifactVersion|Generated artifact's package version.| |1.0.0|
25-
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
25+
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', 'original', and 'bestEffortBacktick' (like 'original' but tries to wrap values in backticks before falling back to sanitizing, e.g. `name,asc` stays `name,asc` rather than becoming nameCommaAsc; useful for sort/order enums)| |original|
2626
|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
2727
|implicitHeaders|Skip header parameters in the generated API methods.| |false|
2828
|modelMutable|Create mutable models| |false|

0 commit comments

Comments
 (0)