feat: apply field optional (#244)

* feat: apply field optional * fix lint
ePages-de · Aug 25, 2023 · 4c735ca · 4c735ca
1 parent de0c1ab
commit 4c735ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...c-jsonschema/src/main/kotlin/com/epages/restdocs/apispec/jsonschema/ConstraintResolver.kt b/...c-jsonschema/src/main/kotlin/com/epages/restdocs/apispec/jsonschema/ConstraintResolver.kt
@@ -82,9 +82,10 @@ internal object ConstraintResolver {
             .minOrNull()
     }
 
-    internal fun isRequired(fieldDescriptor: FieldDescriptor): Boolean =
-        findConstraints(fieldDescriptor)
-            .any { constraint -> REQUIRED_CONSTRAINTS.contains(constraint.name) }
+    internal fun isRequired(fieldDescriptor: FieldDescriptor): Boolean = findConstraints(fieldDescriptor)
+        .any { constraint ->
+            REQUIRED_CONSTRAINTS.contains(constraint.name)
+        } || !fieldDescriptor.optional
 
     private fun findConstraints(fieldDescriptor: FieldDescriptor): List<Constraint> =
         fieldDescriptor.attributes.validationConstraints

diff --git a/...lin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGeneratorTest.kt b/...lin/com/epages/restdocs/apispec/jsonschema/JsonSchemaFromFieldDescriptorsGeneratorTest.kt
@@ -655,7 +655,7 @@ class JsonSchemaFromFieldDescriptorsGeneratorTest {
             ),
 
             FieldDescriptor("lineItems[*].quantity.unit", "some", "STRING"),
-            FieldDescriptor("shippingAddress", "some", "OBJECT"),
+            FieldDescriptor("shippingAddress", "some", "OBJECT", true),
             FieldDescriptor("billingAddress", "some", "OBJECT"),
             FieldDescriptor(
                 "billingAddress.firstName", "some", "STRING",
@@ -732,6 +732,7 @@ class JsonSchemaFromFieldDescriptorsGeneratorTest {
                 "pagePositive",
                 "some",
                 "NUMBER",
+                true,
                 attributes = Attributes(
                     listOf(
                         Constraint(