Skip to content

Commit ac1b84e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into sttp4-client-oneof
2 parents 2aeb207 + 1d3ef5c commit ac1b84e

4,571 files changed

Lines changed: 143311 additions & 14547 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.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Samples C# .Net 10 Client (Petstore)
2+
3+
on:
4+
push:
5+
paths:
6+
- samples/client/petstore/csharp/restsharp/net10/Petstore/**
7+
pull_request:
8+
paths:
9+
- samples/client/petstore/csharp/restsharp/net10/Petstore/**
10+
jobs:
11+
build:
12+
name: Build clients
13+
runs-on: ubuntu-latest
14+
services:
15+
petstore-api:
16+
image: swaggerapi/petstore
17+
ports:
18+
- 80:8080
19+
env:
20+
SWAGGER_HOST: http://petstore.swagger.io
21+
SWAGGER_BASE_PATH: /v2
22+
strategy:
23+
fail-fast: false
24+
matrix:
25+
sample:
26+
- samples/client/petstore/csharp/restsharp/net10/Petstore/
27+
steps:
28+
- uses: actions/checkout@v5
29+
- uses: actions/setup-dotnet@v5.2.0
30+
with:
31+
dotnet-version: '10.0.x'
32+
- name: Build
33+
working-directory: ${{ matrix.sample }}
34+
run: dotnet build Org.OpenAPITools.sln
35+
- name: Test
36+
working-directory: ${{ matrix.sample }}
37+
run: dotnet test Org.OpenAPITools.sln

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,27 @@ on:
44
push:
55
paths:
66
- samples/client/petstore/java/resttemplate-jakarta/**
7+
- samples/client/petstore/java/resttemplate-springBoot4-*/**
78
- samples/client/petstore/java/webclient-jakarta/**
89
- samples/client/petstore/java/restclient-*/**
10+
- samples/client/petstore/java/native-jackson3/**
911
- samples/client/others/java/webclient-sealedInterface/**
1012
- samples/client/others/java/webclient-sealedInterface_3_1/**
1113
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
1214
- samples/client/others/java/restclient-enum-in-multipart/**
15+
- samples/client/others/java/restclient-sealedInterface/**
1316
pull_request:
1417
paths:
1518
- samples/client/petstore/java/resttemplate-jakarta/**
19+
- samples/client/petstore/java/resttemplate-springBoot4-*/**
1620
- samples/client/petstore/java/webclient-jakarta/**
1721
- samples/client/petstore/java/restclient-*/**
22+
- samples/client/petstore/java/native-jackson3/**
1823
- samples/client/others/java/webclient-sealedInterface/**
1924
- samples/client/others/java/webclient-sealedInterface_3_1/**
2025
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
2126
- samples/client/others/java/restclient-enum-in-multipart/**
27+
- samples/client/others/java/restclient-sealedInterface/**
2228
jobs:
2329
build:
2430
name: Build Java Client JDK17
@@ -29,6 +35,8 @@ jobs:
2935
sample:
3036
# clients
3137
- samples/client/petstore/java/resttemplate-jakarta
38+
- samples/client/petstore/java/resttemplate-springBoot4-jackson2
39+
- samples/client/petstore/java/resttemplate-springBoot4-jackson3
3240
- samples/client/petstore/java/webclient-jakarta
3341
- samples/client/petstore/java/restclient
3442
- samples/client/petstore/java/restclient-nullable-arrays
@@ -37,10 +45,13 @@ jobs:
3745
- samples/client/petstore/java/restclient-swagger2
3846
- samples/client/petstore/java/restclient-useSingleRequestParameter
3947
- samples/client/petstore/java/restclient-useSingleRequestParameter-static
48+
- samples/client/petstore/java/native-jackson3
4049
- samples/client/others/java/webclient-sealedInterface
4150
- samples/client/others/java/webclient-sealedInterface_3_1
51+
- samples/client/petstore/java/webclient-springBoot4-jackson3
4252
- samples/client/petstore/java/webclient-useSingleRequestParameter
4353
- samples/client/others/java/restclient-enum-in-multipart
54+
- samples/client/others/java/restclient-sealedInterface
4455
steps:
4556
- uses: actions/checkout@v5
4657
- uses: actions/setup-java@v5

.github/workflows/samples-jdk17.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- samples/client/petstore/spring-http-interface/**
1111
- samples/client/petstore/spring-http-interface-reactive-noResponseEntity/**
1212
- samples/client/petstore/spring-http-interface-noResponseEntity/**
13+
- samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/**
1314
- samples/client/petstore/java/webclient-jakarta/**
1415
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
1516
# servers
@@ -29,6 +30,7 @@ on:
2930
- samples/client/petstore/spring-http-interface/**
3031
- samples/client/petstore/spring-http-interface-reactive-noResponseEntity/**
3132
- samples/client/petstore/spring-http-interface-noResponseEntity/**
33+
- samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/**
3234
- samples/client/petstore/java/webclient-jakarta/**
3335
- samples/client/petstore/java/microprofile-rest-client-outer-enum/**
3436
# servers
@@ -54,6 +56,7 @@ jobs:
5456
- samples/client/petstore/spring-http-interface
5557
- samples/client/petstore/spring-http-interface-reactive-noResponseEntity
5658
- samples/client/petstore/spring-http-interface-noResponseEntity
59+
- samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator
5760
- samples/client/petstore/java/webclient-jakarta
5861
- samples/client/petstore/java/microprofile-rest-client-outer-enum
5962
# servers

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ jobs:
4848
- samples/client/petstore/kotlin-default-values-jvm-okhttp4
4949
- samples/client/petstore/kotlin-default-values-jvm-retrofit2
5050
- samples/client/petstore/kotlin-default-values-multiplatform
51+
- samples/client/petstore/kotlin-enum-integers-multiplatform
5152
- samples/client/petstore/kotlin-array-simple-string-jvm-okhttp4
5253
- samples/client/petstore/kotlin-array-simple-string-multiplatform
5354
- samples/client/petstore/kotlin-bigdecimal-default-multiplatform

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
# - samples/server/petstore/kotlin-spring-default/**
2828

2929
env:
30-
GRADLE_VERSION: '8.10'
30+
GRADLE_VERSION: '8.14'
3131

3232
jobs:
3333
build:
@@ -48,12 +48,14 @@ jobs:
4848
- samples/server/petstore/kotlin-springboot-additionalproperties
4949
- samples/server/petstore/kotlin-springboot-delegate-nodefaults
5050
- samples/server/petstore/kotlin-springboot-request-cookie
51+
- samples/server/petstore/kotlin-springboot-4
5152
- samples/server/petstore/kotlin-server/jaxrs-spec
5253
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
5354
- samples/server/petstore/kotlin-server/javalin
5455
- samples/server/petstore/kotlin-server/javalin-6
5556
- samples/server/petstore/kotlin-server/ktor
5657
- samples/server/petstore/kotlin-server/ktor2
58+
- samples/server/petstore/kotlin-server-modelMutable
5759
- samples/server/petstore/kotlin-misk
5860
- samples/server/petstore/kotlin-spring-declarative-interface
5961
- samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- 'samples/server/petstore/kotlin-server-required-and-nullable-properties/**'
1414

1515
env:
16-
GRADLE_VERSION: '8.10'
16+
GRADLE_VERSION: '8.14'
1717

1818
jobs:
1919
build:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ jobs:
4242
- samples/server/petstore/kotlin-springboot-springfox
4343
- samples/server/petstore/kotlin-springboot-x-kotlin-implements
4444
- samples/server/petstore/kotlin-springboot-include-http-request-context-delegate
45-
- samples/server/petstore/kotlin-server/ktor
4645
- samples/server/petstore/kotlin-server/ktor2
4746
- samples/server/petstore/kotlin-server/jaxrs-spec
4847
- samples/server/petstore/kotlin-server/jaxrs-spec-mutiny
49-
- samples/server/petstore/kotlin-server-modelMutable
5048
- samples/server/petstore/kotlin-server/javalin
5149
- samples/server/others/kotlin-server/jaxrs-spec
5250
- samples/server/others/kotlin-server/jaxrs-spec-array-response

.github/workflows/samples-typescript-nestjs-server.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
paths:
66
- samples/server/petstore/typescript-nestjs-server/**
77
- .github/workflows/samples-typescript-nestjs-server.yaml
8+
- .github/workflows/samples-typescript-nestjs-server-parameters.yaml
89
jobs:
910
build:
1011
name: Test TypeScript NestJS Server

bin/configs/c-useJsonUnformatted.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ inputSpec: modules/openapi-generator/src/test/resources/2_0/c/petstore.yaml
44
templateDir: modules/openapi-generator/src/main/resources/C-libcurl
55
additionalProperties:
66
useJsonUnformatted: true
7+
declareNumberBooleanWithoutPointer: true
78
modelNameMappings:
89
another_model: MappedModel
910
another_property: mappedProperty
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# for .net standard
2+
generatorName: csharp
3+
library: restsharp
4+
outputDir: samples/client/petstore/csharp/restsharp/net10/EnumMappings
5+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
6+
templateDir: modules/openapi-generator/src/main/resources/csharp
7+
additionalProperties:
8+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
9+
useCompareNetObjects: true
10+
disallowAdditionalPropertiesIfNotPresent: false
11+
useOneOfDiscriminatorLookup: true
12+
targetFramework: net10.0
13+
equatable: true
14+
enumNameMappings:
15+
delivered: Shipped

0 commit comments

Comments
 (0)