Revert "Switch default MVC path matching strategy"

This reverts commit ab8e599cfe.

See gh-24805
This commit is contained in:
Phillip Webb 2021-04-15 17:35:15 -07:00
parent beaf03a008
commit a48c98b469
2 changed files with 2 additions and 3 deletions

View File

@ -434,7 +434,7 @@ public class WebMvcProperties {
/**
* Choice of strategy for matching request paths against registered mappings.
*/
private MatchingStrategy matchingStrategy = MatchingStrategy.PATH_PATTERN_PARSER;
private MatchingStrategy matchingStrategy = MatchingStrategy.ANT_PATH_MATCHER;
/**
* Whether to use suffix pattern match (".*") when matching patterns to requests.

View File

@ -849,8 +849,7 @@ class WebMvcAutoConfigurationTests {
@Deprecated
@SuppressWarnings("deprecation")
void useSuffixPatternMatch() {
this.contextRunner.withPropertyValues("spring.mvc.pathmatch.matching-strategy=ant-path-matcher",
"spring.mvc.pathmatch.use-suffix-pattern:true",
this.contextRunner.withPropertyValues("spring.mvc.pathmatch.use-suffix-pattern:true",
"spring.mvc.pathmatch.use-registered-suffix-pattern:true").run((context) -> {
RequestMappingHandlerMapping handlerMapping = context.getBean(RequestMappingHandlerMapping.class);
assertThat(handlerMapping.useSuffixPatternMatch()).isTrue();