merge required constraints with allOf (#133)

Author: hauner

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/model/datatypes/ComposedObjectDataTypeSpec.kt

@@ -6,6 +6,7 @@
 package io.openapiprocessor.core.model.datatypes
 
 import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.booleans.shouldBeTrue
 import io.kotest.matchers.collections.shouldContainAll
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.support.datatypes.ObjectDataType
@@ -87,6 +88,22 @@ class ComposedObjectDataTypeSpec : StringSpec({
         composed.constraints!!.required shouldContainAll listOf("foo", "fux", "bar", "bux")
     }
 
+    "allOf merges 'required' constraint of all items" {
+        val composed = AllOfObjectDataType(DataTypeName("AllOf"), "pkg", listOf(
+            ObjectDataType("FooConstraints", "pkg", linkedMapOf(),
+                constraints = DataTypeConstraints(required = listOf("foo", "fux"))),
+            ObjectDataType(
+                "Foo", "pkg", linkedMapOf(
+                    "foo" to propertyDataTypeString(),
+                    "fux" to propertyDataTypeString()
+            ), constraints = DataTypeConstraints(required = listOf()))
+        ))
+
+        composed.constraints!!.required shouldContainAll listOf("foo", "fux")
+        composed.isRequired("foo").shouldBeTrue()
+        composed.isRequired("fux").shouldBeTrue()
+    }
+
     "allOf without 'required' has null constraints" {
         val composed = AllOfObjectDataType(DataTypeName("AllOf"), "pkg", listOf(
             ObjectDataType("Foo", "pkg", linkedMapOf(

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/inputs.yaml

@@ -2,4 +2,5 @@ items:
   - inputs/openapi30.yaml
   - inputs/openapi31.yaml
   - inputs/query.yaml
+  - inputs/query-2.yaml
   - inputs/mapping.yaml

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/inputs/openapi30.yaml

@@ -6,3 +6,6 @@ info:
 paths:
   /query:
     $ref: 'query.yaml'
+
+  /query-2:
+    $ref: 'query-2.yaml'

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/inputs/openapi31.yaml

@@ -6,3 +6,6 @@ info:
 paths:
   /query:
     $ref: 'query.yaml'
+
+  /query-2:
+    $ref: 'query-2.yaml'

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/inputs/query-2.yaml

@@ -0,0 +1,15 @@
+get:
+  responses:
+    '200':
+      description: create result from allOff object
+      content:
+        application/json:
+          schema:
+            allOf:
+              - type: object
+                required:
+                  - prop1
+              - type: object
+                properties:
+                  prop1:
+                    type: string

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/outputs.yaml

@@ -1,3 +1,4 @@
 items:
   - outputs/api/Api.java
   - outputs/<model>/QueryGetResponse200.java
+  - outputs/<model>/Query2GetResponse200.java

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/outputs/api/Api.java

@@ -1,6 +1,7 @@
 package generated.api;
 
 import annotation.Mapping;
+import generated.model.Query2GetResponse200;
 import generated.model.QueryGetResponse200;
 import generated.support.Generated;
 
@@ -10,4 +11,7 @@ public interface Api {
     @Mapping("/query")
     QueryGetResponse200 getQuery();
 
+    @Mapping("/query-2")
+    Query2GetResponse200 getQuery2();
+
 }

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/outputs/model/default/Query2GetResponse200.java

@@ -0,0 +1,22 @@
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import generated.support.Generated;
+import javax.validation.constraints.NotNull;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public class Query2GetResponse200 {
+
+    @NotNull
+    @JsonProperty("prop1")
+    private String prop1;
+
+    public String getProp1() {
+        return prop1;
+    }
+
+    public void setProp1(String prop1) {
+        this.prop1 = prop1;
+    }
+
+}

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/outputs/model/record/Query2GetResponse200.java

@@ -0,0 +1,12 @@
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import generated.support.Generated;
+import javax.validation.constraints.NotNull;
+
+@Generated(value = "openapi-processor-core", version = "test")
+public record Query2GetResponse200(
+    @NotNull
+    @JsonProperty("prop1")
+    String prop1
+) {}