Merge pull request #556 from gabriel-farache/fix_urlpattermatcher (#557)

Fix UrlPatternMatcher not matching parameters in path containing "-" character Co-authored-by: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com>
quarkiverse · Nov 8, 2023 · d7561ef · d7561ef
1 parent d8363d7
commit d7561ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java b/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcher.java
@@ -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-.\\\\~!\\$&'\\\\(\\\\)\\\\*\\\\+,;=:\\\\[\\\\]@]+?\\)";

diff --git a/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java b/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/UrlPatternMatcherTest.java
@@ -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"));
     }
 
 }