Return Set<PathPattern> from AbstractHandlerMethodMapping.getMappingPathPatterns

This commit revises the signature of getMappingPathPatterns() in
AbstractHandlerMethodMapping to return a set of PathPatterns instead of
a set of Strings.

See gh-22543

Author: sbrannen

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java

@@ -48,6 +48,7 @@
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.reactive.handler.AbstractHandlerMapping;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.util.pattern.PathPattern;
 
 /**
  * Abstract base class for {@link HandlerMapping} implementations that define
@@ -418,7 +419,7 @@ protected CorsConfiguration getCorsConfiguration(Object handler, ServerWebExchan
 	 * Extract and return the URL paths contained in the supplied mapping.
 	 * @since 5.2
 	 */
-	protected abstract Set<String> getMappingPathPatterns(T mapping);
+	protected abstract Set<PathPattern> getMappingPathPatterns(T mapping);
 
 	/**
 	 * Check if a mapping matches the current request and return a (potentially
@@ -508,7 +509,8 @@ public void register(T mapping, Object handler, Method method) {
 		private void validateMethodMapping(HandlerMethod handlerMethod, T mapping) {
 			// Log a warning if the supplied mapping maps the supplied HandlerMethod
 			// only to empty paths.
-			if (logger.isWarnEnabled() && getMappingPathPatterns(mapping).stream().noneMatch(StringUtils::hasText)) {
+			if (logger.isWarnEnabled() && getMappingPathPatterns(mapping).stream()
+					.map(PathPattern::getPatternString).noneMatch(StringUtils::hasText)) {
 				logger.warn(String.format(
 						"Handler method '%s' in bean '%s' is not mapped to an explicit path. " +
 						"If you wish to map to all paths, please map explicitly to \"/**\" or \"**\".",

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java

@@ -170,8 +170,8 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 	 * @since 5.2
 	 */
 	@Override
-	protected Set<String> getMappingPathPatterns(RequestMappingInfo info) {
-		return info.getPatternsCondition().getPatterns().stream().map(PathPattern::getPatternString).collect(Collectors.toSet());
+	protected Set<PathPattern> getMappingPathPatterns(RequestMappingInfo info) {
+		return info.getPatternsCondition().getPatterns();
 	}
 
 	/**

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java

@@ -159,7 +159,7 @@ protected String getMappingForMethod(Method method, Class<?> handlerType) {
 		}
 
 		@Override
-		protected Set<String> getMappingPathPatterns(String mapping) {
+		protected Set<PathPattern> getMappingPathPatterns(String mapping) {
 			return Collections.emptySet();
 		}
 

spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java

@@ -26,7 +26,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -480,8 +479,8 @@ protected RequestMappingInfo getMappingForMethod(Method method, Class<?> handler
 		}
 
 		@Override
-		protected Set<String> getMappingPathPatterns(RequestMappingInfo info) {
-			return info.getPatternsCondition().getPatterns().stream().map(PathPattern::getPatternString).collect(Collectors.toSet());
+		protected Set<PathPattern> getMappingPathPatterns(RequestMappingInfo info) {
+			return info.getPatternsCondition().getPatterns();
 		}
 	}