Skip to content

Fix issue with baseUrls and transitive dependencies #56

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
Apr 23, 2025
Merged

Fix issue with baseUrls and transitive dependencies #56

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
1 change: 0 additions & 1 deletion kotlin-wot-binding-http/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 2 additions & 2 deletions kotlin-wot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))
Expand Down
6 changes: 3 additions & 3 deletions kotlin-wot/src/main/kotlin/thing/form/AugmentedForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down