fix: apply json schema format

keecon · Feb 28, 2022 · 85c4447 · 85c4447
1 parent 4732f33
commit 85c4447
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...sonschema/src/main/kotlin/com/keecon/restdocs/apispec/jsonschema/JsonSchemaConstraints.kt b/...sonschema/src/main/kotlin/com/keecon/restdocs/apispec/jsonschema/JsonSchemaConstraints.kt
@@ -29,16 +29,16 @@ internal object JsonSchemaConstraints {
     internal fun StringSchema.Builder.applyFormat(descriptor: AbstractDescriptor) = apply {
         formatValidator(
             descriptor.attributes.format?.let {
-                when (it) {
+                when (val format = it.lowercase()) {
                     DataFormat.DATETIME.lowercase() -> FormatValidator.forFormat("date-time")
-                    else -> FormatValidator.forFormat(it.lowercase())
+                    else -> FormatValidator.forFormat(format)
                 }
             } ?: FormatValidator.NONE
         )
     }
 
     internal fun NumberSchema.Builder.applyFormat(descriptor: AbstractDescriptor) = apply {
-        when (descriptor.attributes.format) {
+        when (descriptor.attributes.format?.lowercase()) {
             DataFormat.INT32.lowercase(), DataFormat.INT64.lowercase() -> requiresInteger(true)
             else -> Unit
         }

diff --git a/...enapi3-generator/src/main/kotlin/com/keecon/restdocs/apispec/openapi3/SchemaExtensions.kt b/...enapi3-generator/src/main/kotlin/com/keecon/restdocs/apispec/openapi3/SchemaExtensions.kt
@@ -14,9 +14,9 @@ import java.math.BigDecimal
 internal object SchemaExtensions {
 
     internal fun Schema<*>.applyProperties(descriptor: AbstractDescriptor) = apply {
-        when (descriptor.attributes.format) {
+        when (val format = descriptor.attributes.format?.lowercase()) {
             DataFormat.DATETIME.lowercase() -> format("date-time")
-            is String -> format(descriptor.attributes.format)
+            is String -> format(format)
             else -> Unit
         }
     }