Skip to content

Commit d7935d4

Browse files
NiltiakSivadNiltiakSivad
authored
Merge branch 'OpenAPITools:master' into typescript-axios-detect-iam-auth
2 parents 910a15d + 5eb083e commit d7935d4

File tree

1,689 files changed

+16040
-9240
lines changed

Some content is hidden

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

1,689 files changed

+16040
-9240
lines changed

‎.github/workflows/samples-java-client-jdk11.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ jobs:
110110
path: |
111111
~/.m2
112112
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
113-
- name: Build
113+
- name: Build with Maven
114114
working-directory: ${{ matrix.sample }}
115115
run: mvn clean package --no-transfer-progress
116+
117+
- name: Cache gradle dependencies
118+
uses: actions/cache@v4
119+
env:
120+
cache-name: gradle-caches
121+
with:
122+
path: ~/.gradle/caches
123+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
124+
125+
- name: Cache gradle wrapper
126+
uses: actions/cache@v4
127+
env:
128+
cache-name: gradle-wrapper
129+
with:
130+
path: ~/.gradle/wrapper
131+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
132+
133+
- name: Build with Gradle
134+
working-directory: ${{ matrix.sample }}
135+
if: ${{ hashFiles('./gradlew') != '' }}
136+
run: ./gradlew build -x test

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ on:
77
- samples/client/petstore/java/webclient-jakarta/**
88
- samples/client/petstore/java/restclient-*/**
99
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
10+
- samples/client/others/java/restclient-enum-in-multipart/**
1011
pull_request:
1112
paths:
1213
- samples/client/petstore/java/resttemplate-jakarta/**
1314
- samples/client/petstore/java/webclient-jakarta/**
1415
- samples/client/petstore/java/restclient-*/**
1516
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
17+
- samples/client/others/java/restclient-enum-in-multipart/**
1618
jobs:
1719
build:
1820
name: Build Java Client JDK17
@@ -30,6 +32,7 @@ jobs:
3032
- samples/client/petstore/java/restclient-useSingleRequestParameter
3133
- samples/client/petstore/java/restclient-useSingleRequestParameter-static
3234
- samples/client/petstore/java/webclient-useSingleRequestParameter
35+
- samples/client/others/java/restclient-enum-in-multipart
3336
steps:
3437
- uses: actions/checkout@v4
3538
- uses: actions/setup-java@v4

‎.github/workflows/samples-php8.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- samples/server/petstore/php-symfony/SymfonyBundle-php/**
77
- samples/server/petstore/php-flight/**
88
- samples/server/petstore/php-laravel/**
9+
- samples/server/petstore/php-laravel-issue-21334/**
910
pull_request:
1011
paths:
1112
- samples/server/petstore/php-symfony/SymfonyBundle-php/**
1213
- samples/server/petstore/php-flight/**
1314
- samples/server/petstore/php-laravel/**
15+
- samples/server/petstore/php-laravel-issue-21334/**
1416
jobs:
1517
build:
1618
name: Build PHP projects
@@ -28,6 +30,7 @@ jobs:
2830
- samples/server/petstore/php-symfony/SymfonyBundle-php/
2931
- samples/server/petstore/php-flight/
3032
- samples/server/petstore/php-laravel/
33+
- samples/server/petstore/php-laravel-issue-21334/
3134
steps:
3235
- uses: actions/checkout@v4
3336
- name: Setup PHP with tools

‎.github/workflows/samples-python-petstore.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ on:
88
- .github/workflows/samples-python-petstore.yaml
99

1010
jobs:
11+
validate-pyproject-toml:
12+
name: Validate pyproject.toml
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
17+
with:
18+
python-version: "3.13"
19+
- name: Install validator
20+
run: pip install 'validate-pyproject[all]'
21+
- name: Validate
22+
run: validate-pyproject samples/openapi3/client/petstore/python/pyproject.toml
1123
build:
1224
name: Test Python client
1325
runs-on: ubuntu-latest

‎.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<extension>
99
<groupId>com.gradle</groupId>
1010
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>1.13</version>
11+
<version>2.0.2</version>
1212
</extension>
1313
</extensions>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
7575
[<img src="https://openapi-generator.tech/img/companies/dm.png" width="128" height="128">](https://www.dotcom-monitor.com/sponsoring-open-source-projects/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
7676
[<img src="https://openapi-generator.tech/img/companies/clickit.jpg" width="128" height="128">](https://www.clickittech.com/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
7777
[<img src="https://openapi-generator.tech/img/companies/unified_to.jpg" width="128" height="128">](https://unified.to/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
78-
[<img src="https://openapi-generator.tech/img/companies/savetwt.jpg" width="128" height="128">](https://unified.to/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
78+
[<img src="https://openapi-generator.tech/img/companies/savetwt.jpg" width="128" height="128">](https://savetwt.com/?utm_source=openapi-generator&utm_medium=sponsorship&utm_campaign=oss-sponsorship)
7979

8080
#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS, Checkly for sponsoring the API monitoring and Gradle for sponsoring Develocity
8181

‎bin/configs/java-restclient-enum-in-multipart.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
generatorName: java
2+
outputDir: samples/client/others/java/restclient-enum-in-multipart
3+
library: restclient
4+
inputSpec: modules/openapi-generator/src/test/resources/3_1/enum-in-multipart.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
hideGenerationTimestamp: "true"

‎bin/configs/php-laravel-issue-21334.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: php-laravel
2+
outputDir: samples/server/petstore/php-laravel-issue-21334
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/issue21334.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/php-laravel
5+
gitUserId: openapitools
6+
gitRepoId: petstore
7+
additionalProperties:
8+
variableNamingConvention: "original"

‎docs/generators/php-dt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3838
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
3939
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
4040
|srcBasePath|The directory to serve as source root.| |null|
41-
|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |snake_case|
41+
|variableNamingConvention|naming convention of variable name, e.g. camelCase.|<dl><dt>**camelCase**</dt><dd>Use camelCase convention</dd><dt>**PascalCase**</dt><dd>Use PascalCase convention</dd><dt>**snake_case**</dt><dd>Use snake_case convention</dd><dt>**original**</dt><dd>Do not change the variable name</dd></dl>|snake_case|
4242

4343
## IMPORT MAPPING
4444

‎docs/generators/php-flight.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
3838
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
3939
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
4040
|srcBasePath|The directory to serve as source root.| |null|
41-
|variableNamingConvention|naming convention of variable name, e.g. camelCase.| |camelCase|
41+
|variableNamingConvention|naming convention of variable name, e.g. camelCase.|<dl><dt>**camelCase**</dt><dd>Use camelCase convention</dd><dt>**PascalCase**</dt><dd>Use PascalCase convention</dd><dt>**snake_case**</dt><dd>Use snake_case convention</dd><dt>**original**</dt><dd>Do not change the variable name</dd></dl>|camelCase|
4242

4343
## IMPORT MAPPING
4444

0 commit comments

Comments
 (0)