Provide an RSocketMessageHandlerCustomizer to allow customizing of the RSocketMessageHandler

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

@@ -0,0 +1,18 @@
+package org.springframework.boot.autoconfigure.rsocket;
+
+import org.apache.catalina.connector.Connector;
+import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
+import org.springframework.messaging.rsocket.RSocketStrategies;
+import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
+import org.springframework.util.RouteMatcher;
+
+/**
+ * @author Aarti Gupta
+ * Callback interface that can be used to customize a RSocketMessageHandler {@link Connector}.
+ */
+@FunctionalInterface
+public interface RSocketMessageHandlerCustomizer {
+
+	RSocketMessageHandler setRouteMatcher(RouteMatcher handler);
+
+}

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

@@ -19,6 +19,9 @@
 import io.rsocket.RSocketFactory;
 import io.rsocket.transport.netty.server.TcpServerTransport;
 
+import java.util.Objects;
+import java.util.stream.Collectors;
+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;
@@ -28,6 +31,7 @@
 import org.springframework.messaging.rsocket.RSocketRequester;
 import org.springframework.messaging.rsocket.RSocketStrategies;
 import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler;
+import org.springframework.util.RouteMatcher;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring RSocket support in Spring
@@ -36,17 +40,19 @@
  * @author Brian Clozel
  * @since 2.2.0
  */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnClass({ RSocketRequester.class, RSocketFactory.class, TcpServerTransport.class })
+@Configuration(proxyBeanMethods = true)
+@ConditionalOnClass({RSocketRequester.class, RSocketFactory.class, TcpServerTransport.class})
 @AutoConfigureAfter(RSocketStrategiesAutoConfiguration.class)
 public class RSocketMessagingAutoConfiguration {
 
+
 	@Bean
-	@ConditionalOnMissingBean
-	public RSocketMessageHandler messageHandler(RSocketStrategies rSocketStrategies) {
-		RSocketMessageHandler messageHandler = new RSocketMessageHandler();
-		messageHandler.setRSocketStrategies(rSocketStrategies);
-		return messageHandler;
+	@ConditionalOnMissingBean(RSocketMessageHandler.class)
+	public RSocketMessageHandler messageHandler(RSocketStrategies rSocketStrategies, ObjectProvider<RSocketMessageHandlerCustomizer> customizers) {
+		RSocketMessageHandlerCustomizer rSocketMessageHandlerCustomizer = customizers.getIfAvailable();
+		return rSocketMessageHandlerCustomizer.setRouteMatcher(rSocketStrategies.routeMatcher());
 	}
 
+
+
 }