root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to Undertow 2.2 (and R2DBC Arabba-SR7)

This commit is contained in:
Juergen Hoeller 2020-09-14 22:59:46 +02:00
parent 6e3ed6038b
commit b8c12a3aa1
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -26,7 +26,7 @@ configure(allprojects) { project ->
mavenBom "com.fasterxml.jackson:jackson-bom:2.11.2" mavenBom "com.fasterxml.jackson:jackson-bom:2.11.2"
mavenBom "io.netty:netty-bom:4.1.51.Final" mavenBom "io.netty:netty-bom:4.1.51.Final"
mavenBom "io.projectreactor:reactor-bom:2020.0.0-RC1" mavenBom "io.projectreactor:reactor-bom:2020.0.0-RC1"
mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR6" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR7"
mavenBom "io.rsocket:rsocket-bom:1.1.0-M2" mavenBom "io.rsocket:rsocket-bom:1.1.0-M2"
mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723" mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723"
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.0" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.0"
@ -133,7 +133,7 @@ configure(allprojects) { project ->
entry 'tomcat-embed-core' entry 'tomcat-embed-core'
entry 'tomcat-embed-websocket' entry 'tomcat-embed-websocket'
} }
dependencySet(group: 'io.undertow', version: '2.1.3.Final') { dependencySet(group: 'io.undertow', version: '2.2.0.Final') {
entry 'undertow-core' entry 'undertow-core'
entry('undertow-websockets-jsr') { entry('undertow-websockets-jsr') {
exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec" exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"

2
spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
View File

@ -77,9 +77,11 @@ class UndertowServerHttpRequest extends AbstractServerHttpRequest {
return this.exchange.getRequestMethod().toString(); return this.exchange.getRequestMethod().toString();
} }
@SuppressWarnings("deprecation")
@Override @Override
protected MultiValueMap<String, HttpCookie> initCookies() { protected MultiValueMap<String, HttpCookie> initCookies() {
MultiValueMap<String, HttpCookie> cookies = new LinkedMultiValueMap<>(); MultiValueMap<String, HttpCookie> cookies = new LinkedMultiValueMap<>();
// getRequestCookies() is deprecated in Undertow 2.2
for (String name : this.exchange.getRequestCookies().keySet()) { for (String name : this.exchange.getRequestCookies().keySet()) {
Cookie cookie = this.exchange.getRequestCookies().get(name); Cookie cookie = this.exchange.getRequestCookies().get(name);
HttpCookie httpCookie = new HttpCookie(name, cookie.getValue()); HttpCookie httpCookie = new HttpCookie(name, cookie.getValue());

2
spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java
View File

@ -104,6 +104,7 @@ class UndertowServerHttpResponse extends AbstractListenerServerHttpResponse impl
protected void applyHeaders() { protected void applyHeaders() {
} }
@SuppressWarnings("deprecation")
@Override @Override
protected void applyCookies() { protected void applyCookies() {
for (String name : getCookies().keySet()) { for (String name : getCookies().keySet()) {
@ -121,6 +122,7 @@ class UndertowServerHttpResponse extends AbstractListenerServerHttpResponse impl
cookie.setSecure(httpCookie.isSecure()); cookie.setSecure(httpCookie.isSecure());
cookie.setHttpOnly(httpCookie.isHttpOnly()); cookie.setHttpOnly(httpCookie.isHttpOnly());
cookie.setSameSiteMode(httpCookie.getSameSite()); cookie.setSameSiteMode(httpCookie.getSameSite());
// getResponseCookies() is deprecated in Undertow 2.2
this.exchange.getResponseCookies().putIfAbsent(name, cookie); this.exchange.getResponseCookies().putIfAbsent(name, cookie);
} }
} }