Merge pull request #57 from bargergo/string-length-validators

Add validators for strings

Author: Wicpar

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/common/ConstraintViolation.kt

@@ -0,0 +1,6 @@
+package com.papsign.ktor.openapigen.annotations.type.common
+
+import java.lang.Exception
+
+abstract class ConstraintViolation(defaultMessage: String, message: String = "", cause: Throwable? = null)
+ : Exception(if (message.isEmpty()) defaultMessage else message, cause)

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/NumberConstraintProcessor.kt

@@ -1,11 +1,11 @@
 package com.papsign.ktor.openapigen.annotations.type.number
 
+import com.papsign.ktor.openapigen.annotations.type.common.ConstraintViolation
 import com.papsign.ktor.openapigen.classLogger
 import com.papsign.ktor.openapigen.model.schema.SchemaModel
 import com.papsign.ktor.openapigen.schema.processor.SchemaProcessor
 import com.papsign.ktor.openapigen.validation.Validator
 import com.papsign.ktor.openapigen.validation.ValidatorBuilder
-import java.lang.Exception
 import java.math.BigDecimal
 import kotlin.reflect.KType
 import kotlin.reflect.full.withNullability
@@ -59,11 +59,9 @@ abstract class NumberConstraintProcessor<A: Annotation>(allowedTypes: Iterable<K
  }
 }
 
-data class NumberConstraint(val min: BigDecimal? = null, val max: BigDecimal? = null, val minInclusive: Boolean = true, val maxInclusive: Boolean = true)
+data class NumberConstraint(val min: BigDecimal? = null, val max: BigDecimal? = null, val minInclusive: Boolean = true, val maxInclusive: Boolean = true, val errorMessage: String)
 
-open class ConstraintVialoation(message: String, cause: Throwable? = null): Exception(message, cause)
-
-class NumberConstraintViolation(val actual: Number?, val constraint: NumberConstraint): ConstraintVialoation("Constraint violation: $actual should be ${
+class NumberConstraintViolation(val actual: Number?, val constraint: NumberConstraint): ConstraintViolation("Constraint violation: $actual should be ${
 {
  val min = "${constraint.min} ${if (constraint.minInclusive) "inclusive" else "exclusive"}"
  val max = "${constraint.max} ${if (constraint.maxInclusive) "inclusive" else "exclusive"}"
@@ -74,6 +72,6 @@ class NumberConstraintViolation(val actual: Number?, val constraint: NumberConst
  else -> "anything"
  }
 }()
-}")
+}", constraint.errorMessage)
 
-class NotANumberViolationViolation(val value: Any?): ConstraintVialoation("Constraint violation: $value is not a number")
+class NotANumberViolationViolation(val value: Any?): ConstraintViolation("Constraint violation: $value is not a number")

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/clamp/FClamp.kt

@@ -6,6 +6,6 @@ import com.papsign.ktor.openapigen.validation.ValidatorAnnotation
 @Target(AnnotationTarget.TYPE, AnnotationTarget.PROPERTY)
 @SchemaProcessorAnnotation(FClampProcessor::class)
 @ValidatorAnnotation(FClampProcessor::class)
-annotation class FClamp(val min: Double, val max: Double)
+annotation class FClamp(val min: Double, val max: Double, val errorMessage: String = "")
 
 

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/clamp/FClampProcessor.kt

@@ -18,6 +18,6 @@ object FClampProcessor : FloatingNumberConstraintProcessor<FClamp>() {
  }
 
  override fun getConstraint(annotation: FClamp): NumberConstraint {
- return NumberConstraint(BigDecimal(annotation.min), BigDecimal(annotation.max))
+ return NumberConstraint(BigDecimal(annotation.min), BigDecimal(annotation.max), errorMessage = annotation.errorMessage)
  }
 }

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/max/FMax.kt

@@ -6,4 +6,4 @@ import com.papsign.ktor.openapigen.validation.ValidatorAnnotation
 @Target(AnnotationTarget.TYPE, AnnotationTarget.PROPERTY)
 @SchemaProcessorAnnotation(FMaxProcessor::class)
 @ValidatorAnnotation(FMaxProcessor::class)
-annotation class FMax(val value: Double)
+annotation class FMax(val value: Double, val errorMessage: String = "")

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/max/FMaxProcessor.kt

@@ -16,6 +16,6 @@ object FMaxProcessor: FloatingNumberConstraintProcessor<FMax>() {
  }
  }
  override fun getConstraint(annotation: FMax): NumberConstraint {
- return NumberConstraint(max= BigDecimal(annotation.value))
+ return NumberConstraint(max= BigDecimal(annotation.value), errorMessage = annotation.errorMessage)
  }
 }

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/min/FMin.kt

@@ -6,4 +6,4 @@ import com.papsign.ktor.openapigen.validation.ValidatorAnnotation
 @Target(AnnotationTarget.TYPE, AnnotationTarget.PROPERTY)
 @SchemaProcessorAnnotation(FMinProcessor::class)
 @ValidatorAnnotation(FMinProcessor::class)
-annotation class FMin(val value: Double)
+annotation class FMin(val value: Double, val errorMessage: String = "")

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/floating/min/FMinProcessor.kt

@@ -17,6 +17,6 @@ object FMinProcessor: FloatingNumberConstraintProcessor<FMin>() {
  }
 
  override fun getConstraint(annotation: FMin): NumberConstraint {
- return NumberConstraint(min = BigDecimal(annotation.value))
+ return NumberConstraint(min = BigDecimal(annotation.value), errorMessage = annotation.errorMessage)
  }
 }

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/integer/clamp/Clamp.kt

@@ -6,4 +6,4 @@ import com.papsign.ktor.openapigen.validation.ValidatorAnnotation
 @Target(AnnotationTarget.TYPE, AnnotationTarget.PROPERTY)
 @SchemaProcessorAnnotation(ClampProcessor::class)
 @ValidatorAnnotation(ClampProcessor::class)
-annotation class Clamp(val min: Long, val max: Long)
+annotation class Clamp(val min: Long, val max: Long, val errorMessage: String = "")

src/main/kotlin/com/papsign/ktor/openapigen/annotations/type/number/integer/clamp/ClampProcessor.kt

@@ -18,6 +18,6 @@ object ClampProcessor: IntegerNumberConstraintProcessor<Clamp>() {
  }
 
  override fun getConstraint(annotation: Clamp): NumberConstraint {
- return NumberConstraint(BigDecimal(annotation.min), BigDecimal(annotation.max))
+ return NumberConstraint(BigDecimal(annotation.min), BigDecimal(annotation.max), errorMessage = annotation.errorMessage)
  }
 }