Apply RSocketConnectorConfigurer beans to the RSocketRequester.Builder

Author: nguyensach

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfiguration.java

@@ -19,13 +19,15 @@
 import io.rsocket.transport.netty.server.TcpServerTransport;
 import reactor.netty.http.server.HttpServer;
 
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.messaging.rsocket.RSocketConnectorConfigurer;
 import org.springframework.messaging.rsocket.RSocketRequester;
 import org.springframework.messaging.rsocket.RSocketStrategies;
 
@@ -37,6 +39,7 @@
  * requester instances with different configurations.
  *
  * @author Brian Clozel
+ * @author Nguyen Bao Sach
  * @since 2.2.0
  */
 @Configuration(proxyBeanMethods = false)
@@ -47,8 +50,11 @@ public class RSocketRequesterAutoConfiguration {
 	@Bean
 	@Scope("prototype")
 	@ConditionalOnMissingBean
-	public RSocketRequester.Builder rSocketRequesterBuilder(RSocketStrategies strategies) {
-		return RSocketRequester.builder().rsocketStrategies(strategies);
+	public RSocketRequester.Builder rSocketRequesterBuilder(RSocketStrategies strategies,
+			ObjectProvider<RSocketConnectorConfigurer> connectorConfigurers) {
+		return connectorConfigurers.orderedStream()
+				.collect(RSocketRequester::builder, RSocketRequester.Builder::rsocketConnector, (first, second) -> {
+				}).rsocketStrategies(strategies);
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/rsocket/RSocketRequesterAutoConfigurationTests.java

@@ -16,13 +16,17 @@
 
 package org.springframework.boot.autoconfigure.rsocket;
 
+import java.util.List;
+
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.rsocket.RSocketConnectorConfigurer;
 import org.springframework.messaging.rsocket.RSocketRequester;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -31,6 +35,7 @@
  * Tests for {@link RSocketRequesterAutoConfiguration}
  *
  * @author Brian Clozel
+ * @author Nguyen Bao Sach
  */
 class RSocketRequesterAutoConfigurationTests {
 
@@ -59,6 +64,23 @@ void shouldNotCreateBuilderIfAlreadyPresent() {
 		});
 	}
 
+	@SuppressWarnings("unchecked")
+	@Test
+	void rSocketConnectorConfigurersArePickedUp() {
+		RSocketConnectorConfigurer first = mock(RSocketConnectorConfigurer.class);
+		RSocketConnectorConfigurer second = mock(RSocketConnectorConfigurer.class);
+		this.contextRunner.withBean("firstRSocketConnectorConfigurer", RSocketConnectorConfigurer.class, () -> first)
+				.withBean("secondRSocketConnectorConfigurer", RSocketConnectorConfigurer.class, () -> second)
+				.run((context) -> {
+					assertThat(context).getBeans(RSocketConnectorConfigurer.class).hasSize(2);
+
+					RSocketRequester.Builder builder = context.getBean(RSocketRequester.Builder.class);
+					List<RSocketConnectorConfigurer> rsocketConnectorConfigurers = (List<RSocketConnectorConfigurer>) ReflectionTestUtils
+							.getField(builder, "rsocketConnectorConfigurers");
+					assertThat(rsocketConnectorConfigurers).containsExactly(first, second);
+				});
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class CustomRSocketRequesterBuilder {