id/type split (mapped collection), #65

Author: hauner

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

@@ -10,27 +10,31 @@ package io.openapiprocessor.core.model.datatypes
  * generic parameter.
  */
 open class MappedCollectionDataType(
-    private val type: String,
+    private val name: String,
     private val pkg: String,
     override val item: DataType,
     override val constraints: DataTypeConstraints? = null,
     override val deprecated: Boolean = false
 ): DataType, CollectionDataType {
 
     override fun getName(): String {
-        return "${type}<${item.getName()}>"
+        return "${name}<${item.getName()}>"
     }
 
-    fun getName(annotation: String): String {
-        return "${type}<$annotation ${item.getName()}>"
+    override fun getTypeName(): String {
+        return "${name}<${item.getTypeName()}>"
+    }
+
+    fun getTypeNameWithAnnotatedItem(annotation: String): String {
+        return "${name}<$annotation ${item.getTypeName()}>"
     }
 
     override fun getPackageName(): String {
         return pkg
     }
 
     override fun getImports(): Set<String> {
-        return setOf(getPackageName() + "." + type) + item.getImports()
+        return setOf(getPackageName() + "." + name) + item.getImports()
     }
 
 }

src/test/kotlin/io/openapiprocessor/core/model/datatypes/MappedCollectionDataTypeSpec.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.model.datatypes
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.data.blocking.forAll
+import io.kotest.data.row
+import io.kotest.matchers.shouldBe
+
+class MappedCollectionDataTypeSpec : StringSpec({
+
+    "collection uses id name and type name of item" {
+        val collection = MappedCollectionDataType("List", "java",
+            ObjectDataType(DataTypeName("Foo", "FooX"), "pkg", linkedMapOf()))
+
+        collection.getName() shouldBe "List<Foo>"
+        collection.getTypeName() shouldBe "List<FooX>"
+    }
+
+    "should create import with type name" {
+        forAll(row("Foo", "Foo"), row("Fooo", "FoooX")) { id, type ->
+            val dt = MappedCollectionDataType("List", "java",
+                ObjectDataType(DataTypeName(id, type), "pkg"))
+            dt.getImports() shouldBe setOf(
+                "java.List",
+                "pkg.$type"
+            )
+        }
+    }
+
+})