Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 6, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0944867
[spring] Adapt HttpHeaders access to remain compatible with Spring 7
phactum-mnestler Aug 4, 2025
f5687f6
update pom.xml patch version
phactum-mnestler Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,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;
}

Expand Down Expand Up @@ -712,7 +709,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) {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
15 changes: 11 additions & 4 deletions modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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(",");
Expand Down
2 changes: 1 addition & 1 deletion samples/client/echo_api/java/restclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/echo_api/java/restclient/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,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;
}

Expand Down Expand Up @@ -665,7 +662,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) {
Expand Down
5 changes: 1 addition & 4 deletions ...es/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/others/java/restclient-enum-in-multipart/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/others/java/restclient-enum-in-multipart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...rs/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,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;
}

Expand Down Expand Up @@ -664,7 +661,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) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/others/java/restclient-useAbstractionForFiles/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...va/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,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;
}

Expand Down Expand Up @@ -663,7 +660,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) {
Expand Down
5 changes: 1 addition & 4 deletions .../resttemplate-list-schema-validation/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
5 changes: 1 addition & 4 deletions .../resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-nullable-arrays/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-nullable-arrays/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...tore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,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;
}

Expand Down Expand Up @@ -663,7 +660,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) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-swagger2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-swagger2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...nt/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,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;
}

Expand Down Expand Up @@ -683,7 +680,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) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...ent-useSingleRequestParameter-static/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,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;
}

Expand Down Expand Up @@ -683,7 +680,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) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 2 additions & 5 deletions ...restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,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;
}

Expand Down Expand Up @@ -683,7 +680,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) {
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/java/restclient/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading