Skip to content

Commit fd1099c

Browse files
committed
Merge branch 'master' into python-httpx-sync
2 parents ea0fddd + fbb99d2 commit fd1099c

602 files changed

Lines changed: 9735 additions & 1001 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.

.geminiignore

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# .geminiignore
2+
# This file specifies intentionally untracked files that Gemini CLI should ignore.
3+
# It uses the same pattern matching rules as .gitignore.
4+
5+
# Build artifacts
6+
target/
7+
build/
8+
*.jar
9+
*.war
10+
*.ear
11+
*.class
12+
*.log
13+
14+
# IDE and editor files
15+
.idea/
16+
.vscode/
17+
*.iml
18+
*.ipr
19+
*.iws
20+
21+
# Maven/Gradle wrapper directories
22+
.mvn/wrapper/
23+
.gradle/
24+
25+
# Node.js dependencies for website
26+
website/node_modules/
27+
website/build/
28+
29+
# Generated sources by OpenAPI Generator (usually not to be touched directly)
30+
# This includes sample outputs which are generated code for various languages.
31+
samples/
32+
33+
# Temporary files
34+
tmp/
35+
.DS_Store
36+
# Eclipse
37+
.classpath
38+
.project
39+
.settings
40+
41+
# IntelliJ IDEA
42+
.idea/
43+
*.iml
44+
*.iws
45+
*.iwp
46+
.vscode/
47+
48+
# MacOS
49+
.DS_Store
50+
51+
# ReSharper
52+
*.resharper
53+
54+
# Visual Studio
55+
.vs/
56+
*.user
57+
*.suo
58+
*.sln.docstates
59+
60+
# Other
61+
*.bak
62+
*.swp
63+
*~
64+
.#*

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- 'samples/client/petstore/kotlin*/**'
1212
- 'samples/client/others/kotlin-jvm-okhttp-parameter-tests/**'
1313
- samples/client/others/kotlin-integer-enum/**
14+
- samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization/**
1415

1516
jobs:
1617
build:
@@ -70,6 +71,7 @@ jobs:
7071
- samples/client/others/kotlin-integer-enum
7172
- samples/client/petstore/kotlin-allOf-discriminator-kotlinx-serialization
7273
- samples/client/others/kotlin-oneOf-discriminator-kotlinx-serialization
74+
- samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization
7375
steps:
7476
- uses: actions/checkout@v5
7577
- uses: actions/setup-java@v5

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- 'samples/server/petstore/kotlin-springboot-*/**'
1111
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
1212
- 'samples/server/petstore/kotlin-spring-declarative*/**'
13+
- 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
1314
# comment out due to gradle build failure
1415
# - samples/server/petstore/kotlin-spring-default/**
1516
pull_request:
@@ -21,6 +22,7 @@ on:
2122
- 'samples/server/petstore/kotlin-springboot-*/**'
2223
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
2324
- 'samples/server/petstore/kotlin-spring-declarative*/**'
25+
- 'samples/server/petstore/kotlin-spring-sealed-interfaces/**'
2426
# comment out due to gradle build failure
2527
# - samples/server/petstore/kotlin-spring-default/**
2628

@@ -57,6 +59,7 @@ jobs:
5759
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines
5860
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped
5961
- samples/server/petstore/kotlin-spring-declarative-interface-wrapped
62+
- samples/server/petstore/kotlin-spring-sealed-interfaces
6063
# comment out due to gradle build failure
6164
# - samples/server/petstore/kotlin-spring-default/
6265
steps:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: kotlin
2+
outputDir: samples/client/others/kotlin-oneOf-anyOf-kotlinx-serialization
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/oneof-anyof-non-discriminator.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-client
5+
additionalProperties:
6+
artifactId: kotlin-oneOf-anyOf-kotlinx-serialization
7+
serializableModel: "false"
8+
dateLibrary: java8
9+
library: jvm-retrofit2
10+
enumUnknownDefaultCase: true
11+
serializationLibrary: kotlinx_serialization
12+
generateOneOfAnyOfWrappers: true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
generatorName: kotlin-spring
2+
outputDir: samples/server/petstore/kotlin-spring-sealed-interfaces
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
5+
additionalProperties:
6+
useSealedResponseInterfaces: true
7+
interfaceOnly: true
8+
dateLibrary: java8
9+
useSpringBoot3: true
10+
reactive: false
11+
documentationProvider: none

docs/generators/dart-dio.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2626
|equalityCheckMethod|Specify equality check method. Takes effect only in case if serializationLibrary is json_serializable.|<dl><dt>**default**</dt><dd>[DEFAULT] Built in hash code generation method</dd><dt>**equatable**</dt><dd>Uses equatable library for equality checking</dd></dl>|default|
2727
|finalProperties|Whether properties are marked as final when using Json Serializable for serialization| |true|
2828
|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
29+
|patchOnly|Only apply Optional&lt;T&gt; to PATCH operation request bodies (requires useOptional=true)| |false|
2930
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
3031
|pubAuthor|Author name in generated pubspec| |Author|
3132
|pubAuthorEmail|Email address of the author in generated pubspec| |author@homepage|
@@ -42,6 +43,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
4243
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
4344
|sourceFolder|source folder for generated code| |src|
4445
|useEnumExtension|Allow the 'x-enum-values' extension for enums| |false|
46+
|useOptional|Use Optional&lt;T&gt; to distinguish absent, null, and present for optional fields (Dart 3+)| |false|
4547

4648
## IMPORT MAPPING
4749

docs/generators/dart.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2323
|ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
2424
|enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
2525
|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
26+
|patchOnly|Only apply Optional&lt;T&gt; to PATCH operation request bodies (requires useOptional=true)| |false|
2627
|prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
2728
|pubAuthor|Author name in generated pubspec| |Author|
2829
|pubAuthorEmail|Email address of the author in generated pubspec| |author@homepage|
@@ -38,6 +39,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3839
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
3940
|sourceFolder|source folder for generated code| |src|
4041
|useEnumExtension|Allow the 'x-enum-values' extension for enums| |false|
42+
|useOptional|Use Optional&lt;T&gt; to distinguish absent, null, and present for optional fields (Dart 3+)| |false|
4143

4244
## IMPORT MAPPING
4345

docs/generators/kotlin-spring.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
5959
|useFeignClientUrl|Whether to generate Feign client with url parameter.| |true|
6060
|useFlowForArrayReturnType|Whether to use Flow for array/collection return types when reactive is enabled. If false, will use List instead.| |true|
6161
|useResponseEntity|Whether (when false) to return actual type (e.g. List&lt;Fruit&gt;) and handle non-happy path responses via exceptions flow or (when true) return entire ResponseEntity (e.g. ResponseEntity&lt;List&lt;Fruit&gt;&gt;). If disabled, method are annotated using a @ResponseStatus annotation, which has the status of the first response declared in the Api definition| |true|
62+
|useSealedResponseInterfaces|Generate sealed interfaces for endpoint responses that all possible response types implement. Allows controllers to return any valid response type in a type-safe manner (e.g., sealed interface CreateUserResponse implemented by User, ConflictResponse, ErrorResponse)| |false|
6263
|useSpringBoot3|Generate code and provide dependencies for use with Spring Boot &ge; 3 (use jakarta instead of javax in imports). Enabling this option will also enable `useJakartaEe`.| |false|
6364
|useSwaggerUI|Open the OpenApi specification in swagger-ui. Will also import and configure needed dependencies| |true|
6465
|useTags|Whether to use tags for creating interface and controller class names| |false|

docs/generators/kotlin.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
2727
|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original|
2828
|explicitApi|Generates code with explicit access modifiers to comply with Kotlin Explicit API Mode.| |false|
2929
|failOnUnknownProperties|Fail Jackson de-serialization on unknown properties| |false|
30-
|generateOneOfAnyOfWrappers|Generate oneOf, anyOf schemas as wrappers. Only `jvm-retrofit2`(library), `gson`(serializationLibrary) support this option.| |false|
30+
|generateOneOfAnyOfWrappers|Generate oneOf, anyOf schemas as wrappers. Only `jvm-retrofit2`(library) with `gson` or `kotlinx_serialization`(serializationLibrary) support this option.| |false|
3131
|generateRoomModels|Generate Android Room database models in addition to API models (JVM Volley library only)| |false|
3232
|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools|
3333
|idea|Add IntelliJ Idea plugin and mark Kotlin main and test folders as source folders.| |false|

0 commit comments

Comments
 (0)