Skip to content

Improve error handling for invalid path pattern combination in PathPattern.combine #34990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Improve error handling for invalid path pattern combination in PathPattern.combine #34990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,15 @@ else if (!StringUtils.hasLength(pattern2string.patternString)) {
this.patternString.substring(0, this.patternString.length() - 2),
pattern2string.patternString));
}

if (this.patternString.endsWith("/*")) {
String base = this.patternString.substring(0, this.patternString.length() - 2);
if (pattern2string.patternString.contains("/")) {
throw new IllegalArgumentException("Cannot combine single-segment wildcard '/*' with multi-segment path '" +
pattern2string.patternString + "'");
}
return this.parser.parse(concat(base, "/" + pattern2string.patternString));
}

// /hotels + /booking => /hotels/booking
// /hotels + booking => /hotels/booking
Expand Down
1 change: 1 addition & 0 deletions spring-web/src/test/java/org/springframework/web/util/pattern/PathPatternTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

/**
* Exercise matching of {@link PathPattern} objects.
Expand Down
Loading