From f659457f90dba3fd2a50094937be2d412ea71359 Mon Sep 17 00:00:00 2001 From: phactum-mnestler <194211291+phactum-mnestler@users.noreply.github.com> Date: Wed, 6 Aug 2025 09:46:37 +0200 Subject: [PATCH] [spring] Adapt HttpHeaders access to remain compatible with Spring 7 (#21691) * [spring] Adapt HttpHeaders access to remain compatible with Spring 7 * update pom.xml patch version --- .../Java/libraries/restclient/ApiClient.mustache | 7 ++----- .../libraries/restclient/build.gradle.mustache | 2 +- .../Java/libraries/restclient/pom.mustache | 2 +- .../libraries/resttemplate/ApiClient.mustache | 15 +++++++++++---- .../client/echo_api/java/restclient/build.gradle | 2 +- samples/client/echo_api/java/restclient/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../java/org/openapitools/client/ApiClient.java | 5 +---- .../restclient-enum-in-multipart/build.gradle | 2 +- .../java/restclient-enum-in-multipart/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../build.gradle | 2 +- .../restclient-useAbstractionForFiles/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../java/org/openapitools/client/ApiClient.java | 5 +---- .../java/org/openapitools/client/ApiClient.java | 5 +---- .../java/restclient-nullable-arrays/build.gradle | 2 +- .../java/restclient-nullable-arrays/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../java/restclient-swagger2/build.gradle | 2 +- .../petstore/java/restclient-swagger2/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../build.gradle | 2 +- .../pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../build.gradle | 2 +- .../restclient-useSingleRequestParameter/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../client/petstore/java/restclient/build.gradle | 2 +- samples/client/petstore/java/restclient/pom.xml | 2 +- .../java/org/openapitools/client/ApiClient.java | 7 ++----- .../java/org/openapitools/client/ApiClient.java | 9 +++------ .../java/org/openapitools/client/ApiClient.java | 5 +---- .../java/org/openapitools/client/ApiClient.java | 5 +---- .../java/org/openapitools/client/ApiClient.java | 5 +---- .../java/org/openapitools/client/ApiClient.java | 5 +---- 36 files changed, 57 insertions(+), 101 deletions(-) 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 index 850aa6d9147..f55cd57761c 100644 --- 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> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 4aec430eb7c..7addbad9040 100644 --- 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 index f926d47b4b3..f1d08cf55dd 100644 --- 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}} 2.2.15 {{/swagger2AnnotationLibrary}} - 6.1.6 + 6.1.21 2.17.1 2.17.1 {{#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 index e6d693e0b29..52b5b27e5e5 100644 --- 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> entry : headers.headerSet()) { + {{/useJakartaEe}} + {{^useJakartaEe}} for (Entry> entry : headers.entrySet()) { + {{/useJakartaEe}} List 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> entry : headers.headerSet()) { + {{/useJakartaEe}} + {{^useJakartaEe}} for (Entry> 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 index 5e8bce82ddb..1710716986b 100644 --- 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 index b075100afbb..d26d11ae5d0 100644 --- a/samples/client/echo_api/java/restclient/pom.xml +++ b/samples/client/echo_api/java/restclient/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index ba45aa4009f..bc4b0fe6888 100644 --- 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 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; } @@ -716,7 +713,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 7fa7402b198..98e2f8282f4 100644 --- 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 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; } diff --git a/samples/client/others/java/restclient-enum-in-multipart/build.gradle b/samples/client/others/java/restclient-enum-in-multipart/build.gradle index 35b17b76d8f..c43492ecbb1 100644 --- 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 index 1e6d72e1eb0..223d5e775e2 100644 --- 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 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index ddb25c6f36f..2e6320218f6 100644 --- 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 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; } @@ -715,7 +712,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 89044977e9c..041c588113e 100644 --- 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 index 9d271da9bb3..f9b5f1a8d67 100644 --- a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml +++ b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index aab195efcbb..ec6931f19cb 100644 --- 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 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; } @@ -714,7 +711,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 529661682ae..bef11d2220b 100644 --- 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 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; } 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 index e9fa6599350..08e58d65f18 100644 --- 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 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; } diff --git a/samples/client/petstore/java/restclient-nullable-arrays/build.gradle b/samples/client/petstore/java/restclient-nullable-arrays/build.gradle index 4fc07a99b55..5390d126476 100644 --- 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 index e3cbc88733e..0a06567b5a2 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml +++ b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index e9af525edff..9d563925c76 100644 --- 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 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; } @@ -714,7 +711,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 620565aa93f..9e04e393a93 100644 --- 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 index 5ec46d11959..0290b96a03c 100644 --- a/samples/client/petstore/java/restclient-swagger2/pom.xml +++ b/samples/client/petstore/java/restclient-swagger2/pom.xml @@ -280,7 +280,7 @@ UTF-8 2.2.15 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index 2c17a23d488..c19e51efd91 100644 --- 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 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; } @@ -777,7 +774,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 7bca4d48a8d..746855acc1a 100644 --- 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 index 04bfd8849d6..bbdda158915 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index 2c17a23d488..c19e51efd91 100644 --- 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 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; } @@ -777,7 +774,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index 15075161d76..8a9945a9a62 100644 --- 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 index 05566ac5820..5949c228b99 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index 2c17a23d488..c19e51efd91 100644 --- 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 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; } @@ -777,7 +774,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List 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 index b0abe35f7c2..acd8556e73b 100644 --- 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 index 9d5369c46fb..9f8889ec144 100644 --- a/samples/client/petstore/java/restclient/pom.xml +++ b/samples/client/petstore/java/restclient/pom.xml @@ -274,7 +274,7 @@ UTF-8 - 6.1.6 + 6.1.21 2.17.1 2.17.1 0.2.6 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 index 2c17a23d488..c19e51efd91 100644 --- 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 @@ -412,10 +412,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; } @@ -777,7 +774,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List values = entry.getValue(); for(String value : values) { if (value != null) { 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 index 2e825efb8f6..7ac20122dfb 100644 --- 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 @@ -291,10 +291,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; } @@ -742,7 +739,7 @@ public class ApiClient extends JavaTimeFormatter { * @param requestBuilder The current request */ protected void addHeadersToRequest(HttpHeaders headers, BodyBuilder requestBuilder) { - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { List values = entry.getValue(); for (String value : values) { if (value != null) { @@ -845,7 +842,7 @@ public class ApiClient extends JavaTimeFormatter { return ""; } StringBuilder builder = new StringBuilder(); - for (Entry> entry : headers.entrySet()) { + for (Entry> entry : headers.headerSet()) { builder.append(entry.getKey()).append("=["); for (String value : entry.getValue()) { builder.append(value).append(","); 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 index 73b70a2c795..58ea23dc114 100644 --- 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 @@ -291,10 +291,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; } 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 index 73b70a2c795..58ea23dc114 100644 --- 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 @@ -291,10 +291,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; } 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 index e97f7ad6449..5cbefb77c42 100644 --- 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 @@ -354,10 +354,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; } 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 index c8a2498a4e1..c07a058a0a1 100644 --- 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 @@ -349,10 +349,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; }