Skip to content

S
spring-boot
Commit dace7bb7 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.3.x' into 2.4.x

parents ba5c57c1 b76a9951
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
View file @ dace7bb7
......@@ -65,7 +65,7 @@ public class RSocketServerAutoConfiguration {
@Conditional(OnRSocketWebServerCondition.class)
@Configuration(proxyBeanMethods = false)
static class WebFluxServerAutoConfiguration {
static class WebFluxServerConfiguration {
@Bean
@ConditionalOnMissingBean
......@@ -80,7 +80,7 @@ public class RSocketServerAutoConfiguration {
@ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port")
@ConditionalOnClass(ReactorResourceFactory.class)
@Configuration(proxyBeanMethods = false)
static class EmbeddedServerAutoConfiguration {
static class EmbeddedServerConfiguration {
@Bean
@ConditionalOnMissingBean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment