fix missing required constraint with allOf, #72

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt

@@ -106,7 +106,6 @@ class DataTypeConverter(
                 DataTypeName(schemaInfo.getName(), getTypeNameWithSuffix(schemaInfo.getName())),
                 listOf(options.packageName, "model").joinToString ("."),
                 items,
-                null,
                 schemaInfo.getDeprecated()
             )
         } else {
@@ -310,7 +309,8 @@ class DataTypeConverter(
 
         // in case of an inline definition the name may be lowercase, make sure the enum
         // class gets an uppercase name!
-        val enumName = schemaInfo.getName().capitalize ()
+        val enumName = schemaInfo.getName()
+            .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }
 
         val found = dataTypes.find(enumName)
         if (found != null) {

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/model/datatypes/AllOfObjectDataType.kt

@@ -12,7 +12,6 @@ class AllOfObjectDataType(
     private val name: DataTypeName,
     private val pkg: String,
     private val items: List<DataType> = emptyList(),
-    override val constraints: DataTypeConstraints? = null,
     override val deprecated: Boolean = false
 ): DataType, ModelDataType {
 
@@ -39,6 +38,18 @@ class AllOfObjectDataType(
                 .toSet()
         }
 
+    override val constraints: DataTypeConstraints?
+        get() {
+            val required = items.filterIsInstance<ObjectDataType>()
+                .flatMap { it.constraints?.required ?: emptyList() }
+
+            if (required.isEmpty()) {
+                return null
+            }
+
+            return DataTypeConstraints(required = required)
+        }
+
     override fun isRequired(prop: String): Boolean {
         return constraints?.isRequired(prop) ?: false
     }

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.collections.shouldContainAll
 import io.kotest.matchers.shouldBe
 import io.openapiprocessor.core.support.datatypes.ObjectDataType
 
@@ -68,4 +69,36 @@ class ComposedObjectDataTypeSpec : StringSpec({
         composed.referencedImports shouldBe setOf("java.lang.String")
     }
 
+    "allOf handles 'required' constraint of all items" {
+        val composed = AllOfObjectDataType(DataTypeName("AllOf"), "pkg", listOf(
+            ObjectDataType("Foo", "pkg", linkedMapOf(
+                "foo" to StringDataType(),
+                "fux" to StringDataType()
+            ), constraints = DataTypeConstraints(required = listOf("foo", "fux"))),
+            ObjectDataType(
+                "Bar", "pkg", linkedMapOf(
+                    "bar" to StringDataType(),
+                    "bux" to StringDataType()
+            ), constraints = DataTypeConstraints(required = listOf("bar", "bux")))
+        ))
+
+        composed.constraints!!.required shouldContainAll listOf("foo", "fux", "bar", "bux")
+    }
+
+    "allOf without 'required' has null constraints" {
+        val composed = AllOfObjectDataType(DataTypeName("AllOf"), "pkg", listOf(
+            ObjectDataType("Foo", "pkg", linkedMapOf(
+                "foo" to StringDataType(),
+                "fux" to StringDataType()
+            ), constraints = DataTypeConstraints()),
+            ObjectDataType(
+                "Bar", "pkg", linkedMapOf(
+                    "bar" to StringDataType(),
+                    "bux" to StringDataType()
+            ), constraints = null)
+        ))
+
+        composed.constraints shouldBe null
+    }
+
 })

openapi-processor-core/src/testInt/groovy/io/openapiprocessor/core/TestSets.groovy

@@ -10,6 +10,7 @@ class TestSets {
     static def ALL = [
         'bean-validation',
         'bean-validation-iterable',
+        'bean-validation-allof-required',
         'deprecated',
         'endpoint-exclude',
         'endpoint-http-mapping',                    // framework specific

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

@@ -0,0 +1,3 @@
+items:
+  - generated/api/Api.java
+  - generated/model/QueryGetResponse200.java

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

@@ -0,0 +1,16 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.api;
+
+import annotation.Mapping;
+import generated.model.QueryGetResponse200;
+
+public interface Api {
+
+    @Mapping("/query")
+    QueryGetResponse200 getQuery();
+
+}

openapi-processor-core/src/testInt/resources/tests/bean-validation-allof-required/generated/model/QueryGetResponse200.java

@@ -0,0 +1,36 @@
+/*
+ * This class is auto generated by https://github.com/hauner/openapi-processor-core.
+ * TEST ONLY.
+ */
+
+package generated.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotNull;
+
+public class QueryGetResponse200 {
+
+    @NotNull
+    @JsonProperty("prop1")
+    private String prop1;
+
+    @JsonProperty("prop2")
+    private String prop2;
+
+    public String getProp1() {
+        return prop1;
+    }
+
+    public void setProp1(String prop1) {
+        this.prop1 = prop1;
+    }
+
+    public String getProp2() {
+        return prop2;
+    }
+
+    public void setProp2(String prop2) {
+        this.prop2 = prop2;
+    }
+
+}

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

@@ -0,0 +1,3 @@
+items:
+  - inputs/openapi.yaml
+  - inputs/mapping.yaml

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

@@ -0,0 +1,5 @@
+openapi-processor-spring: v2
+
+options:
+  package-name: generated
+  bean-validation: true

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

@@ -0,0 +1,25 @@
+openapi: 3.0.2
+info:
+  title: merge allOf into same object
+  version: 1.0.0
+
+paths:
+  /query:
+    get:
+      responses:
+        '200':
+          description: create result from allOff object
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - type: object
+                    properties:
+                      prop1:
+                        type: string
+                    required:
+                      - prop1
+                  - type: object
+                    properties:
+                      prop2:
+                        type: string