Merge pull request #56 from eclipse-thingweb/regex-fix

Fix issue with baseUrls and transitive dependencies

Author: RobWin

kotlin-wot-binding-http/build.gradle.kts

@@ -1,7 +1,6 @@
 dependencies {
     implementation(platform("io.ktor:ktor-bom:3.0.3"))
     api(project(":kotlin-wot"))
-    implementation("org.slf4j:slf4j-api")
     implementation("io.ktor:ktor-server-core")
     implementation("io.ktor:ktor-server-netty")
     implementation("io.ktor:ktor-client-core")

kotlin-wot/build.gradle.kts

@@ -1,8 +1,8 @@
 dependencies {
     //implementation("org.jetbrains.kotlin:kotlin-reflect:2.0.20")
     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
-    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.3")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.3")
 
     // Tracing
     api(platform("io.opentelemetry:opentelemetry-bom:1.47.0"))

kotlin-wot/src/main/kotlin/thing/form/AugmentedForm.kt

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import com.fasterxml.jackson.annotation.JsonIgnore
+import com.fasterxml.jackson.databind.JsonNode
 import org.eclipse.thingweb.security.SecurityScheme
 import org.eclipse.thingweb.thing.form.Form
 import org.eclipse.thingweb.thing.schema.WoTForm
 import org.eclipse.thingweb.thing.schema.WoTThingDescription
-import com.fasterxml.jackson.annotation.JsonIgnore
-import com.fasterxml.jackson.databind.JsonNode
 import org.slf4j.LoggerFactory
 import java.net.URI
 import java.net.URISyntaxException
@@ -80,7 +80,7 @@ data class AugmentedForm(
             .map { it.value }
 
     private fun filterUriVariables(href: String): List<String> {
-        val regex = Regex("\\{[?+#./;&]?([^}]+)}") // Extracts text inside `{}` while ignoring optional prefix
+        val regex = Regex("\\{[?+#./;&]?([^}]+)\\}") // Extracts text inside `{}` while ignoring optional prefix
         return regex.findAll(href)
             .map { it.groupValues[1] } // Directly access group value (instead of using `?.value`)
             .flatMap { it.split(",") } // Handle multiple variables inside `{}` (comma-separated)