Skip to content

Commit 532b6a1

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix/useTags-classnames
2 parents 7a365ce + 0ff9625 commit 532b6a1

583 files changed

Lines changed: 26707 additions & 9175 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/workflows/samples-java-client-jdk17.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
- samples/client/petstore/java/webclient-jakarta/**
99
- samples/client/petstore/java/restclient-*/**
1010
- samples/client/petstore/java/native-jackson3/**
11+
- samples/client/petstore/java/native-jackson3-jspecify/**
12+
- samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
1113
- samples/client/others/java/webclient-sealedInterface/**
1214
- samples/client/others/java/webclient-sealedInterface_3_1/**
1315
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
@@ -21,6 +23,8 @@ on:
2123
- samples/client/petstore/java/webclient-jakarta/**
2224
- samples/client/petstore/java/restclient-*/**
2325
- samples/client/petstore/java/native-jackson3/**
26+
- samples/client/petstore/java/native-jackson3-jspecify/**
27+
- samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/**
2428
- samples/client/others/java/webclient-sealedInterface/**
2529
- samples/client/others/java/webclient-sealedInterface_3_1/**
2630
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
@@ -44,6 +48,8 @@ jobs:
4448
- samples/client/petstore/java/restclient-nullable-arrays
4549
- samples/client/petstore/java/restclient-springBoot4-jackson2
4650
- samples/client/petstore/java/restclient-springBoot4-jackson3
51+
- samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify
52+
- samples/client/petstore/java/native-jackson3-jspecify
4753
- samples/client/petstore/java/restclient-swagger2
4854
- samples/client/petstore/java/restclient-useSingleRequestParameter
4955
- samples/client/petstore/java/restclient-useSingleRequestParameter-static

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- samples/openapi3/client/petstore/python-aiohttp/**
7+
- samples/openapi3/client/petstore/python-httpx/**
78
- samples/openapi3/client/petstore/python/**
89
- .github/workflows/samples-python-petstore.yaml
910

.github/workflows/samples-scala-jdk8.yaml

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

.github/workflows/samples-spring-jdk17.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
- samples/client/petstore/spring-http-interface-springboot-4/**
99
- samples/openapi3/server/petstore/springboot-3/**
1010
- samples/openapi3/server/petstore/springboot-4/**
11+
- samples/openapi3/server/petstore/springboot-4-jspecify/**
1112
- samples/server/petstore/springboot-api-response-examples/**
1213
- samples/server/petstore/springboot-lombok-data/**
1314
- samples/server/petstore/springboot-lombok-tostring/**
@@ -22,6 +23,7 @@ on:
2223
- samples/client/petstore/spring-http-interface-springboot-4/**
2324
- samples/openapi3/server/petstore/springboot-3/**
2425
- samples/openapi3/server/petstore/springboot-4/**
26+
- samples/openapi3/server/petstore/springboot-4-jspecify/**
2527
- samples/server/petstore/springboot-api-response-examples/**
2628
- samples/server/petstore/springboot-lombok-data/**
2729
- samples/server/petstore/springboot-lombok-tostring/**
@@ -44,6 +46,7 @@ jobs:
4446
# servers
4547
- samples/openapi3/server/petstore/springboot-3
4648
- samples/openapi3/server/petstore/springboot-4
49+
- samples/openapi3/server/petstore/springboot-4-jspecify
4750
- samples/server/petstore/springboot-api-response-examples
4851
- samples/server/petstore/springboot-lombok-data
4952
- samples/server/petstore/springboot-lombok-tostring
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
generatorName: aspnetcore
2+
outputDir: samples/server/petstore/aspnetcore-8.0-abstract-class
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/aspnetcore/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/aspnetcore/3.0
5+
additionalProperties:
6+
packageGuid: '{3C799344-F285-4669-8FD5-7ED9B795D5C5}'
7+
aspnetCoreVersion: "8.0"
8+
userSecretsGuid: 'cb87e868-8646-48ef-9bb6-344b537d0d37'
9+
classModifier: abstract
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: csharp-functions
2+
outputDir: samples/server/petstore/csharp-functions-abstract-class
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/csharp-functions
5+
additionalProperties:
6+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
7+
userSecretsGuid: "76e9e993-9159-441c-9c5b-fe95e7f4f020"
8+
classModifier: abstract

bin/configs/csharp-functions-latest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
generatorName: csharp-functions
2-
outputDir: samples/client/petstore/csharp-functions
2+
outputDir: samples/server/petstore/csharp-functions
33
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
44
templateDir: modules/openapi-generator/src/main/resources/csharp-functions
55
additionalProperties:
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/native-jackson3-jspecify
3+
library: native
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
validateSpec: false
7+
additionalProperties:
8+
artifactId: petstore-native-jackson3
9+
hideGenerationTimestamp: "true"
10+
generateBuilders: true
11+
useReflectionEqualsHashCode: "true"
12+
useJackson3: "true"
13+
openApiNullable: "false"
14+
useJspecify: true
15+
typeMappings:
16+
OffsetDateTime: java.time.Instant
17+
BigDecimal: java.math.BigDecimal
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify
3+
library: restclient
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
validateSpec: false
7+
additionalProperties:
8+
artifactId: petstore-restclient
9+
hideGenerationTimestamp: "true"
10+
containerDefaultToNull: "true"
11+
useSpringBoot4: true
12+
useJackson3: true
13+
openApiNullable: false
14+
useJspecify: true
15+
typeMappings:
16+
OffsetDateTime: java.time.Instant
17+
BigDecimal: java.math.BigDecimal
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify
3+
library: resttemplate
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
validateSpec: false
7+
additionalProperties:
8+
artifactId: petstore-resttemplate
9+
hideGenerationTimestamp: "true"
10+
containerDefaultToNull: "true"
11+
useJakartaEe: true
12+
useSpringBoot4: true
13+
useJackson3: true
14+
openApiNullable: false
15+
useJspecify: true
16+
typeMappings:
17+
OffsetDateTime: java.time.Instant
18+
BigDecimal: java.math.BigDecimal

0 commit comments

Comments
 (0)