Skip to content

Commit f2c4241

Browse files
Merge branch 'OpenAPITools:master' into master
2 parents e7f52fd + 4b88cf8 commit f2c4241

1,623 files changed

Lines changed: 119989 additions & 6848 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/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`.
1919
IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
2020
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming `7.x.0` minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
21+
- [ ] If your PR solves a reported issue, reference it using [GitHub's linking syntax](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) (e.g., having `"fixes #123"` present in the PR description)
2122
- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.github/workflows/linux.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- master
1111
- '[5-9]+.[0-9]+.x'
1212

13+
env:
14+
GRADLE_VERSION: '8.14.3'
15+
1316
jobs:
1417
build:
1518
name: 'Build: JDK ${{ matrix.java }} (${{ matrix.os }})'
@@ -65,7 +68,9 @@ jobs:
6568

6669
- name: Test Gradle plugin usage
6770
shell: bash
68-
run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
71+
run: gradle --project-dir modules/openapi-generator-gradle-plugin/samples/local-spec buildGoSdk --stacktrace
72+
with:
73+
gradle-version: ${{ env.GRADLE_VERSION }}
6974

7075
- name: Test Maven plugin integration
7176
if: matrix.java == '11'
@@ -92,7 +97,7 @@ jobs:
9297
java-version: 11
9398
maven-version: 3.8.8
9499
- name: Download build artifact
95-
uses: actions/download-artifact@v4
100+
uses: actions/download-artifact@v5
96101
with:
97102
name: artifact
98103
- name: Run Ensures Script

.github/workflows/openapi-generator.yaml

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
java-version: 11
9898
distribution: 'temurin'
9999
- name: Download openapi-generator-cli.jar artifact
100-
uses: actions/download-artifact@v4
100+
uses: actions/download-artifact@v5
101101
with:
102102
name: openapi-generator-cli.jar
103103
path: modules/openapi-generator-cli/target
@@ -136,43 +136,25 @@ jobs:
136136
java-version: 11
137137
distribution: 'temurin'
138138
- name: Download openapi-generator-cli.jar artifact
139-
uses: actions/download-artifact@v4
139+
uses: actions/download-artifact@v5
140140
with:
141141
name: openapi-generator-cli.jar
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/HelloWorld
146-
rm -rf samples/client/petstore/csharp/generichost/latest/Tags
147-
rm -rf samples/client/petstore/csharp/generichost/latest/OneOfList
148-
149-
rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
150-
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
151-
rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
152-
rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
153-
rm -rf samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
154-
rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
155-
rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
156-
rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
157-
rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
158-
159-
rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
160-
161-
rm -rf samples/client/petstore/csharp/generichost/net4.8/AllOf
162-
rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOf
163-
rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
164-
rm -rf samples/client/petstore/csharp/generichost/net4.8/FormModels
165-
rm -rf samples/client/petstore/csharp/generichost/net4.8/OneOf
166-
rm -rf samples/client/petstore/csharp/generichost/net4.8/Petstore
167-
rm -rf samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
168-
169-
rm -rf samples/client/petstore/csharp/generichost/net4.7/AllOf
170-
rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOf
171-
rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
172-
rm -rf samples/client/petstore/csharp/generichost/net4.7/FormModels
173-
rm -rf samples/client/petstore/csharp/generichost/net4.7/OneOf
174-
rm -rf samples/client/petstore/csharp/generichost/net4.7/Petstore
175-
rm -rf samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
145+
# List all directories in generichost, filter out Manual directories, and remove the rest
146+
cd samples/client/petstore/csharp/generichost
147+
for version_dir in */ ; do
148+
if [ -d "$version_dir" ]; then
149+
cd "$version_dir"
150+
for dir in */ ; do
151+
if [ -d "$dir" ] && [[ ! "$dir" =~ Manual ]]; then
152+
rm -rf "$dir"
153+
fi
154+
done
155+
cd ..
156+
fi
157+
done
176158
- name: Generate samples
177159
run: |
178160
bash bin/generate-samples.sh
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Samples cpp oat++ client
2+
3+
on:
4+
push:
5+
branches:
6+
- "samples/client/petstore/cpp-oatpp/**"
7+
pull_request:
8+
paths:
9+
- "samples/client/petstore/cpp-oatpp/**"
10+
11+
env:
12+
GRADLE_VERSION: 6.9
13+
14+
jobs:
15+
build:
16+
name: Build cpp oat++ client
17+
strategy:
18+
matrix:
19+
sample:
20+
- samples/client/petstore/cpp-oatpp
21+
os:
22+
- ubuntu-latest
23+
- macOS-latest
24+
- windows-latest
25+
runs-on: ${{ matrix.os }}
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Build
29+
working-directory: ${{ matrix.sample }}
30+
run: cmake -B build && cmake --build build --verbose

.github/workflows/samples-cpp-oatpp-server.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313

1414
jobs:
1515
build:
16-
name: Build cpp qt client
16+
name: Build cpp oat++ server
1717
strategy:
1818
matrix:
1919
sample:

.github/workflows/samples-dotnet-fx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
build:
1414
name: Build .Net projects
15-
runs-on: windows-2019
15+
runs-on: windows-latest
1616
strategy:
1717
fail-fast: false
1818
matrix:

.github/workflows/samples-dotnet9.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
sample:
26+
- samples/client/petstore/csharp/generichost/latest/ComposedEnum
2627
- samples/client/petstore/csharp/generichost/latest/Tags
2728
- samples/client/petstore/csharp/generichost/latest/HelloWorld
2829
- samples/client/petstore/csharp/generichost/latest/OneOfList
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Samples Go Clients
2+
3+
on:
4+
push:
5+
paths:
6+
- 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
7+
pull_request:
8+
paths:
9+
- 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/**'
10+
11+
jobs:
12+
build:
13+
name: Build Go
14+
runs-on: windows-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
sample:
19+
- 'samples/openapi3/client/petstore/go/go-petstore-aws-signature/'
20+
steps:
21+
- uses: actions/checkout@v4
22+
- uses: actions/setup-go@v5
23+
- run: go version
24+
- name: Install Dependencies
25+
working-directory: ${{ matrix.sample }}
26+
run: |
27+
go mod tidy
28+
- name: Run test
29+
working-directory: ${{ matrix.sample }}
30+
run: go test -mod=mod -v
31+

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ on:
66
- samples/client/petstore/java/resttemplate-jakarta/**
77
- samples/client/petstore/java/webclient-jakarta/**
88
- samples/client/petstore/java/restclient-*/**
9+
- samples/client/others/java/webclient-sealedInterface/**
910
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
1011
- samples/client/others/java/restclient-enum-in-multipart/**
1112
pull_request:
1213
paths:
1314
- samples/client/petstore/java/resttemplate-jakarta/**
1415
- samples/client/petstore/java/webclient-jakarta/**
1516
- samples/client/petstore/java/restclient-*/**
17+
- samples/client/others/java/webclient-sealedInterface/**
1618
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
1719
- samples/client/others/java/restclient-enum-in-multipart/**
1820
jobs:
@@ -31,6 +33,7 @@ jobs:
3133
- samples/client/petstore/java/restclient-swagger2
3234
- samples/client/petstore/java/restclient-useSingleRequestParameter
3335
- samples/client/petstore/java/restclient-useSingleRequestParameter-static
36+
- samples/client/others/java/webclient-sealedInterface
3437
- samples/client/petstore/java/webclient-useSingleRequestParameter
3538
- samples/client/others/java/restclient-enum-in-multipart
3639
steps:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
- samples/client/petstore/kotlin-name-parameter-mappings
6767
- samples/client/others/kotlin-jvm-okhttp-parameter-tests
6868
- samples/client/others/kotlin-jvm-okhttp-path-comments
69+
- samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization
6970
steps:
7071
- uses: actions/checkout@v4
7172
- uses: actions/setup-java@v4

0 commit comments

Comments
 (0)