loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-06 10:26:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* [spring] Adapt HttpHeaders access to remain compatible with Spring 7

* update pom.xml patch version
This commit is contained in:
phactum-mnestler
2025-08-06 09:46:37 +02:00
committed by GitHub
parent bf6e83ea63
commit f659457f90
36 changed files with 57 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/client/petstore/java/restclient-nullable-arrays/build.gradle
View File

@@ -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"

2
samples/client/petstore/java/restclient-nullable-arrays/pom.xml
View File

@@ -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>

7
samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java
View File

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

2
samples/client/petstore/java/restclient-swagger2/build.gradle
View File

@@ -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"

2
samples/client/petstore/java/restclient-swagger2/pom.xml
View File

@@ -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>

7
samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

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

2
samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle
View File

@@ -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"

2
samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml
View File

@@ -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>

7
samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/ApiClient.java
View File

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

2
samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle
View File

@@ -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"

2
samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml
View File

@@ -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>

7
samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/ApiClient.java
View File

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

2
samples/client/petstore/java/restclient/build.gradle
View File

@@ -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"

2
samples/client/petstore/java/restclient/pom.xml
View File

@@ -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>

7
samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/ApiClient.java
View File

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

9
samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
View File

@@ -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<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) {
@@ -845,7 +842,7 @@ public class ApiClient extends JavaTimeFormatter {
return "";
}
StringBuilder builder = new StringBuilder();
for (Entry<String, List<String>> entry : headers.entrySet()) {
for (Entry<String, List<String>> entry : headers.headerSet()) {
builder.append(entry.getKey()).append("=[");
for (String value : entry.getValue()) {
builder.append(value).append(",");

5
samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
View File

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

5
samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/ApiClient.java
View File

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

5
samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
View File

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

5
samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
View File

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