GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '2.4.x'

pull/25562/head
Andy Wilkinson 5 years ago
parent
565dc0cc0f dace7bb742
commit
06b751a0dd
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
Unescape View File

@ -65,7 +65,7 @@ public class RSocketServerAutoConfiguration {
@Conditional(OnRSocketWebServerCondition.class) @Conditional(OnRSocketWebServerCondition.class)
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class WebFluxServerAutoConfiguration { static class WebFluxServerConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ -80,7 +80,7 @@ public class RSocketServerAutoConfiguration {
@ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port") @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port")
@ConditionalOnClass(ReactorResourceFactory.class) @ConditionalOnClass(ReactorResourceFactory.class)
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
static class EmbeddedServerAutoConfiguration { static class EmbeddedServerConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean

Write Preview
Loading…
Cancel
Save