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

Upgrade to Reactor Bom 2024.0.0-M3 

Closes gh-41422
This commit is contained in:
Andy Wilkinson 2024-07-09 13:06:15 +01:00
parent 922a1e9a03
commit d28f5ba113
6 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityService.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,6 +25,7 @@ import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.netty.http.Http11SslContextSpec; import reactor.netty.http.Http11SslContextSpec;
import reactor.netty.http.client.HttpClient; import reactor.netty.http.client.HttpClient;
import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel; import org.springframework.boot.actuate.autoconfigure.cloudfoundry.AccessLevel;
import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException; import org.springframework.boot.actuate.autoconfigure.cloudfoundry.CloudFoundryAuthorizationException;
@ -69,7 +70,7 @@ class ReactiveCloudFoundrySecurityService {
return new ReactorClientHttpConnector(client); return new ReactorClientHttpConnector(client);
} }
private Http11SslContextSpec createSslContextSpec() { private GenericSslContextSpec<?> createSslContextSpec() {
return Http11SslContextSpec.forClient() return Http11SslContextSpec.forClient()
.configure((builder) -> builder.sslProvider(SslProvider.JDK) .configure((builder) -> builder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)); .trustManager(InsecureTrustManagerFactory.INSTANCE));

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -1680,7 +1680,7 @@ bom {
] ]
} }
} }
library("Reactor Bom", "2023.0.8") { library("Reactor Bom", "2024.0.0-M3") {
considerSnapshots() considerSnapshots()
calendarName = "Reactor" calendarName = "Reactor"
group("io.projectreactor") { group("io.projectreactor") {

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
View File

@ -33,7 +33,7 @@ import io.rsocket.transport.netty.server.TcpServerTransport;
import io.rsocket.transport.netty.server.WebsocketServerTransport; import io.rsocket.transport.netty.server.WebsocketServerTransport;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.netty.http.server.HttpServer; import reactor.netty.http.server.HttpServer;
import reactor.netty.tcp.AbstractProtocolSslContextSpec; import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
import reactor.netty.tcp.TcpServer; import reactor.netty.tcp.TcpServer;
import org.springframework.boot.context.properties.PropertyMapper; import org.springframework.boot.context.properties.PropertyMapper;
@ -234,7 +234,7 @@ public class NettyRSocketServerFactory implements RSocketServerFactory, Configur
} }
private TcpServer apply(TcpServer server) { private TcpServer apply(TcpServer server) {
AbstractProtocolSslContextSpec<?> sslContextSpec = createSslContextSpec(this.sslBundle); GenericSslContextSpec<?> sslContextSpec = createSslContextSpec(this.sslBundle);
return server.secure((spec) -> spec.sslContext(sslContextSpec)); return server.secure((spec) -> spec.sslContext(sslContextSpec));
} }

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View File

@ -27,6 +27,7 @@ import reactor.netty.http.Http2SslContextSpec;
import reactor.netty.http.server.HttpServer; import reactor.netty.http.server.HttpServer;
import reactor.netty.tcp.AbstractProtocolSslContextSpec; import reactor.netty.tcp.AbstractProtocolSslContextSpec;
import reactor.netty.tcp.SslProvider; import reactor.netty.tcp.SslProvider;
import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
import reactor.netty.tcp.SslProvider.SslContextSpec; import reactor.netty.tcp.SslProvider.SslContextSpec;
import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundle;
@ -102,7 +103,7 @@ public class SslServerCustomizer implements NettyServerCustomizer {
} }
private SslProvider createSslProvider(SslBundle sslBundle) { private SslProvider createSslProvider(SslBundle sslBundle) {
return SslProvider.builder().sslContext(createSslContextSpec(sslBundle)).build(); return SslProvider.builder().sslContext((GenericSslContextSpec<?>) createSslContextSpec(sslBundle)).build();
} }
/** /**

7
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactoryTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,6 +39,7 @@ import org.mockito.InOrder;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.netty.http.Http11SslContextSpec; import reactor.netty.http.Http11SslContextSpec;
import reactor.netty.http.client.HttpClient; import reactor.netty.http.client.HttpClient;
import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
import reactor.netty.tcp.TcpClient; import reactor.netty.tcp.TcpClient;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;
@ -349,7 +350,7 @@ class NettyRSocketServerFactoryTests {
private HttpClient createSecureHttpClient() { private HttpClient createSecureHttpClient() {
HttpClient httpClient = createHttpClient(); HttpClient httpClient = createHttpClient();
Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient() GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
.configure((builder) -> builder.sslProvider(SslProvider.JDK) .configure((builder) -> builder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)); .trustManager(InsecureTrustManagerFactory.INSTANCE));
return httpClient.secure((spec) -> spec.sslContext(sslContextSpec)); return httpClient.secure((spec) -> spec.sslContext(sslContextSpec));
@ -363,7 +364,7 @@ class NettyRSocketServerFactoryTests {
private TcpClient createSecureTcpClient() { private TcpClient createSecureTcpClient() {
TcpClient tcpClient = createTcpClient(); TcpClient tcpClient = createTcpClient();
Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient() GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
.configure((builder) -> builder.sslProvider(SslProvider.JDK) .configure((builder) -> builder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)); .trustManager(InsecureTrustManagerFactory.INSTANCE));
return tcpClient.secure((spec) -> spec.sslContext(sslContextSpec)); return tcpClient.secure((spec) -> spec.sslContext(sslContextSpec));

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java
View File

@ -52,6 +52,7 @@ import reactor.core.publisher.Sinks;
import reactor.netty.NettyPipeline; import reactor.netty.NettyPipeline;
import reactor.netty.http.Http11SslContextSpec; import reactor.netty.http.Http11SslContextSpec;
import reactor.netty.http.client.HttpClient; import reactor.netty.http.client.HttpClient;
import reactor.netty.tcp.SslProvider.GenericSslContextSpec;
import reactor.test.StepVerifier; import reactor.test.StepVerifier;
import org.springframework.boot.web.server.Compression; import org.springframework.boot.web.server.Compression;
@ -246,7 +247,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
} }
protected ReactorClientHttpConnector buildTrustAllSslConnector() { protected ReactorClientHttpConnector buildTrustAllSslConnector() {
Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient() GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
.configure((builder) -> builder.sslProvider(SslProvider.JDK) .configure((builder) -> builder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE)); .trustManager(InsecureTrustManagerFactory.INSTANCE));
HttpClient client = HttpClient.create().wiretap(true).secure((spec) -> spec.sslContext(sslContextSpec)); HttpClient client = HttpClient.create().wiretap(true).secure((spec) -> spec.sslContext(sslContextSpec));
@ -285,7 +286,7 @@ public abstract class AbstractReactiveWebServerFactoryTests {
.getInstance(KeyManagerFactory.getDefaultAlgorithm()); .getInstance(KeyManagerFactory.getDefaultAlgorithm());
clientKeyManagerFactory.init(clientKeyStore, keyStorePassword.toCharArray()); clientKeyManagerFactory.init(clientKeyStore, keyStorePassword.toCharArray());
Http11SslContextSpec sslContextSpec = Http11SslContextSpec.forClient() GenericSslContextSpec<?> sslContextSpec = Http11SslContextSpec.forClient()
.configure((builder) -> builder.sslProvider(SslProvider.JDK) .configure((builder) -> builder.sslProvider(SslProvider.JDK)
.trustManager(InsecureTrustManagerFactory.INSTANCE) .trustManager(InsecureTrustManagerFactory.INSTANCE)
.keyManager(clientKeyManagerFactory)); .keyManager(clientKeyManagerFactory));