Skip to content

Commit 750d622

Browse files
web-miweb-mi
authored
Merge branch 'OpenAPITools:master' into snake_case_php_getter_setter
2 parents 5f40afc + b5b760a commit 750d622

File tree

7,246 files changed

+30455
-12832
lines changed

Some content is hidden

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

7,246 files changed

+30455
-12832
lines changed

‎.github/workflows/linux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
${{ runner.os }}-gradle-
4646
4747
- name: Setup Maven
48-
uses: s4u/setup-maven-action@v1.14.0
48+
uses: s4u/setup-maven-action@v1.15.0
4949
with:
5050
java-version: ${{ matrix.java }}
5151
maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
8787
- name: Check out code
8888
uses: actions/checkout@v4
8989
- name: Setup Maven
90-
uses: s4u/setup-maven-action@v1.14.0
90+
uses: s4u/setup-maven-action@v1.15.0
9191
with:
9292
java-version: 11
9393
maven-version: 3.8.8

‎.github/workflows/openapi-generator.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ jobs:
142142
path: modules/openapi-generator-cli/target
143143
- name: Delete samples that are entirely generated
144144
run: |
145+
rm -rf samples/client/petstore/csharp/generichost/latest/Tags
146+
145147
rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
146148
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
147149
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare

‎.github/workflows/samples-dotnet.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ name: Samples C# .Net 8 Clients
33
on:
44
push:
55
paths:
6+
- samples/client/petstore/csharp/generichost/latest/**
67
- samples/client/petstore/csharp/generichost/net8/**
78
- samples/client/petstore/csharp/httpclient/net8/**
89
- samples/client/petstore/csharp/restsharp/net8/**
910
- samples/client/petstore/csharp/unityWebRequest/net8/**
1011
pull_request:
1112
paths:
13+
- samples/client/petstore/csharp/generichost/latest/**
1214
- samples/client/petstore/csharp/generichost/net8/**
1315
- samples/client/petstore/csharp/httpclient/net8/**
1416
- samples/client/petstore/csharp/restsharp/net8/**
@@ -21,6 +23,7 @@ jobs:
2123
fail-fast: false
2224
matrix:
2325
sample:
26+
- samples/client/petstore/csharp/generichost/latest/Tags
2427
- samples/client/petstore/csharp/generichost/net8/AllOf
2528
- samples/client/petstore/csharp/generichost/net8/AnyOf
2629
- samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
1212
- samples/openapi3/client/petstore/java/native**
1313
- samples/client/others/java/okhttp-gson-oneOf/**
14+
- samples/client/others/java/okhttp-gson-oneOf-array/**
1415
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
1516
- samples/client/others/java/webclient-useAbstractionForFiles/**
1617
- samples/client/others/java/jersey2-oneOf-duplicates/**
@@ -26,6 +27,7 @@ on:
2627
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
2728
- samples/openapi3/client/petstore/java/native**
2829
- samples/client/others/java/okhttp-gson-oneOf/**
30+
- samples/client/others/java/okhttp-gson-oneOf-array/**
2931
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
3032
- samples/client/others/java/webclient-useAbstractionForFiles/**
3133
- samples/client/others/java/jersey2-oneOf-duplicates/**
@@ -75,6 +77,7 @@ jobs:
7577
- samples/client/petstore/java/resttemplate-swagger2/
7678
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
7779
- samples/client/others/java/okhttp-gson-oneOf/
80+
- samples/client/others/java/okhttp-gson-oneOf-array/
7881
- samples/client/echo_api/java/okhttp-gson-user-defined-templates/
7982
- samples/client/others/java/resttemplate-useAbstractionForFiles/
8083
- samples/client/others/java/webclient-useAbstractionForFiles/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
# - samples/server/petstore/kotlin-spring-default/**
1818

1919
env:
20-
GRADLE_VERSION: 6.9
20+
GRADLE_VERSION: 7.6.4
2121

2222
jobs:
2323
build:

‎.github/workflows/windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
${{ runner.os }}-build-${{ env.cache-name }}-
4040
${{ runner.os }}-build-
4141
- name: Setup Maven
42-
uses: s4u/setup-maven-action@v1.14.0
42+
uses: s4u/setup-maven-action@v1.15.0
4343
with:
4444
java-version: ${{ matrix.java }}
4545
maven-version: 3.8.8

‎.travis.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,19 @@ after_success:
201201
echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
202202
fi;
203203
fi;
204-
# publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
205-
#- if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
206-
# cd website;
207-
# git config --global user.name "${GH_NAME}";
208-
# git config --global user.email "${GH_EMAIL}";
209-
# echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
210-
# yarn install;
211-
# GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
212-
# fi;
213-
204+
## NOTE; we will do the followign manually instead as the page doesn't need to be updated in every single travis build
205+
## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
206+
# - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
207+
# sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-client.md;
208+
# sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-server.md;
209+
# cd website;
210+
# git config --global user.name "${GH_NAME}";
211+
# git config --global user.email "${GH_EMAIL}";
212+
# echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
213+
# yarn install;
214+
# GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
215+
# fi;
216+
#
214217
env:
215218
- DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5
216219

‎CI/circle_parallel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ else
115115
(cd samples/client/petstore/java/jersey2-java8 && mvn integration-test)
116116
(cd samples/openapi3/client/petstore/java/jersey2-java8 && mvn integration-test)
117117
(cd samples/client/petstore/java/jersey3 && mvn integration-test)
118+
(cd samples/client/petstore/java/jersey3-oneOf && mvn integration-test)
118119
(cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test)
119120
(cd samples/client/petstore/java/okhttp-gson && mvn integration-test)
120121
(cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test)

‎README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<div align="center">
1717

18-
[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.9.0`):
18+
[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`7.10.0`):
1919
[![Build Status](https://api.travis-ci.com/OpenAPITools/openapi-generator.svg?branch=master&status=passed)](https://app.travis-ci.com/github/OpenAPITools/openapi-generator/builds)
2020
[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
2121
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator)
@@ -129,7 +129,8 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
129129

130130
| OpenAPI Generator Version | Release Date | Notes |
131131
| --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ------------------------------------------------- |
132-
| 7.9.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.9.0-SNAPSHOT/) | 07.10.2024 | Minor release with breaking changes (with fallback) |
132+
| 7.10.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/7.10.0-SNAPSHOT/) | 07.11.2024 | Minor release with breaking changes (with fallback) |
133+
| [7.9.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.9.0) (latest stable release) | 07.10.2024 | Minor release with breaking changes (with fallback) |
133134
| [7.8.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.8.0) (latest stable release) | 19.08.2024 | Minor release with breaking changes (with fallback) |
134135
| [6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0) | 11.05.2023 | Minor release with breaking changes (with fallback) |
135136
| [5.4.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.4.0) | 31.01.2022 | Minor release with breaking changes (with fallback) |
@@ -193,16 +194,16 @@ See the different versions of the [openapi-generator-cli](https://search.maven.o
193194
<!-- RELEASE_VERSION -->
194195
If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 11 runtime at a minimum):
195196

196-
JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.8.0/openapi-generator-cli-7.8.0.jar`
197+
JAR location: `https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.9.0/openapi-generator-cli-7.9.0.jar`
197198

198199
For **Mac/Linux** users:
199200
```sh
200-
wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.8.0/openapi-generator-cli-7.8.0.jar -O openapi-generator-cli.jar
201+
wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.9.0/openapi-generator-cli-7.9.0.jar -O openapi-generator-cli.jar
201202
```
202203

203204
For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g.
204205
```
205-
Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.8.0/openapi-generator-cli-7.8.0.jar
206+
Invoke-WebRequest -OutFile openapi-generator-cli.jar https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.9.0/openapi-generator-cli-7.9.0.jar
206207
```
207208

208209
After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage.
@@ -437,7 +438,7 @@ openapi-generator-cli version
437438
To use a specific version of "openapi-generator-cli"
438439

439440
```sh
440-
openapi-generator-cli version-manager set 7.8.0
441+
openapi-generator-cli version-manager set 7.9.0
441442
```
442443

443444
Or install it as dev-dependency:
@@ -464,7 +465,7 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat
464465
(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g php -o c:\temp\php_api_client`)
465466

466467
<!-- RELEASE_VERSION -->
467-
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.8.0/openapi-generator-cli-7.8.0.jar)
468+
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.9.0/openapi-generator-cli-7.9.0.jar)
468469
<!-- /RELEASE_VERSION -->
469470

470471
To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
@@ -1198,7 +1199,7 @@ If you want to join the committee, please kindly apply by sending an email to te
11981199
| JMeter | @kannkyo (2021/01) |
11991200
| Jetbrains HTTP Client | @jlengrand (2023/01) |
12001201
| Julia | @tanmaykm (2023/01) |
1201-
| Kotlin | @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) |
1202+
| Kotlin | @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) @e5l (2024/10) |
12021203
| Lua | @daurnimator (2017/08) |
12031204
| N4JS | @mmews-n4 (2023/03) |
12041205
| Nim | |

‎bin/configs/csharp-generichost-tags-latest.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/generichost/latest/Tags
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/tags.json
5+
library: generichost
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
7+
additionalProperties:
8+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
9+
modelPropertySorting: alphabetical
10+
operationParameterSorting: alphabetical

0 commit comments

Comments
 (0)