Merge pull request #2 from jmoennich/master

Minimally invasive approach for skipping query parameters in UriTemplate

Author: mduesterhoeft

src/main/kotlin/com/github/mduesterhoeft/router/UriTemplate.kt

@@ -17,8 +17,8 @@ class UriTemplate private constructor(private val template: String) {
     }
 
     companion object {
-        private val URI_TEMPLATE_FORMAT = "\\{([^}]+?)(?::([^}]+))?\\}".toRegex()
-        fun from(template: String) = UriTemplate(template.trimSlashes())
+        private val URI_TEMPLATE_FORMAT = "\\{([^}]+?)(?::([^}]+))?}".toRegex()
+        fun from(template: String) = UriTemplate(template.split('?')[0].trimSlashes())
 
         fun String.trimSlashes() = "^(/)?(.*?)(/)?$".toRegex().replace(this) { result -> result.groupValues[2] }
     }

src/test/kotlin/com/github/mduesterhoeft/router/UriTemplateTest.kt

@@ -34,4 +34,16 @@ class UriTemplateTest {
             .isEqualTo(mapOf("first" to "first-value", "second" to "second-value"))
         then(UriTemplate.from("/some").extract("/some")).isEmpty()
     }
+
+    @Test
+    fun `should match with query parameter`() {
+        then(UriTemplate.from("/some?a=1").matches("/some")).isTrue()
+        then(UriTemplate.from("/some?a=1&b=2").matches("/some")).isTrue()
+    }
+
+    @Test
+    fun `should match with path parameter and query parameter`() {
+        then(UriTemplate.from("/some/{id}?a=1").matches("/some/${UUID.randomUUID()}")).isTrue()
+        then(UriTemplate.from("/some/{id}/other?a=1&b=2").matches("/some/${UUID.randomUUID()}/other")).isTrue()
+    }
 }