loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-10-13 16:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spring 7 WebClient Compatibility (#22030)

Browse Source 
* Update Spring Boot dependency for WebClient

* Adapt WebClient ApiClient to change in HttpHeaders with Spring 7

---------

Co-authored-by: Timo Schwarz <timo.schwarz@bredex.de>
This commit is contained in:
Timo Schwarz 2025-10-06 15:07:57 +02:00 committed by GitHub
parent b49ec6e033
commit b8d805980a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache vendored
View File

@ -357,10 +357,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}
@ -737,7 +734,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
* @param requestBuilder The current request
*/
protected void addHeadersToRequest(HttpHeaders headers, WebClient.RequestBodySpec requestBuilder) {
{{#useJakartaEe}}
for (Entry<String, List<String>> entry : headers.headerSet()) {
{{/useJakartaEe}}
{{^useJakartaEe}}
for (Entry<String, List<String>> entry : headers.entrySet()) {
{{/useJakartaEe}}
List<String> values = entry.getValue();
for(String value : values) {
if (value != null) {

2
modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache vendored
View File

@ -131,7 +131,7 @@ ext {
swagger_annotations_version = "2.2.9"
{{/swagger2AnnotationLibrary}}
{{#useJakartaEe}}
spring_boot_version = "3.0.12"
spring_boot_version = "3.2.12"
jakarta_annotation_version = "2.1.1"
beanvalidation_version = "3.0.2"
reactor_version = "3.5.12"

2
modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache vendored
View File

@ -173,7 +173,7 @@
<jackson-databind-nullable-version>0.2.7</jackson-databind-nullable-version>
{{/openApiNullable}}
{{#useJakartaEe}}
<spring-boot-version>3.0.12</spring-boot-version>
<spring-boot-version>3.2.12</spring-boot-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<reactor-version>3.5.12</reactor-version>
<reactor-netty-version>1.2.8</reactor-netty-version>

5
samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -326,10 +326,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}

5
samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -326,10 +326,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}

2
samples/client/petstore/java/webclient-jakarta/build.gradle
View File

@ -112,7 +112,7 @@ if(hasProperty('target') && target == 'android') {
}
ext {
spring_boot_version = "3.0.12"
spring_boot_version = "3.2.12"
jakarta_annotation_version = "2.1.1"
beanvalidation_version = "3.0.2"
reactor_version = "3.5.12"

2
samples/client/petstore/java/webclient-jakarta/pom.xml
View File

@ -123,7 +123,7 @@
<jackson-version>2.19.2</jackson-version>
<jackson-databind-version>2.19.2</jackson-databind-version>
<jackson-databind-nullable-version>0.2.7</jackson-databind-nullable-version>
<spring-boot-version>3.0.12</spring-boot-version>
<spring-boot-version>3.2.12</spring-boot-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<reactor-version>3.5.12</reactor-version>
<reactor-netty-version>1.2.8</reactor-netty-version>

7
samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -346,10 +346,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}
@ -726,7 +723,7 @@ public class ApiClient extends JavaTimeFormatter {
* @param requestBuilder The current request
*/
protected void addHeadersToRequest(HttpHeaders headers, WebClient.RequestBodySpec requestBuilder) {
for (Entry<String, List<String>> entry : headers.entrySet()) {
for (Entry<String, List<String>> entry : headers.headerSet()) {
List<String> values = entry.getValue();
for(String value : values) {
if (value != null) {

5
samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -326,10 +326,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}

5
samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -346,10 +346,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}

5
samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -346,10 +346,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}

5
samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -346,10 +346,7 @@ public class ApiClient extends JavaTimeFormatter {
* @return ApiClient this client
*/
public ApiClient addDefaultHeader(String name, String value) {
if (defaultHeaders.containsKey(name)) {
defaultHeaders.remove(name);
}
defaultHeaders.add(name, value);
defaultHeaders.set(name, value);
return this;
}