Skip to content

Fix UrlPatternMatcher not matching parameters in path containing "-" character #556

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
Nov 8, 2023
Merged

Fix UrlPatternMatcher not matching parameters in path containing "-" character #556

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
2 changes: 1 addition & 1 deletion runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
*/
public class UrlPatternMatcher {
// Finds parameters in the URL pattern string.
private static final String URL_PARAM_REGEX = "\\{(\\w*?)\\}";
private static final String URL_PARAM_REGEX = "\\{(\\S*?)\\}";

// Replaces parameter names in the URL pattern string to match parameters in URLs.
private static final String URL_PARAM_MATCH_REGEX = "\\([%\\\\w-.\\\\~!\\$&'\\\\(\\\\)\\\\*\\\\+,;=:\\\\[\\\\]@]+?\\)";
Expand Down
3 changes: 2 additions & 1 deletion runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ private static Stream<Arguments> providePathsThatMatch() {
Arguments.of("/{id}/pets/{id2}", "/1/pets/2?q=1&q2=2"),
Arguments.of("/{id}/{foo}/{id2}", "/1/2/3?q=1&q2=2"),
Arguments.of("/{id}/{foo}/{id2}", "/1/2/3"),
Arguments.of("/v2/pets/{id}", "/v2/pets/1"));
Arguments.of("/v2/pets/{id}", "/v2/pets/1"),
Arguments.of("/pets/{pet-id}/types/{type-id}", "/pets/1/types/2"));
}

}