convert nested types before checking the mapping, resolves #50

Author: hauner

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

@@ -76,6 +76,12 @@ class DataTypeConverter(
     private fun createComposedDataType(schemaInfo: SchemaInfo, dataTypes: DataTypes): DataType {
         val objectType: DataType
 
+        val items: MutableList<DataType> = mutableListOf()
+        schemaInfo.eachItemOf { itemSchemaInfo: SchemaInfo ->
+            val itemType = convert(itemSchemaInfo, dataTypes)
+            items.add (itemType)
+        }
+
         val targetType = getMappedDataType(schemaInfo)
         if (targetType != null) {
             objectType = MappedDataType(
@@ -88,12 +94,6 @@ class DataTypeConverter(
             return objectType
         }
 
-        val items: MutableList<DataType> = mutableListOf()
-        schemaInfo.eachItemOf { itemSchemaInfo: SchemaInfo ->
-            val itemType = convert(itemSchemaInfo, dataTypes)
-            items.add (itemType)
-        }
-
         objectType = ComposedObjectDataType(
             schemaInfo.getName(),
             listOf(options.packageName, "model").joinToString ("."),

src/test/kotlin/io/openapiprocessor/core/converter/ApiConverterSpec.kt

@@ -0,0 +1,120 @@
+/*
+ * Copyright 2019 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.converter
+
+import io.kotest.core.spec.IsolationMode
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+import io.openapiprocessor.core.converter.mapping.TypeMapping
+import io.openapiprocessor.core.framework.FrameworkBase
+import io.openapiprocessor.core.model.Api
+import io.openapiprocessor.core.support.parse
+
+class ApiConverterSpec: StringSpec({
+    isolationMode = IsolationMode.InstancePerTest
+
+    "generates model if it is only referenced in the mapping" {
+         val openApi = parse ("""
+            openapi: 3.0.2
+            info:
+              title: API
+              version: 1.0.0
+            
+            paths:
+              /foo:
+                get:
+                  responses:
+                    '200':
+                      description: ...
+                      content:
+                        application/json:
+                          schema:
+                            ${'$'}ref: '#/components/schemas/WrappedFoo'
+            
+            components:
+              schemas:
+                        
+                WrappedFoo:
+                  description: ...
+                  type: array
+                  items: 
+                    ${'$'}ref: '#/components/schemas/Foo'
+            
+                Foo:
+                  description: a Foo
+                  type: object
+                  properties:
+                    foo:
+                      type: string
+                  
+         """.trimIndent())
+
+        val options = ApiOptions()
+        options.typeMappings = listOf(
+            TypeMapping(
+                "WrappedFoo",
+                "io.openapiprocessor.test.Wrapped",
+                listOf("io.openapiprocessor.generated.model.Foo")
+            )
+        )
+
+        val api: Api = ApiConverter (options, FrameworkBase())
+            .convert(openApi)
+
+        api.getDataTypes().getModelDataTypes().size shouldBe 1
+     }
+
+    "generates model if it is only referenced in the mapping of a composed type" {
+         val openApi = parse ("""
+            openapi: 3.0.2
+            info:
+              title: API
+              version: 1.0.0
+            
+            paths:
+              /foo:
+                get:
+                  responses:
+                    '200':
+                      description: ...
+                      content:
+                        application/json:
+                          schema:
+                            ${'$'}ref: '#/components/schemas/ComposedFoo'
+            
+            components:
+              schemas:
+                        
+                ComposedFoo:
+                  description: ...
+                  allOf:
+                    - ${'$'}ref: '#/components/schemas/Foo'
+            
+                Foo:
+                  description: a Foo
+                  type: object
+                  properties:
+                    foo:
+                      type: string
+                  
+         """.trimIndent())
+
+        val options = ApiOptions()
+        options.typeMappings = listOf(
+            TypeMapping(
+                "ComposedFoo",
+                "io.openapiprocessor.test.Wrapped",
+                listOf("io.openapiprocessor.generated.model.Foo")
+            )
+        )
+
+        val api: Api = ApiConverter (options, FrameworkBase())
+            .convert(openApi)
+
+        api.getDataTypes().getModelDataTypes().size shouldBe 1
+     }
+
+})