Merge pull request spring-projects#17301 from spencergibb

* pr/17301: Polish "Make rSocketServerBootstrap @ConditionalOnMissingBean" Make rSocketServerBootstrap @ConditionalOnMissingBean Closes spring-projectsgh-17301
HoraceYuan · Jun 25, 2019 · e2d92b3 · e2d92b3
2 parents 7405efa + 9166b6d
commit e2d92b3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/...n/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java b/...n/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java
@@ -98,6 +98,7 @@ public RSocketServerFactory rSocketServerFactory(RSocketProperties properties,
 		}
 
 		@Bean
+		@ConditionalOnMissingBean
 		public RSocketServerBootstrap rSocketServerBootstrap(RSocketServerFactory rSocketServerFactory,
 				RSocketMessageHandler rSocketMessageHandler) {
 			return new RSocketServerBootstrap(rSocketServerFactory, rSocketMessageHandler.serverAcceptor());

diff --git a/...a/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java b/...a/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfigurationTests.java
@@ -32,6 +32,7 @@
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
 
 /**
  * Tests for {@link RSocketServerAutoConfiguration}.
@@ -77,6 +78,12 @@ void shouldCreateDefaultBeansForRSocketServerWhenPortIsSet() {
 						.hasSingleBean(RSocketServerBootstrap.class));
 	}
 
+	@Test
+	void shoudUseCustomServerBootstrap() {
+		contextRunner().withUserConfiguration(CustomServerBootstrapConfig.class).run((context) -> assertThat(context)
+				.getBeanNames(RSocketServerBootstrap.class).containsExactly("customServerBootstrap"));
+	}
+
 	private ApplicationContextRunner contextRunner() {
 		return new ApplicationContextRunner().withUserConfiguration(BaseConfiguration.class)
 				.withConfiguration(AutoConfigurations.of(RSocketServerAutoConfiguration.class));
@@ -100,4 +107,14 @@ public RSocketMessageHandler messageHandler() {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class CustomServerBootstrapConfig {
+
+		@Bean
+		public RSocketServerBootstrap customServerBootstrap() {
+			return mock(RSocketServerBootstrap.class);
+		}
+
+	}
+
 }