Skip to content

Commit 716084c

Browse files
authored
Merge branch 'OpenAPITools:master' into httplib-server-codegen
2 parents 654865b + df1d562 commit 716084c

File tree

297 files changed

+23614
-535
lines changed

Some content is hidden

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

297 files changed

+23614
-535
lines changed

.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-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
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Samples PHP Syntax Checker
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/client/petstore/php/OpenAPIClient-php/**
7+
- samples/client/petstore/php-nextgen/OpenAPIClient-php/**
8+
pull_request:
9+
paths:
10+
- samples/client/petstore/php/OpenAPIClient-php/**
11+
- samples/client/petstore/php-nextgen/OpenAPIClient-php/**
12+
jobs:
13+
build:
14+
name: Build PHP projects
15+
runs-on: ubuntu-latest
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
php:
20+
- "8.1"
21+
- "8.2"
22+
- "8.3"
23+
- "8.4"
24+
sample:
25+
# clients
26+
- samples/client/petstore/php/OpenAPIClient-php/
27+
- samples/client/petstore/php-nextgen/OpenAPIClient-php/
28+
steps:
29+
- uses: actions/checkout@v4
30+
- name: Setup PHP with tools
31+
uses: shivammathur/setup-php@v2
32+
with:
33+
php-version: "${{ matrix.php }}"
34+
- name: php -l
35+
working-directory: ${{ matrix.sample }}
36+
run: find . -name "*.php" -exec php -l {} +

.github/workflows/samples-r.yaml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/workflows/samples-rust.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
working-directory: ${{ matrix.sample }}
5151
run: |
5252
set -e
53-
# Skip samples/client/petstore/rust/ as it's tests are failing.
53+
# Skip samples/client/petstore/rust/ as its tests are failing.
5454
if [[ "${{ matrix.sample }}" == "samples/client/petstore/rust/" ]]; then
5555
echo "Skipping tests for samples/client/petstore/rust/"
5656
exit 0
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: TypeScript NestJS Server
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- samples/server/petstore/typescript-nestjs-server/**
7+
- .github/workflows/samples-typescript-nestjs-server.yaml
8+
jobs:
9+
build:
10+
name: Test TypeScript NestJS Server
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
sample:
16+
# clients
17+
- samples/server/petstore/typescript-nestjs-server
18+
node-version:
19+
- 20
20+
- 22
21+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- uses: actions/setup-node@v4
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
28+
- name: Install
29+
working-directory: ${{ matrix.sample }}
30+
run: |
31+
npm i
32+
33+
- name: Test
34+
working-directory: ${{ matrix.sample }}
35+
run: npm run test

CI/circle_parallel.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ elif [ "$NODE_INDEX" = "3" ]; then
115115
(cd samples/client/petstore/javascript-flowtyped && mvn integration-test)
116116
(cd samples/client/petstore/javascript-es6 && mvn integration-test)
117117
(cd samples/client/petstore/javascript-promise-es6 && mvn integration-test)
118+
(cd samples/server/petstore/typescript-nestjs-server && mvn integration-test)
118119

119120
else
120121
echo "Running node $NODE_INDEX ..."

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ If you want to join the committee, please kindly apply by sending an email to te
12701270
| Python | @cbornet (2017/09) @tomplus (2018/10) @krjakbrjak (2023/02) @fa0311 (2023/10) @multani (2023/10) |
12711271
| R | @Ramanth (2019/07) @saigiridhar21 (2019/07) |
12721272
| Ruby | @cliffano (2017/07) @zlx (2017/09) @autopp (2019/02) |
1273-
| Rust | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10) @@dsteeley (2025/07) |
1273+
| Rust | @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10) @dsteeley (2025/07) |
12741274
| Scala | @clasnake (2017/07), @shijinkui (2018/01), @ramzimaalej (2018/03), @chameleon82 (2020/03), @Bouillie (2020/04) @fish86 (2023/06) |
12751275
| Swift | @jgavris (2017/07) @ehyche (2017/08) @Edubits (2017/09) @jaz-ah (2017/09) @4brunu (2019/11) @dydus0x14 (2023/06) |
12761276
| TypeScript | @TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02) @davidgamero (2022/03) @mkusaka (2022/04) @joscha (2024/10) |
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
generatorName: kotlin
2+
outputDir: samples/client/petstore/kotlin-allOff-discriminator-kotlinx-serialization
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/kotlin/polymorphism.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/kotlin-client
5+
additionalProperties:
6+
artifactId: kotlin-allOff-discriminator
7+
serializableModel: "false"
8+
dateLibrary: java8
9+
enumUnknownDefaultCase: true
10+
serializationLibrary: kotlinx_serialization

bin/configs/rust-reqwest-trait-petstore.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/rust/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/rust
66
additionalProperties:
77
topLevelApiClient: true
8-
packageName: petstore-reqwest
8+
packageName: petstore-reqwest-trait
99
mockall: true
1010
enumNameMappings:
1111
delivered: shipped

0 commit comments

Comments
 (0)