Adapt WebClient ApiClient to change in HttpHeaders with Spring 7

Author: Timo Schwarz

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

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/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;
     }
 

samples/client/petstore/java/webclient-useSingleRequestParameter/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;
     }
 

samples/client/petstore/java/webclient/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;
     }