Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Spring Framework 7.0

Browse Source 
* Upgrade to Spring Data `2025.1.0`
* Upgrade to Spring Security `7.0`
* Fix all the compilation errors, including for Kotlin (not clear how they passed before upgrade to SF `7.0`)
This commit is contained in:
Artem Bilan
2025-06-04 16:36:44 -04:00
parent 66de5a2c93
commit 66d76a3aa3
27 changed files with 81 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-webflux/src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2024 the original author or authors.
* Copyright 2017-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -384,8 +384,8 @@ public class WebFluxInboundEndpoint extends BaseHttpInboundEndpoint implements W
org.springframework.http.HttpHeaders responseHeaders = exchange.getResponse().getHeaders();
if (!entityHeaders.isEmpty()) {
entityHeaders.entrySet().stream()
.filter(entry -> !responseHeaders.containsKey(entry.getKey()))
entityHeaders.headerSet().stream()
.filter(entry -> !responseHeaders.containsHeader(entry.getKey()))
.forEach(entry -> responseHeaders.put(entry.getKey(), entry.getValue()));
}

6
spring-integration-webflux/src/test/java/org/springframework/integration/webflux/outbound/WebFluxRequestExecutingMessageHandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2017-2024 the original author or authors.
* Copyright 2017-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -100,8 +100,8 @@ class WebFluxRequestExecutingMessageHandlerTests {
void noContentLengthHeaderForGetMethod() {
ClientHttpConnector httpConnector =
new HttpHandlerConnector((request, response) -> {
assertThat(request.getHeaders())
.doesNotContainKey(org.springframework.http.HttpHeaders.CONTENT_LENGTH);
assertThat(request.getHeaders().headerNames())
.doesNotContain(org.springframework.http.HttpHeaders.CONTENT_LENGTH);
response.setStatusCode(HttpStatus.OK);
return Mono.defer(response::setComplete);
});