fix: validation functions throw unexpected errors

d1snin · Sep 4, 2023 · 08a5cc8 · 08a5cc8
1 parent cab85c5
commit 08a5cc8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/contententity/ContentEntity.kt b/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/contententity/ContentEntity.kt
@@ -34,8 +34,4 @@ public data class ContentEntity(
 )
 
 public operator fun ContentEntityParameters.get(definition: ContentEntityParameterDefinition): ContentEntityParameterValue? =
-    this[definition.name].also {
-        if (definition.required && it == null) {
-            error("Parameter isn't specified: $definition")
-        }
-    }
+    this[definition.name]
diff --git a/...src/commonMain/kotlin/dev/d1s/beam/commons/validation/ContentEntityParametersValidator.kt b/...src/commonMain/kotlin/dev/d1s/beam/commons/validation/ContentEntityParametersValidator.kt
@@ -36,9 +36,8 @@ internal object ContentEntityParametersValidator : ContentEntityValidator<Nothin
     private fun ValidationBuilder<ContentEntity>.requireParameters() {
         addConstraint("missing parameters") { entity ->
             val definition = entity.definition()
-            requireNotNull(definition)
 
-            definition.parameters.forEach { parameterDefinition ->
+            definition?.parameters?.forEach { parameterDefinition ->
                 if (parameterDefinition.required) {
                     val name = parameterDefinition.name
                     entity.parameters[name] ?: return@addConstraint false

diff --git a/...mmon/src/commonMain/kotlin/dev/d1s/beam/commons/validation/SpaceContentEntityValidator.kt b/...mmon/src/commonMain/kotlin/dev/d1s/beam/commons/validation/SpaceContentEntityValidator.kt
@@ -26,7 +26,7 @@ internal object SpaceContentEntityValidator :
 
     override fun ValidationBuilder<ContentEntity>.validate() {
         addTypedConstraint("parameter ${definition.identifier.name} is invalid") { entity ->
-            entity.parameters[definition.identifier]?.isNotBlank() != false
+            entity.parameters[definition.identifier]?.isBlank() != true
         }
     }
 }
diff --git a/...ommon/src/commonMain/kotlin/dev/d1s/beam/commons/validation/TextContentEntityValidator.kt b/...ommon/src/commonMain/kotlin/dev/d1s/beam/commons/validation/TextContentEntityValidator.kt
@@ -46,9 +46,8 @@ internal object TextContentEntityValidator :
     private fun ValidationBuilder<ContentEntity>.requireNotBlankValue() {
         addTypedConstraint("parameter \"${definition.value.name}\" must not be blank") { entity ->
             val value = entity.parameters[definition.value]
-            requireNotNull(value)
 
-            value.isNotBlank()
+            value?.isBlank() != true
         }
     }