[spring] Adapt HttpHeaders access to remain compatible with Spring 7 (#21691)

phactum-mnestler · web-flow · commit f659457f90db · 2025-08-06T15:46:37.000+08:00
* [spring] Adapt HttpHeaders access to remain compatible with Spring 7

* update pom.xml patch version
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
@@ -416,10 +416,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;
     }
 
@@ -781,7 +778,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache
@@ -108,7 +108,7 @@ ext {
     {{#openApiNullable}}
     jackson_databind_nullable_version = "0.2.6"
     {{/openApiNullable}}
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
@@ -346,7 +346,7 @@
         {{#swagger2AnnotationLibrary}}
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
         {{/swagger2AnnotationLibrary}}
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         {{#openApiNullable}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
@@ -373,10 +373,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;
     }
 
@@ -824,7 +821,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, BodyBuilder 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) {
@@ -937,7 +939,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
                 return "";
             }
             StringBuilder builder = new StringBuilder();
+            {{#useJakartaEe}}
+            for (Entry<String, List<String>> entry : headers.headerSet()) {
+            {{/useJakartaEe}}
+            {{^useJakartaEe}}
             for (Entry<String, List<String>> entry : headers.entrySet()) {
+            {{/useJakartaEe}}
                 builder.append(entry.getKey()).append("=[");
                 for (String value : entry.getValue()) {
                     builder.append(value).append(",");
diff --git a/samples/client/echo_api/java/restclient/build.gradle b/samples/client/echo_api/java/restclient/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/echo_api/java/restclient/pom.xml b/samples/client/echo_api/java/restclient/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
@@ -351,10 +351,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;
     }
 
@@ -716,7 +713,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -290,10 +290,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;
     }
 
diff --git a/samples/client/others/java/restclient-enum-in-multipart/build.gradle b/samples/client/others/java/restclient-enum-in-multipart/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/others/java/restclient-enum-in-multipart/pom.xml b/samples/client/others/java/restclient-enum-in-multipart/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/ApiClient.java
@@ -350,10 +350,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;
     }
 
@@ -715,7 +712,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/build.gradle b/samples/client/others/java/restclient-useAbstractionForFiles/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
@@ -349,10 +349,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;
     }
 
@@ -714,7 +711,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/ApiClient.java
@@ -233,10 +233,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;
     }
 
diff --git a/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
@@ -233,10 +233,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;
     }
 
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/build.gradle b/samples/client/petstore/java/restclient-nullable-arrays/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
@@ -349,10 +349,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;
     }
 
@@ -714,7 +711,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/petstore/java/restclient-swagger2/build.gradle b/samples/client/petstore/java/restclient-swagger2/build.gradle
@@ -101,7 +101,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/restclient-swagger2/pom.xml b/samples/client/petstore/java/restclient-swagger2/pom.xml
@@ -280,7 +280,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>2.2.15</swagger-annotations-version>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -412,10 +412,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;
     }
 
@@ -777,7 +774,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/ApiClient.java
@@ -412,10 +412,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;
     }
 
@@ -777,7 +774,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle b/samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml
@@ -274,7 +274,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-web-version>6.1.6</spring-web-version>
+        <spring-web-version>6.1.21</spring-web-version>
         <jackson-version>2.17.1</jackson-version>
         <jackson-databind-version>2.17.1</jackson-databind-version>
         <jackson-databind-nullable-version>0.2.6</jackson-databind-nullable-version>
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
@@ -412,10 +412,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;
     }
 
@@ -777,7 +774,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
      * @param requestBuilder The current request
      */
     protected void addHeadersToRequest(HttpHeaders headers, RestClient.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) {
diff --git a/samples/client/petstore/java/restclient/build.gradle b/samples/client/petstore/java/restclient/build.gradle
@@ -100,7 +100,7 @@ ext {
     jackson_version = "2.17.1"
     jackson_databind_version = "2.17.1"
     jackson_databind_nullable_version = "0.2.6"
-    spring_web_version = "6.1.6"
+    spring_web_version = "6.1.21"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.9.9"
     junit_version = "5.10.2"
diff --git a/samples/client/petstore/java/restclient/pom.xml b/samples/client/petstore/java/restclient/pom.xml
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
