Skip to content

Commit 0944867

Browse files
phactum-mnestlerphactum-mnestler
committed
[spring] Adapt HttpHeaders access to remain compatible with Spring 7
1 parent df1d562 commit 0944867

File tree

27 files changed

+48
-92
lines changed

27 files changed

+48
-92
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
359359
* @return ApiClient this client
360360
*/
361361
public ApiClient addDefaultHeader(String name, String value) {
362-
if (defaultHeaders.containsKey(name)) {
363-
defaultHeaders.remove(name);
364-
}
365-
defaultHeaders.add(name, value);
362+
defaultHeaders.set(name, value);
366363
return this;
367364
}
368365

@@ -712,7 +709,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
712709
* @param requestBuilder The current request
713710
*/
714711
protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) {
715-
for (Entry<String, List<String>> entry : headers.entrySet()) {
712+
for (Entry<String, List<String>> entry : headers.headerSet()) {
716713
List<String> values = entry.getValue();
717714
for(String value : values) {
718715
if (value != null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ext {
108108
{{#openApiNullable}}
109109
jackson_databind_nullable_version = "0.2.6"
110110
{{/openApiNullable}}
111-
spring_web_version = "6.1.6"
111+
spring_web_version = "6.1.21"
112112
jakarta_annotation_version = "2.1.1"
113113
jodatime_version = "2.9.9"
114114
junit_version = "5.10.2"

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
373373
* @return ApiClient this client
374374
*/
375375
public ApiClient addDefaultHeader(String name, String value) {
376-
if (defaultHeaders.containsKey(name)) {
377-
defaultHeaders.remove(name);
378-
}
379-
defaultHeaders.add(name, value);
376+
defaultHeaders.set(name, value);
380377
return this;
381378
}
382379

@@ -824,7 +821,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
824821
* @param requestBuilder The current request
825822
*/
826823
protected void addHeadersToRequest(HttpHeaders headers, BodyBuilder requestBuilder) {
824+
{{#useJakartaEe}}
825+
for (Entry<String, List<String>> entry : headers.headerSet()) {
826+
{{/useJakartaEe}}
827+
{{^useJakartaEe}}
827828
for (Entry<String, List<String>> entry : headers.entrySet()) {
829+
{{/useJakartaEe}}
828830
List<String> values = entry.getValue();
829831
for (String value : values) {
830832
if (value != null) {
@@ -937,7 +939,12 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
937939
return "";
938940
}
939941
StringBuilder builder = new StringBuilder();
942+
{{#useJakartaEe}}
943+
for (Entry<String, List<String>> entry : headers.headerSet()) {
944+
{{/useJakartaEe}}
945+
{{^useJakartaEe}}
940946
for (Entry<String, List<String>> entry : headers.entrySet()) {
947+
{{/useJakartaEe}}
941948
builder.append(entry.getKey()).append("=[");
942949
for (String value : entry.getValue()) {
943950
builder.append(value).append(",");

‎samples/client/echo_api/java/restclient/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.1.6"
103+
spring_web_version = "6.1.21"
104104
jakarta_annotation_version = "2.1.1"
105105
jodatime_version = "2.9.9"
106106
junit_version = "5.10.2"

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,7 @@ public ApiClient setUserAgent(String userAgent) {
312312
* @return ApiClient this client
313313
*/
314314
public ApiClient addDefaultHeader(String name, String value) {
315-
if (defaultHeaders.containsKey(name)) {
316-
defaultHeaders.remove(name);
317-
}
318-
defaultHeaders.add(name, value);
315+
defaultHeaders.set(name, value);
319316
return this;
320317
}
321318

@@ -665,7 +662,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
665662
* @param requestBuilder The current request
666663
*/
667664
protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) {
668-
for (Entry<String, List<String>> entry : headers.entrySet()) {
665+
for (Entry<String, List<String>> entry : headers.headerSet()) {
669666
List<String> values = entry.getValue();
670667
for(String value : values) {
671668
if (value != null) {

‎samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,7 @@ public ApiClient setUserAgent(String userAgent) {
290290
* @return ApiClient this client
291291
*/
292292
public ApiClient addDefaultHeader(String name, String value) {
293-
if (defaultHeaders.containsKey(name)) {
294-
defaultHeaders.remove(name);
295-
}
296-
defaultHeaders.add(name, value);
293+
defaultHeaders.set(name, value);
297294
return this;
298295
}
299296

‎samples/client/others/java/restclient-enum-in-multipart/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.1.6"
103+
spring_web_version = "6.1.21"
104104
jakarta_annotation_version = "2.1.1"
105105
jodatime_version = "2.9.9"
106106
junit_version = "5.10.2"

‎samples/client/others/java/restclient-enum-in-multipart/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,7 @@ public ApiClient setUserAgent(String userAgent) {
311311
* @return ApiClient this client
312312
*/
313313
public ApiClient addDefaultHeader(String name, String value) {
314-
if (defaultHeaders.containsKey(name)) {
315-
defaultHeaders.remove(name);
316-
}
317-
defaultHeaders.add(name, value);
314+
defaultHeaders.set(name, value);
318315
return this;
319316
}
320317

@@ -664,7 +661,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
664661
* @param requestBuilder The current request
665662
*/
666663
protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) {
667-
for (Entry<String, List<String>> entry : headers.entrySet()) {
664+
for (Entry<String, List<String>> entry : headers.headerSet()) {
668665
List<String> values = entry.getValue();
669666
for(String value : values) {
670667
if (value != null) {

‎samples/client/others/java/restclient-useAbstractionForFiles/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
jackson_version = "2.17.1"
101101
jackson_databind_version = "2.17.1"
102102
jackson_databind_nullable_version = "0.2.6"
103-
spring_web_version = "6.1.6"
103+
spring_web_version = "6.1.21"
104104
jakarta_annotation_version = "2.1.1"
105105
jodatime_version = "2.9.9"
106106
junit_version = "5.10.2"

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,7 @@ public ApiClient setUserAgent(String userAgent) {
310310
* @return ApiClient this client
311311
*/
312312
public ApiClient addDefaultHeader(String name, String value) {
313-
if (defaultHeaders.containsKey(name)) {
314-
defaultHeaders.remove(name);
315-
}
316-
defaultHeaders.add(name, value);
313+
defaultHeaders.set(name, value);
317314
return this;
318315
}
319316

@@ -663,7 +660,7 @@ protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod meth
663660
* @param requestBuilder The current request
664661
*/
665662
protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) {
666-
for (Entry<String, List<String>> entry : headers.entrySet()) {
663+
for (Entry<String, List<String>> entry : headers.headerSet()) {
667664
List<String> values = entry.getValue();
668665
for(String value : values) {
669666
if (value != null) {

0 commit comments

Comments
 (0)