mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.4.x'
This commit is contained in:
commit
06b751a0dd
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user