chore(api): Address depecrations of the Konform library

Update code that uses Konform API that was deprecated in 0.9.0 [1]. [1]: https://github.com/konform-kt/konform/releases/tag/v0.9.0 Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@bosch.com>
eclipse-apoapsis · Nov 25, 2024 · f165294 · f165294
1 parent a8586cb
commit f165294
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/api/v1/model/src/commonMain/kotlin/InfrastructureService.kt b/api/v1/model/src/commonMain/kotlin/InfrastructureService.kt
@@ -20,7 +20,7 @@
 package org.eclipse.apoapsis.ortserver.api.v1.model
 
 import io.konform.validation.Validation
-import io.konform.validation.jsonschema.pattern
+import io.konform.validation.constraints.pattern
 
 import java.util.EnumSet
 

diff --git a/api/v1/model/src/commonMain/kotlin/Organization.kt b/api/v1/model/src/commonMain/kotlin/Organization.kt
@@ -20,7 +20,7 @@
 package org.eclipse.apoapsis.ortserver.api.v1.model
 
 import io.konform.validation.Validation
-import io.konform.validation.jsonschema.pattern
+import io.konform.validation.constraints.pattern
 
 import kotlinx.serialization.Serializable
 

diff --git a/api/v1/model/src/commonMain/kotlin/Product.kt b/api/v1/model/src/commonMain/kotlin/Product.kt
@@ -20,7 +20,7 @@
 package org.eclipse.apoapsis.ortserver.api.v1.model
 
 import io.konform.validation.Validation
-import io.konform.validation.jsonschema.pattern
+import io.konform.validation.constraints.pattern
 
 import kotlinx.serialization.Serializable
 

diff --git a/api/v1/model/src/commonMain/kotlin/Repository.kt b/api/v1/model/src/commonMain/kotlin/Repository.kt
@@ -68,11 +68,11 @@ data class CreateRepository(
         val validate: ValidatorFunc<CreateRepository> = { obj ->
             Validation {
                 CreateRepository::url {
-                    addConstraint("malformed URL") {
+                    constrain("malformed URL") {
                         Repository.isValidUrl(it)
                     } hint Repository.INVALID_URL_MESSAGE
 
-                    addConstraint("URL cannot contain userinfo") {
+                    constrain("URL cannot contain userinfo") {
                         !Repository.hasUserInfo(it)
                     } hint Repository.USER_INFO_MESSAGE
                 }
@@ -93,14 +93,14 @@ data class UpdateRepository(
         val validate: ValidatorFunc<UpdateRepository> = { obj ->
             Validation {
                 UpdateRepository::url {
-                    addConstraint("malformed URL") {
+                    constrain("malformed URL") {
                         when (it) {
                             is OptionalValue.Present -> Repository.isValidUrl(it.value)
                             is OptionalValue.Absent -> true
                         }
                     } hint Repository.INVALID_URL_MESSAGE
 
-                    addConstraint("URL cannot contain userinfo") {
+                    constrain("URL cannot contain userinfo") {
                         when (it) {
                             is OptionalValue.Present -> !Repository.hasUserInfo(it.valueOrThrow)
                             is OptionalValue.Absent -> true

diff --git a/api/v1/model/src/commonMain/kotlin/Secret.kt b/api/v1/model/src/commonMain/kotlin/Secret.kt
@@ -20,7 +20,7 @@
 package org.eclipse.apoapsis.ortserver.api.v1.model
 
 import io.konform.validation.Validation
-import io.konform.validation.jsonschema.pattern
+import io.konform.validation.constraints.pattern
 
 import kotlinx.serialization.Serializable
 

diff --git a/api/v1/model/src/commonMain/kotlin/validation/ValidationHelper.kt b/api/v1/model/src/commonMain/kotlin/validation/ValidationHelper.kt
@@ -33,9 +33,8 @@ typealias ValidatorFunc<T> = (T) -> ValidationResult<T>
 /**
  * An extension function for validating [OptionalValue] objects against a given regex [pattern].
  */
-fun ValidationBuilder<OptionalValue<String>>.optionalPattern(pattern: Regex) = addConstraint(
-    "must match the expected pattern",
-    pattern.pattern
+fun ValidationBuilder<OptionalValue<String>>.optionalPattern(pattern: Regex) = constrain(
+    "must match the expected pattern '${pattern.pattern}'"
 ) {
     when (it) {
         is OptionalValue.Present -> it.value.matches(pattern)