Skip to content

Update PathSegmentParser Regex #216

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

Merged
merged 1 commit into from
Mar 11, 2025
Merged

Update PathSegmentParser Regex #216

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
15 changes: 5 additions & 10 deletions avaje-jex/src/main/java/io/avaje/jex/routes/PathSegmentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@
import java.util.regex.MatchResult;
import java.util.regex.Pattern;

import static java.util.stream.Collectors.toList;

final class PathSegmentParser {

private static final PathSegment WILDCARD = new PathSegment.Wildcard();

private static final String[] ADJACENT_VIOLATIONS = {"*{", "*<", "}*", ">*"};

private static final String NAME_STR = "[a-zA-Z0-9_-]+";
private static final String NAME_OPT = "([:][^/^{]+([{][0-9]+[}])?)?"; // Optional regex
private static final String SLASH_STR = "[<]" + NAME_STR + "[>]";
private static final String PARAM_STR = "[{]" + NAME_STR + NAME_OPT + "[}]";
private static final String NAME_STR = "[\\w-]+";
private static final String NAME_OPT = "(:[^/^{]+([{]\\d+})?)?"; // Optional regex
private static final String SLASH_STR = "<" + NAME_STR + ">";
private static final String PARAM_STR = "[{]" + NAME_STR + NAME_OPT + "}";
private static final String MULTI_STR = "(" + PARAM_STR + "|" + SLASH_STR + "|[*]|" + "[^{</*]+)";

private static final Pattern MATCH_PARAM = Pattern.compile(PARAM_STR);
Expand Down Expand Up @@ -93,9 +91,7 @@ static boolean matchParamWithRegex(String input) {
}

static List<String> multi(String input) {
return MATCH_MULTI.matcher(input).results()
.map(MatchResult::group)
.collect(toList());
return MATCH_MULTI.matcher(input).results().map(MatchResult::group).toList();
}

static boolean matchLiteral(String segment) {
Expand Down Expand Up @@ -130,5 +126,4 @@ boolean endCharOnly(char c) {
// last char matches and no prior matching char
return segment.indexOf(c) == segment.length() - 1;
}

}