Spring 7 WebClient Compatibility (#22030)

* Update Spring Boot dependency for WebClient

* Adapt WebClient ApiClient to change in HttpHeaders with Spring 7

---------

Co-authored-by: Timo Schwarz <[email protected]>

Author: legion47T

modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache

@@ -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) {

modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache

@@ -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"

modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache

@@ -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>

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

@@ -326,10 +326,7 @@ public ApiClient setUserAgent(String userAgent) {
      * @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;
     }
 

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

@@ -326,10 +326,7 @@ public ApiClient setUserAgent(String userAgent) {
      * @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;
     }
 

samples/client/petstore/java/webclient-jakarta/build.gradle

@@ -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"

samples/client/petstore/java/webclient-jakarta/pom.xml

@@ -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>

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

@@ -346,10 +346,7 @@ public ApiClient setUserAgent(String userAgent) {
      * @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 @@ protected WebClient.RequestBodySpec prepareRequest(String path, HttpMethod metho
      * @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) {

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

@@ -326,10 +326,7 @@ public ApiClient setUserAgent(String userAgent) {
      * @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;
     }
 

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

@@ -346,10 +346,7 @@ public ApiClient setUserAgent(String userAgent) {
      * @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;
     }