From 53afbbe233acf10ef7cebc555c28a7719bcb2739 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 22 Jul 2019 15:30:40 +0200 Subject: [PATCH] Update RouteMatcher configuration for RSocket This commit updates the `RouteMatcher` configuration after the latest Spring Framework changes. The default route matcher implementation based on the `PathPattern` infrastructure is now tailored for the messaging use case (path separator, path encoding options and trailing separator). See spring-projects/spring-framework#23310 --- .../rsocket/RSocketMessagingAutoConfiguration.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfiguration.java index 4d31d2a83c..2f35954229 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketMessagingAutoConfiguration.java @@ -29,7 +29,6 @@ import org.springframework.messaging.rsocket.RSocketRequester; import org.springframework.messaging.rsocket.RSocketStrategies; import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHandler; import org.springframework.util.ClassUtils; -import org.springframework.web.util.pattern.PathPatternParser; import org.springframework.web.util.pattern.PathPatternRouteMatcher; /** @@ -52,9 +51,7 @@ public class RSocketMessagingAutoConfiguration { RSocketMessageHandler messageHandler = new RSocketMessageHandler(); messageHandler.setRSocketStrategies(rSocketStrategies); if (ClassUtils.isPresent(PATHPATTERN_ROUTEMATCHER_CLASS, null)) { - PathPatternParser parser = new PathPatternParser(); - parser.setSeparator('.'); - messageHandler.setRouteMatcher(new PathPatternRouteMatcher(parser)); + messageHandler.setRouteMatcher(new PathPatternRouteMatcher()); } return messageHandler; }