diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java index 32a04851e37..3dcad864dab 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/UrlBasedCorsConfigurationSource.java @@ -20,12 +20,12 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.util.AntPathMatcher; import org.springframework.util.Assert; import org.springframework.util.PathMatcher; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.support.HttpRequestPathHelper; +import org.springframework.web.util.ParsingPathMatcher; /** * Provide a per reactive request {@link CorsConfiguration} instance based on a @@ -41,15 +41,15 @@ public class UrlBasedCorsConfigurationSource implements CorsConfigurationSource private final Map corsConfigurations = new LinkedHashMap<>(); - private PathMatcher pathMatcher = new AntPathMatcher(); + private PathMatcher pathMatcher = new ParsingPathMatcher(); private HttpRequestPathHelper pathHelper = new HttpRequestPathHelper(); /** * Set the PathMatcher implementation to use for matching URL paths - * against registered URL patterns. Default is AntPathMatcher. - * @see AntPathMatcher + * against registered URL patterns. Default is ParsingPathMatcher. + * @see ParsingPathMatcher */ public void setPathMatcher(PathMatcher pathMatcher) { Assert.notNull(pathMatcher, "PathMatcher must not be null"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java index 32e5b1ac2cd..ad248ed3a79 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java @@ -82,7 +82,7 @@ public class PathMatchConfigurer { /** * Set the PathMatcher for matching URL paths against registered URL patterns. - *

Default is {@link org.springframework.util.AntPathMatcher AntPathMatcher}. + *

Default is {@link org.springframework.web.util.ParsingPathMatcher ParsingPathMatcher}. */ public PathMatchConfigurer setPathMatcher(PathMatcher pathMatcher) { this.pathMatcher = pathMatcher; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java index aeaefd02156..312d227ce76 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java @@ -90,7 +90,7 @@ public class ResourceHandlerRegistry { * that matches to one of the specified path patterns. * *

Patterns like {@code "/static/**"} or {@code "/css/{filename:\\w+\\.css}"} - * are allowed. See {@link org.springframework.util.AntPathMatcher} for more + * are allowed. See {@link org.springframework.web.util.ParsingPathMatcher} for more * details on the syntax. * @return A {@link ResourceHandlerRegistration} to use to further * configure the registered resource handler diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java index 1e68d58f88f..1508dd3cba4 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java @@ -104,7 +104,7 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im /** * Set the PathMatcher implementation to use for matching URL paths * against registered URL patterns. Default is AntPathMatcher. - * @see org.springframework.util.AntPathMatcher + * @see org.springframework.web.util.ParsingPathMatcher */ public void setPathMatcher(PathMatcher pathMatcher) { Assert.notNull(pathMatcher, "PathMatcher must not be null"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java index 57122fd8aae..193e6fa5e4e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java @@ -37,7 +37,7 @@ import org.springframework.web.server.ServerWebExchange; * various Ant-style pattern matches, e.g. a registered "/t*" pattern matches * both "/test" and "/team", "/test/*" matches all paths under "/test", * "/test/**" matches all paths below "/test". For details, see the - * {@link org.springframework.util.AntPathMatcher AntPathMatcher} javadoc. + * {@link org.springframework.web.util.ParsingPathMatcher ParsingPathMatcher} javadoc. * *

Will search all path patterns to find the most exact match for the * current request path. The most exact match is defined as the longest @@ -130,7 +130,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { * @param urlPath URL the bean is mapped to * @param exchange the current exchange * @return the associated handler instance, or {@code null} if not found - * @see org.springframework.util.AntPathMatcher + * @see org.springframework.web.util.ParsingPathMatcher */ protected Object lookupHandler(String urlPath, ServerWebExchange exchange) throws Exception { // Direct match? diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java index 503c8df6f1c..f5ea7c7221e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java @@ -46,7 +46,7 @@ import org.springframework.util.CollectionUtils; * various Ant-style pattern matches, e.g. a registered "/t*" pattern matches * both "/test" and "/team", "/test/*" matches all paths under "/test", * "/test/**" matches all paths below "/test". For details, see the - * {@link org.springframework.util.AntPathMatcher AntPathMatcher} javadoc. + * {@link org.springframework.web.util.ParsingPathMatcher ParsingPathMatcher} javadoc. * * @author Rossen Stoyanchev * @since 5.0 @@ -60,7 +60,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping { * Map URL paths to handler bean names. * This is the typical way of configuring this HandlerMapping. *

Supports direct URL matches and Ant-style pattern matches. For syntax - * details, see the {@link org.springframework.util.AntPathMatcher} javadoc. + * details, see the {@link org.springframework.web.util.ParsingPathMatcher} javadoc. * @param mappings properties with URLs as keys and bean names as values * @see #setUrlMap */ @@ -72,7 +72,7 @@ public class SimpleUrlHandlerMapping extends AbstractUrlHandlerMapping { * Set a Map with URL paths as keys and handler beans (or handler bean names) * as values. Convenient for population with bean references. *

Supports direct URL matches and Ant-style pattern matches. For syntax - * details, see the {@link org.springframework.util.AntPathMatcher} javadoc. + * details, see the {@link org.springframework.web.util.ParsingPathMatcher} javadoc. * @param urlMap map with URLs as keys and beans as values * @see #setMappings */