#86, merge object properties & allOf properties

Author: hauner

src/main/kotlin/io/openapiprocessor/core/converter/DataTypeConverter.kt

@@ -277,8 +277,8 @@ class DataTypeConverter(
                 OffsetDateTimeDataType (constraints, schemaInfo.getDeprecated(),
                     Documentation(description = schemaInfo.description))
             else ->
-                throw UnknownDataTypeException(schemaInfo.getName(), schemaInfo.getType(),
-                    schemaInfo.getFormat())
+                throw UnknownDataTypeException(
+                    schemaInfo.getName(), schemaInfo.getType(), schemaInfo.getFormat())
         }
     }
 

src/main/kotlin/io/openapiprocessor/core/converter/SchemaInfo.kt

@@ -15,7 +15,7 @@ import io.openapiprocessor.core.support.capitalizeFirstChar
  * Helper for [DataTypeConverter]. Holds an OpenAPI schema with context information, e.g. name and
  * if this is an inline type with a generated name.
  */
-class SchemaInfo(
+open class SchemaInfo(
     /**
      * Endpoint path.
      */
@@ -79,8 +79,8 @@ class SchemaInfo(
      *
      * @return schema type
      */
-    override fun getType(): String {
-       return schema?.getType()!!
+    override fun getType(): String? {
+       return schema?.getType()
     }
 
     /**
@@ -238,6 +238,15 @@ class SchemaInfo(
      * iterate over composed items
      */
     fun eachItemOf(action: (info: SchemaInfo) -> Unit) {
+        if (schema?.getProperties()?.isNotEmpty() == true) {
+            action(SchemaInfoAllOf(
+                endpoint = endpoint,
+                name = "${name}_${itemOf()!!.capitalizeFirstChar()}",
+                schema = schema,
+                resolver = resolver
+            ))
+        }
+
         schema?.getItems()?.forEachIndexed { index, schema ->
             action(SchemaInfo(
                 endpoint = endpoint,
@@ -316,15 +325,15 @@ class SchemaInfo(
     }
 
     override fun isArray(): Boolean {
-        return schema?.getType().equals("array")
+        return getType().equals("array")
     }
 
     fun isObject(): Boolean {
-        return schema?.getType().equals("object")
+        return getType().equals("object")
     }
 
     fun isComposedObject(): Boolean {
-        return schema?.getType().equals("composed")
+        return getType().equals("composed")
     }
 
     fun isComposedAllOf(): Boolean {

src/main/kotlin/io/openapiprocessor/core/converter/SchemaInfoAllOf.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter
+
+import io.openapiprocessor.core.parser.RefResolver
+import io.openapiprocessor.core.parser.Schema
+
+class SchemaInfoAllOf(
+    endpoint: Endpoint,
+    name: String,
+    contentType: String = "",
+    schema: Schema?,
+    resolver: RefResolver
+) : SchemaInfo(endpoint, name, contentType, schema, resolver) {
+
+    override fun getType(): String {
+       return "object"
+    }
+
+}

src/main/kotlin/io/openapiprocessor/core/converter/mapping/MappingSchema.kt

@@ -18,7 +18,7 @@ interface MappingSchema {
     fun getName(): String
     fun getContentType(): String
 
-    fun getType(): String
+    fun getType(): String?
     fun getFormat(): String?
 
     fun isPrimitive(): Boolean

src/main/kotlin/io/openapiprocessor/core/converter/mapping/UnknownDataTypeException.kt

@@ -25,7 +25,7 @@ import java.lang.RuntimeException
  */
 class UnknownDataTypeException(
     val name: String?,
-    val type: String,
+    val type: String?,
     var format: String?
 ): RuntimeException() {
 

src/testInt/groovy/io/openapiprocessor/core/TestSets.groovy

@@ -52,6 +52,7 @@ class TestSets {
         'schema-composed',
         'schema-composed-allof',
         'schema-composed-allof-notype',
+        'schema-composed-allof-properties',
         'schema-composed-nested'
     ]