#91, add model suffix to generic parameters

Author: hauner

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

@@ -74,10 +74,24 @@ class DataTypeConverter(
     }
 
     fun createMappedDataType(targetType: TargetType, schemaInfo: SchemaInfo? = null): MappedDataType {
+        val genericDataTypeNames = mutableListOf<DataTypeName>()
+
+        targetType.genericNames.forEach {
+            val dataTypeName = when {
+                it.startsWith(options.packageName) -> {
+                    DataTypeName(it, getTypeNameWithSuffix(it))
+                }
+                else -> {
+                    DataTypeName(it)
+                }
+            }
+            genericDataTypeNames.add(dataTypeName)
+        }
+
         return MappedDataType(
             targetType.getName(),
             targetType.getPkg(),
-            targetType.genericNames.map { DataTypeName(it) },
+            genericDataTypeNames,
             null,
             schemaInfo?.getDeprecated() ?: false
         )

src/main/kotlin/io/openapiprocessor/core/model/datatypes/MappedDataType.kt

@@ -19,6 +19,14 @@ open class MappedDataType(
 ): DataType {
 
     override fun getName(): String {
+        return if (genericTypes.isEmpty()) {
+            type
+        } else {
+            "${type}<${genericIds.joinToString(", ")}>"
+        }
+    }
+
+    override fun getTypeName(): String {
         return if (genericTypes.isEmpty()) {
             type
         } else {
@@ -42,15 +50,22 @@ open class MappedDataType(
                 .toSet()
         }
 
+    private val genericIds: List<String>
+        get() {
+            return genericTypes.map {
+                getClassName(it.id)
+            }
+        }
+
     private val genericTypeNames: List<String>
         get() {
             return genericTypes.map {
                 getClassName(it.type)
             }
         }
 
-    private fun getClassName(type: String): String {
-        return type.substringAfterLast('.')
+    private fun getClassName(source: String): String {
+        return source.substringAfterLast('.')
     }
 
 }

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

@@ -9,12 +9,10 @@ import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.kotest.matchers.types.shouldBeSameInstanceAs
+import io.openapiprocessor.core.converter.mapping.TargetType
 import io.openapiprocessor.core.model.DataTypes
 import io.openapiprocessor.core.model.HttpMethod
-import io.openapiprocessor.core.model.datatypes.AllOfObjectDataType
-import io.openapiprocessor.core.model.datatypes.ArrayDataType
-import io.openapiprocessor.core.model.datatypes.ObjectDataType
-import io.openapiprocessor.core.model.datatypes.StringEnumDataType
+import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.support.getBodySchemaInfo
 import io.openapiprocessor.core.support.getSchemaInfo
 import io.openapiprocessor.core.support.parse
@@ -215,4 +213,19 @@ components:
         datatype.getTypeName().shouldBe("FooSuffix[]")
     }
 
+    "adds suffix to mapped data type generics" {
+        val options = ApiOptions()
+        options.packageName = "model"
+        options.modelNameSuffix = "Suffix"
+
+        // when:
+        val converter = DataTypeConverter(options)
+        val datatype = converter.createMappedDataType(
+            TargetType("other.Foo", listOf("model.Bar")))
+
+        // then:
+        datatype.shouldBeInstanceOf<MappedDataType>()
+        datatype.getName().shouldBe("Foo<Bar>")
+        datatype.getTypeName().shouldBe("Foo<BarSuffix>")
+    }
 })