Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Direct matches by URL path work again

Browse Source 
This commit fixes a recent regression as a result of 5225a57411
with the determination of non-pattern vs pattern URLs. That in turn affects the ability to perform
direct matches by URL path.

There is also a fix in PathPattern to recognize "catch-all" patterns as pattern syntax.

See gh-24945
This commit is contained in:
Rossen Stoyanchev
2020-06-24 08:07:01 +01:00
parent 7e71749e34
commit 57f868fcbd
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PathPatternsRequestConditionTests.java
View File

@@ -48,6 +48,12 @@ public class PathPatternsRequestConditionTests {
.isEqualTo("");
}
@Test
void getDirectUrls() {
PathPatternsRequestCondition condition = createCondition("/something", "/else/**");
assertThat(condition.getDirectPaths()).containsExactly("/something");
}
@Test
void combineEmptySets() {
PathPatternsRequestCondition c1 = createCondition();

6
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/condition/PatternsRequestConditionTests.java
View File

@@ -47,6 +47,12 @@ class PatternsRequestConditionTests {
.isEqualTo("");
}
@Test
void getDirectUrls() {
PatternsRequestCondition condition = new PatternsRequestCondition("/something", "/else/**");
assertThat(condition.getDirectPaths()).containsExactly("/something");
}
@Test
void combineEmptySets() {
PatternsRequestCondition c1 = new PatternsRequestCondition();