root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Revert "Switch default MVC path matching strategy" 

This reverts commit ab8e599cfe.

See gh-24805
This commit is contained in:
Phillip Webb 2021-04-07 15:17:02 -07:00
parent ab8e599cfe
commit e766c8b3a7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
View File

@ -434,7 +434,7 @@ public class WebMvcProperties {
/** /**
* Choice of strategy for matching request paths against registered mappings. * 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. * Whether to use suffix pattern match (".*") when matching patterns to requests.

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java
View File

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